alice.mosphere.at / TIC-80
this repo has no description
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

some fixes for BUILD_EDITORS and BUILD_DEPRECATED defines

nesbox 6ceed4df 74a14979

+8 -15
+2
src/api/janet.c
··· 1097 1097 reportError(core, result); 1098 1098 } 1099 1099 1100 + #if defined(BUILD_DEPRECATED) 1100 1101 // call OVR() callback for backward compatibility 1101 1102 (void)janet_resolve(core->currentVM, janet_csymbol(OVR_FN), &pre_fn); 1102 1103 if (janet_type(pre_fn) == JANET_FUNCTION) { ··· 1107 1108 reportError(core, result); 1108 1109 } 1109 1110 } 1111 + #endif 1110 1112 } 1111 1113 1112 1114 /*
+6 -15
src/studio/screens/mainmenu.c
··· 194 194 optionVolumeSet, 195 195 }; 196 196 197 - 198 - 197 + #if defined(BUILD_EDITORS) 199 198 200 199 static s32 optionEmacsModeGet(void* data) 201 200 { 202 - #if defined(BUILD_EDITORS) 203 201 StudioMainMenu* main = data; 204 202 return main->options->emacsMode ? 1 : 0; 205 - #endif 206 203 } 207 204 208 205 static void optionEmacsModeSet(void* data, s32 pos) 209 206 { 210 - #if defined(BUILD_EDITORS) 211 207 StudioMainMenu* main = data; 212 208 main->options->emacsMode = pos == 1; 213 - #endif 214 209 } 215 210 216 211 static MenuOption EmacsModeOption = ··· 219 214 optionEmacsModeGet, 220 215 optionEmacsModeSet, 221 216 }; 222 - 223 - #if defined(BUILD_EDITORS) 224 217 225 218 static s32 optionDevModeGet(void* data) 226 219 { ··· 241 234 optionDevModeSet, 242 235 }; 243 236 237 + static void showCodeEditorMenu(void* data, s32 pos); 238 + 244 239 #endif 245 240 246 241 static void showGamepadMenu(void* data, s32 pos) ··· 251 246 252 247 initGamepadMenu(main); 253 248 } 254 - 255 - static void showCodeEditorMenu(void* data, s32 pos); 256 249 257 250 static const MenuItem OptionMenu[] = 258 251 { ··· 266 259 {"FULLSCREEN", NULL, &FullscreenOption}, 267 260 {"INTEGER SCALE", NULL, &IntegerScaleOption}, 268 261 {"VOLUME", NULL, &VolumeOption}, 269 - {"SETUP GAMEPAD", showGamepadMenu}, 270 262 #if defined(BUILD_EDITORS) 271 263 {"CODE EDITOR OPTIONS", showCodeEditorMenu}, 272 264 #endif 265 + {"SETUP GAMEPAD", showGamepadMenu}, 273 266 {""}, 274 267 {"BACK", showMainMenu, .back = true}, 275 268 }; ··· 283 276 tic_core_script_config(tic)->callback.menu(tic, pos, NULL); 284 277 } 285 278 279 + #if defined(BUILD_EDITORS) 286 280 static const MenuItem CodeEditorMenu[] = 287 281 { 288 282 {"EMACS MODE", NULL, &EmacsModeOption, "For the cool kids only"}, ··· 297 291 studio_menu_init(main->menu, CodeEditorMenu, 298 292 COUNT_OF(CodeEditorMenu), 0, COUNT_OF(OptionMenu)-3, showOptionsMenu, main); 299 293 } 294 + #endif 300 295 301 296 static void freeItems(StudioMainMenu* menu) 302 297 { ··· 540 535 541 536 initGamepadButtons(main); 542 537 543 - #if defined(BUILD_EDITORS) 544 - s32 backPos = COUNT_OF(OptionMenu) - 4; 545 - #else 546 538 s32 backPos = COUNT_OF(OptionMenu) - 3; 547 - #endif 548 539 549 540 studio_menu_init(main->menu, GamepadMenu, COUNT_OF(GamepadMenu), 550 541 main->gamepads.key < 0 ? KeyMappingStart : main->gamepads.key + KeyMappingStart,