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.

#1950: removed devmode and game menu by default, game menu will be shown if the 'game' tag exists in the tags section (#2603)

* #1950: removed devmode and game menu by default, game menu will be shown if the 'game' tag exists in the tags section

* #1950: better fix

authored by

Vadim Grigoruk and committed by
GitHub 721baf75 344e69f6

+15 -48
-4
src/studio/config.c
··· 99 99 .autosave = false, 100 100 #if defined(BUILD_EDITORS) 101 101 .keybindMode = KEYBIND_STANDARD, 102 - .devmode = false, 103 102 .tabMode = TAB_AUTO, 104 103 .tabSize = 1, 105 104 #endif ··· 189 188 #if defined(BUILD_EDITORS) 190 189 options->keybindMode = json_int("keybindMode", 0); 191 190 options->tabMode = json_int("tabMode", 0); 192 - options->devmode = json_bool("devmode", 0); 193 191 options->tabSize = json_int("tabSize", 0); 194 192 #endif 195 193 } ··· 266 264 , 267 265 "keybindMode":%i, 268 266 "tabMode":%i, 269 - "devmode":%s, 270 267 "tabSize":%i 271 268 #endif 272 269 }) ··· 285 282 , 286 283 options->keybindMode, 287 284 options->tabMode, 288 - bool2str(options->devmode), 289 285 options->tabSize 290 286 #endif 291 287 );
+1 -1
src/studio/fs.c
··· 955 955 s32 size = readlink("/proc/self/exe", apppath, sizeof apppath); 956 956 apppath[size] = '\0'; 957 957 #elif defined(__TIC_MACOSX__) 958 - s32 size = sizeof apppath; 958 + u32 size = sizeof apppath; 959 959 _NSGetExecutablePath(apppath, &size); 960 960 #endif 961 961
-25
src/studio/screens/mainmenu.c
··· 285 285 optionKeybindModeSet, 286 286 }; 287 287 288 - static s32 optionDevModeGet(void* data) 289 - { 290 - StudioMainMenu* main = data; 291 - return main->options->devmode ? 1 : 0; 292 - } 293 - 294 - static void optionDevModeSet(void* data, s32 pos) 295 - { 296 - StudioMainMenu* main = data; 297 - main->options->devmode = pos == 1; 298 - } 299 - 300 - static MenuOption DevModeOption = 301 - { 302 - OPTION_VALUES({OffValue, OnValue}), 303 - optionDevModeGet, 304 - optionDevModeSet, 305 - }; 306 - 307 288 static void showEditorMenu(void* data, s32 pos); 308 289 309 290 #endif ··· 322 303 #if defined(CRT_SHADER_SUPPORT) 323 304 OptionsMenu_CrtMonitorOption, 324 305 #endif 325 - #if defined(BUILD_EDITORS) 326 - OptionsMenu_DevModeOption, 327 - #endif 328 306 OptionsMenu_VSyncOption, 329 307 OptionsMenu_FullscreenOption, 330 308 OptionsMenu_IntegerScaleOption, ··· 341 319 { 342 320 #if defined(CRT_SHADER_SUPPORT) 343 321 {"CRT MONITOR", NULL, &CrtMonitorOption}, 344 - #endif 345 - #if defined(BUILD_EDITORS) 346 - {"DEV MODE", NULL, &DevModeOption, "The game menu is disabled in dev mode."}, 347 322 #endif 348 323 {"VSYNC", NULL, &VSyncOption, "VSYNC needs restart!"}, 349 324 {"FULLSCREEN", NULL, &FullscreenOption},
+14 -17
src/studio/studio.c
··· 1757 1757 1758 1758 #if defined(BUILD_EDITORS) 1759 1759 1760 - static bool isDevMode(Studio* studio) 1760 + static bool showGameMenu(Studio* studio) 1761 1761 { 1762 1762 tic_mem* tic = studio->tic; 1763 - const char *devmode = tic_tool_metatag(tic->cart.code.data, "devmode", tic_get_script(tic)->singleComment); 1764 - 1765 - if(strcmp(devmode, "on") == 0) 1766 - return true; 1767 1763 1768 - else if(strcmp(devmode, "off") == 0) 1769 - return false; 1764 + char tag[TICNAME_MAX]; 1765 + snprintf(tag, sizeof tag, "\n%s menu:", tic_get_script(tic)->singleComment); 1770 1766 1771 - return getConfig(studio)->options.devmode; 1767 + return strstr(tic->cart.code.data, tag); 1772 1768 } 1773 1769 1774 1770 #endif ··· 1843 1839 switch(studio->mode) 1844 1840 { 1845 1841 case TIC_MENU_MODE: 1846 - isDevMode(studio) 1847 - ? setStudioMode(studio, studio->prevMode == TIC_RUN_MODE 1842 + showGameMenu(studio) 1843 + ? studio_menu_back(studio->menu) 1844 + : setStudioMode(studio, studio->prevMode == TIC_RUN_MODE 1848 1845 ? TIC_CONSOLE_MODE 1849 - : studio->prevMode) 1850 - : studio_menu_back(studio->menu); 1846 + : studio->prevMode); 1851 1847 break; 1852 1848 case TIC_RUN_MODE: 1853 - isDevMode(studio) 1854 - ? setStudioMode(studio, studio->prevMode == TIC_RUN_MODE 1849 + showGameMenu(studio) 1850 + ? gotoMenu(studio) 1851 + : setStudioMode(studio, studio->prevMode == TIC_RUN_MODE 1855 1852 ? TIC_CONSOLE_MODE 1856 - : studio->prevMode) 1857 - : gotoMenu(studio); 1853 + : studio->prevMode); 1858 1854 break; 1859 1855 case TIC_CONSOLE_MODE: 1860 1856 setStudioMode(studio, TIC_CODE_MODE); ··· 1876 1872 else if(studio->mode == TIC_RUN_MODE && keyWasPressedOnce(studio, tic_key_f7)) 1877 1873 setCoverImage(studio); 1878 1874 1879 - if(isDevMode(studio) || studio->mode != TIC_RUN_MODE) 1875 + if(!showGameMenu(studio) || studio->mode != TIC_RUN_MODE) 1880 1876 { 1881 1877 if(keyWasPressedOnce(studio, tic_key_f1)) setStudioMode(studio, TIC_CODE_MODE); 1882 1878 else if(keyWasPressedOnce(studio, tic_key_f2)) setStudioMode(studio, TIC_SPRITE_MODE); ··· 1891 1887 { 1892 1888 case TIC_MENU_MODE: studio_menu_back(studio->menu); break; 1893 1889 case TIC_RUN_MODE: gotoMenu(studio); break; 1890 + default: break; 1894 1891 } 1895 1892 } 1896 1893 #endif
-1
src/studio/system.h
··· 141 141 #if defined(BUILD_EDITORS) 142 142 enum KeybindMode keybindMode; 143 143 enum TabMode tabMode; 144 - bool devmode; 145 144 s32 tabSize; 146 145 #endif 147 146 } options;