diff --git a/GameSettings.cpp b/GameSettings.cpp index e16c7b720..1093ed098 100644 --- a/GameSettings.cpp +++ b/GameSettings.cpp @@ -185,9 +185,9 @@ BOOLEAN LoadGameSettings() SetSpeechVolume( gGameSettings.ubSpeechVolume ); MusicSetVolume( gGameSettings.ubMusicVolumeSetting ); -#ifndef BLOOD_N_GORE_ENABLED - gGameSettings.fOptions[ TOPTION_BLOOD_N_GORE ] = FALSE; -#endif +//#ifndef BLOOD_N_GORE_ENABLED // arynn : del_me : defunct +// gGameSettings.fOptions[ TOPTION_BLOOD_N_GORE ] = FALSE; +//#endif //if the user doesnt want the help screens present if( gGameSettings.fHideHelpInAllScreens ) @@ -278,9 +278,9 @@ void InitGameSettings() gGameSettings.fOptions[ TOPTION_USE_METRIC_SYSTEM ] = FALSE; - #ifndef BLOOD_N_GORE_ENABLED - gGameSettings.fOptions[ TOPTION_BLOOD_N_GORE ] = FALSE; - #endif + //#ifndef BLOOD_N_GORE_ENABLED // arynn : del_me : defunct + // gGameSettings.fOptions[ TOPTION_BLOOD_N_GORE ] = FALSE; + //#endif gGameSettings.fOptions[ TOPTION_MERC_ALWAYS_LIGHT_UP ] = FALSE; gGameSettings.fOptions[ TOPTION_SMART_CURSOR ] = FALSE; @@ -312,6 +312,16 @@ void InitGameSettings() gGameSettings.fOptions[ TOPTION_LOW_CPU_USAGE ] = FALSE; gGameSettings.fOptions[ TOPTION_ENHANCED_DESC_BOX ] = FALSE; gGameSettings.fOptions[ TOPTION_TOGGLE_TURN_MODE ] = FALSE; + gGameSettings.fOptions[ TOPTION_SHOW_RESET_ALL_OPTIONS ] = FALSE; // arynn : failsafe show/hide option + gGameSettings.fOptions[ TOPTION_RESET_ALL_OPTIONS ] = FALSE; // arynn : a do once and reset self option + gGameSettings.fOptions[ TOPTION_DEBUG_MODE_OPTIONS_HEADER ] = FALSE; // arynn : a sample options screen options header + gGameSettings.fOptions[ TOPTION_RETAIN_DEBUG_OPTIONS_IN_RELEASE ] = FALSE; // arynn : allow debug options that were set in debug.exe to continue in a rel.exe that shares same JA2.set file + gGameSettings.fOptions[ TOPTION_DEBUG_MODE_RENDER_OPTIONS_GROUP ] = FALSE; // arynn : a sample option which affects options screen listing only + gGameSettings.fOptions[ TOPTION_RENDER_MOUSE_REGIONS ] = FALSE; // arynn : a sample DEBUG build option + gGameSettings.fOptions[ TOPTION_DEBUG_MODE_OPTIONS_END ] = FALSE; // arynn : a sample options screen options divider + + + gGameSettings.fOptions[ TOPTION_LAST_OPTION ] = FALSE; // arynn : this is THE LAST option that exists (intended for debugging the options screen, doesnt do anything, except exist) gGameSettings.ubSizeOfDisplayCover = 4; diff --git a/GameSettings.h b/GameSettings.h index 79756117b..a17d32e8a 100644 --- a/GameSettings.h +++ b/GameSettings.h @@ -5,6 +5,8 @@ //If you add any options, MAKE sure you add the corresponding string to the Options Screen string array +// look up : zOptionsScreenHelpText , zOptionsToggleText , InitGameSettings , +// also, to establish non typical display rules (options screen list) : Establish_Options_Screen_Rules enum { TOPTION_SPEECH, @@ -58,8 +60,77 @@ enum TOPTION_SILENT_SKYRIDER, TOPTION_LOW_CPU_USAGE, TOPTION_ENHANCED_DESC_BOX, - TOPTION_TOGGLE_TURN_MODE, // arynn : add forced turn mode + TOPTION_TOGGLE_TURN_MODE, // arynn : add forced turn mode + TOPTION_SHOW_RESET_ALL_OPTIONS, // arynn : in game ja2.set file fixer (one time done button, not a reall toggle option) + TOPTION_RESET_ALL_OPTIONS, // arynn : in game ja2.set file fixer (one time done button, not a reall toggle option) + TOPTION_DEBUG_MODE_OPTIONS_HEADER, // arynn : a sample options screen options header + TOPTION_RETAIN_DEBUG_OPTIONS_IN_RELEASE, // arynn : allow debug options that were set in debug.exe to continue in a rel.exe that shares same JA2.set file + TOPTION_DEBUG_MODE_RENDER_OPTIONS_GROUP, // arynn : a sample option which affects options screen listing only + TOPTION_RENDER_MOUSE_REGIONS, // arynn : a sample DEBUG build option + TOPTION_DEBUG_MODE_OPTIONS_END, // arynn : a sample options screen options divider + + //TOPTION PADDIN : go ahead, use one of em, just try to keep the # inline with where they are in foptions[] so the # makes sense + TOPTION_044, + TOPTION_045, + TOPTION_046, + TOPTION_047, + TOPTION_048, + TOPTION_049, + TOPTION_050, + TOPTION_051, + TOPTION_052, + TOPTION_053, + TOPTION_054, + TOPTION_055, + TOPTION_056, + TOPTION_057, + TOPTION_058, + TOPTION_059, + TOPTION_060, + TOPTION_061, + TOPTION_062, + TOPTION_063, + TOPTION_064, + TOPTION_065, + TOPTION_066, + TOPTION_067, + TOPTION_068, + TOPTION_069, + TOPTION_070, + TOPTION_071, + TOPTION_072, + TOPTION_073, + TOPTION_074, + TOPTION_075, + TOPTION_076, + TOPTION_077, + TOPTION_078, + TOPTION_079, + TOPTION_080, + TOPTION_081, + TOPTION_082, + TOPTION_083, + TOPTION_084, + TOPTION_085, + TOPTION_086, + TOPTION_087, + TOPTION_088, + TOPTION_089, + TOPTION_090, + TOPTION_091, + TOPTION_092, + TOPTION_093, + TOPTION_094, + TOPTION_095, + TOPTION_096, + TOPTION_097, + TOPTION_098, + TOPTION_099, + TOPTION_100, + + // arynn : this is THE LAST option that exists (intended for debugging the options screen, doesnt do anything, except exist) + TOPTION_LAST_OPTION, NUM_GAME_OPTIONS, //Toggle up this will be able to be Toggled by the player @@ -67,6 +138,7 @@ enum TOPTION_MERC_CASTS_LIGHT = NUM_GAME_OPTIONS, TOPTION_HIDE_BULLETS, TOPTION_TRACKING_MODE, + NUM_ALL_GAME_OPTIONS, }; diff --git a/Options Screen.cpp b/Options Screen.cpp index af84da1fe..0c2dcf2ce 100644 Binary files a/Options Screen.cpp and b/Options Screen.cpp differ diff --git a/Standard Gaming Platform/mousesystem.cpp b/Standard Gaming Platform/mousesystem.cpp index c8cd2b9e5..647025c95 100644 --- a/Standard Gaming Platform/mousesystem.cpp +++ b/Standard Gaming Platform/mousesystem.cpp @@ -1715,3 +1715,15 @@ void ResetClickedMode(void) { gfClickedModeOn = FALSE; } + +// arynn : render mouse regions : mouse region list iteration initial +MOUSE_REGION *get_first_entry_in_MSYS_RegList(void) +{ + return MSYS_RegList; +} + +// arynn : render mouse regions : mouse region list iteration +MOUSE_REGION *get_next_entry_in_MSYS_RegList(MOUSE_REGION *current_region) +{ + return current_region->next; +} diff --git a/Standard Gaming Platform/mousesystem.h b/Standard Gaming Platform/mousesystem.h index 0903bb1f0..890210899 100644 --- a/Standard Gaming Platform/mousesystem.h +++ b/Standard Gaming Platform/mousesystem.h @@ -195,6 +195,11 @@ void MSYS_MoveMouseRegionTo( MOUSE_REGION *region, INT16 sX, INT16 sY); void MSYS_AllowDisabledRegionFastHelp( MOUSE_REGION *region, BOOLEAN fAllow ); +// arynn : render mouse regions +// functions to help externalize mouse region data +MOUSE_REGION *get_first_entry_in_MSYS_RegList(void); //list iteration initialize +MOUSE_REGION *get_next_entry_in_MSYS_RegList(MOUSE_REGION *current_region); //list iteration increment + // This function will force a re-evaluation of mous regions // Usually used to force change of mouse cursor if panels switch, etc void RefreshMouseRegions( ); diff --git a/Sys Globals.cpp b/Sys Globals.cpp index 3b89ed753..b2eeca5a4 100644 --- a/Sys Globals.cpp +++ b/Sys Globals.cpp @@ -39,5 +39,12 @@ BOOLEAN SET_ERROR( const STR8 String, ...) return( FALSE ); } +//create a varible that can be tested outside the pre-compiler convention. +// also see its "Sys Globals.h" declaration +#ifdef JA2BETAVERSION +BOOLEAN JA2BETAVERSION_FLAG = 1; +#else +BOOLEAN JA2BETAVERSION_FLAG = 0; +#endif diff --git a/Sys Globals.h b/Sys Globals.h index 7ed6acadd..8dd6a7f51 100644 --- a/Sys Globals.h +++ b/Sys Globals.h @@ -27,4 +27,8 @@ extern INT32 giCounterPeriodOverlay; extern BOOLEAN SET_ERROR( const STR8 String, ...); +// arynn : note : a varible version of #define JA2BETAVERSION, used for control flow when not debugging +// : note : i wasnt sure about any existing. i'd imagine there is one. if so, it will get fixed later. +extern BOOLEAN JA2BETAVERSION_FLAG; + #endif diff --git a/Utils/_ChineseText.cpp b/Utils/_ChineseText.cpp index ad10fbd78..c3cbf98c7 100644 --- a/Utils/_ChineseText.cpp +++ b/Utils/_ChineseText.cpp @@ -4411,6 +4411,80 @@ STR16 zOptionsToggleText[] = L"降低CPU的使用率", //"Low CPU usage", L"Enhanced Description Box", L"强制回合制模式",//L"Forced Turn Mode", // arynn : add forced turn mode + // arynn : reset all toggle options, in cases for corrupted JA2.set files (and general debugging of options) + L"Reset ALL game options", + L"Do you really want to reset?", + // arynn : a sample options screen options header, just text, not a real option + L"--DEBUG OPTIONS--", + // arynn : allow debug options that were set in debug.exe to continue in a rel.exe that shares same JA2.set file + L"Retain Debug Options in Rel", + // arynn : a sample option which affects options screen listing only + L"DEBUG Render Option group", + // arynn : a sample DEBUG build option, this will draw slash-rects through current mouse region "hot spots" + L"Render Mouse Regions", + // arynn : a sample options screen options divider, just text, not a real option + L"-----------------", + + L"Option044", // arynn : note : everything south of here (should) only ever show in debug.. i doubt translating would prove useful + L"Option045", + L"Option046", + L"Option047", + L"Option048", + L"Option049", + L"Option050", + L"Option051", + L"Option052", + L"Option053", + L"Option054", + L"Option055", + L"Option056", + L"Option057", + L"Option058", + L"Option059", + L"Option060", + L"Option061", + L"Option062", + L"Option063", + L"Option064", + L"Option065", + L"Option066", + L"Option067", + L"Option068", + L"Option069", + L"Option070", + L"Option071", + L"Option072", + L"Option073", + L"Option074", + L"Option075", + L"Option076", + L"Option077", + L"Option078", + L"Option079", + L"Option080", + L"Option081", + L"Option082", + L"Option083", + L"Option084", + L"Option085", + L"Option086", + L"Option087", + L"Option088", + L"Option089", + L"Option090", + L"Option091", + L"Option092", + L"Option093", + L"Option094", + L"Option095", + L"Option096", + L"Option097", + L"Option098", + L"Option099", + L"Option100", + + // arynn : this is THE LAST option that exists (debug the options screen, doesnt do anything, except exist) + L"THE_LAST_OPTION", }; //This is the help text associated with the above toggles. @@ -4526,6 +4600,81 @@ STR16 zOptionsScreenHelpText[] = L"当打开时,将出现物品及武器的“增强描述框”(EDB)。", //L"When ON and enemy present, Turn Base mode persists untill sector is free (|C|T|R|L+|S|H|I|F|T+|A|L|T+|T).", // arynn : add forced turn mode L"当打开时,且在战术画面内存在敌军时,将一直处于回合制模式直至该地区所有敌军被消灭(可以通过快捷键|C|T|R|L+|S|H|I|F|T+|A|L|T+|T来控制打开或关闭强制回合制模式)", + // arynn : immediate effect option that fixes corrupt ja2.set keeping of toggle options + L"Click me to fix corrupt game settings", + L"Click me to fix corrupt game settings", + // arynn : a sample options screen options header, this pop up help text never render (well as of yet) + L"(text not rendered)TOPTION_DEBUG_MODE_OPTIONS_HEADER", + // arynn : allow debug options that were set in debug.exe to continue in a rel.exe that shares same JA2.set file + L"Allows debug options that were set in debug.exe to continue in a rel.exe that shares same JA2.set file", + // arynn : a sample option which affects options screen listing only + L"Toggle to display debugging render options", + // arynn : a sample DEBUG build option + L"Attempts to display slash-rects around mouse regions", + // arynn : a sample options screen options divider, this pop up help text never render (well as of yet) + L"(text not rendered)TOPTION_DEBUG_MODE_OPTIONS_END", + // text past this point is for debugging, translating would doubtfully prove usefull + L"044", + L"045", + L"046", + L"047", + L"048", + L"049", + L"050", + L"051", + L"052", + L"053", + L"054", + L"055", + L"056", + L"057", + L"058", + L"059", + L"060", + L"061", + L"062", + L"063", + L"064", + L"065", + L"066", + L"067", + L"068", + L"069", + L"070", + L"071", + L"072", + L"073", + L"074", + L"075", + L"076", + L"077", + L"078", + L"079", + L"080", + L"081", + L"082", + L"083", + L"084", + L"085", + L"086", + L"087", + L"088", + L"089", + L"090", + L"091", + L"092", + L"093", + L"094", + L"095", + L"096", + L"097", + L"098", + L"099", + L"100", + + // arynn : this is THE LAST option that exists (debug the options screen, doesnt do anything, except exist) + L"TOPTION_LAST_OPTION", + }; diff --git a/Utils/_DutchText.cpp b/Utils/_DutchText.cpp index 844538d6d..728c3baa0 100644 --- a/Utils/_DutchText.cpp +++ b/Utils/_DutchText.cpp @@ -3679,6 +3679,81 @@ STR16 zOptionsToggleText[] = L"Low CPU Usage", L"Enhanced Description Box", L"Forced Turn Mode", // arynn : add forced turn mode + // arynn : reset all toggle options, in cases for corrupted JA2.set files (and general debugging of options) + L"Reset ALL game options", + L"Do you really want to reset?", + // arynn : a sample options screen options header, just text, not a real option + L"--DEBUG OPTIONS--", + // arynn : allow debug options that were set in debug.exe to continue in a rel.exe that shares same JA2.set file + L"Retain Debug Options in Rel", + // arynn : a sample option which affects options screen listing only + L"DEBUG Render Option group", + // arynn : a sample DEBUG build option, this will draw slash-rects through current mouse region "hot spots" + L"Render Mouse Regions", + // arynn : a sample options screen options divider, just text, not a real option + L"-----------------", + + L"Option044", // arynn : note : everything south of here (should) only ever show in debug.. i doubt translating would prove useful + L"Option045", + L"Option046", + L"Option047", + L"Option048", + L"Option049", + L"Option050", + L"Option051", + L"Option052", + L"Option053", + L"Option054", + L"Option055", + L"Option056", + L"Option057", + L"Option058", + L"Option059", + L"Option060", + L"Option061", + L"Option062", + L"Option063", + L"Option064", + L"Option065", + L"Option066", + L"Option067", + L"Option068", + L"Option069", + L"Option070", + L"Option071", + L"Option072", + L"Option073", + L"Option074", + L"Option075", + L"Option076", + L"Option077", + L"Option078", + L"Option079", + L"Option080", + L"Option081", + L"Option082", + L"Option083", + L"Option084", + L"Option085", + L"Option086", + L"Option087", + L"Option088", + L"Option089", + L"Option090", + L"Option091", + L"Option092", + L"Option093", + L"Option094", + L"Option095", + L"Option096", + L"Option097", + L"Option098", + L"Option099", + L"Option100", + + // arynn : this is THE LAST option that exists (debug the options screen, doesnt do anything, except exist) + L"THE_LAST_OPTION", + }; //This is the help text associated with the above toggles. @@ -3761,6 +3836,81 @@ STR16 zOptionsScreenHelpText[] = L"When ON, game will run with much lower CPU usage.", L"When ON, enhanced descriptions will be shown for items and weapons.", L"When ON and enemy present, Turn Base mode persists untill sector is free (|C|T|R|L+|S|H|I|F|T+|A|L|T+|T).", // arynn : add forced turn mode + // arynn : immediate effect option that fixes corrupt ja2.set keeping of toggle options + L"Click me to fix corrupt game settings", + L"Click me to fix corrupt game settings", + // arynn : a sample options screen options header, this pop up help text never render (well as of yet) + L"(text not rendered)TOPTION_DEBUG_MODE_OPTIONS_HEADER", + // arynn : allow debug options that were set in debug.exe to continue in a rel.exe that shares same JA2.set file + L"Allows debug options that were set in debug.exe to continue in a rel.exe that shares same JA2.set file", + // arynn : a sample option which affects options screen listing only + L"Toggle to display debugging render options", + // arynn : a sample DEBUG build option + L"Attempts to display slash-rects around mouse regions", + // arynn : a sample options screen options divider, this pop up help text never render (well as of yet) + L"(text not rendered)TOPTION_DEBUG_MODE_OPTIONS_END", + // text past this point is for debugging, translating would doubtfully prove usefull + L"044", + L"045", + L"046", + L"047", + L"048", + L"049", + L"050", + L"051", + L"052", + L"053", + L"054", + L"055", + L"056", + L"057", + L"058", + L"059", + L"060", + L"061", + L"062", + L"063", + L"064", + L"065", + L"066", + L"067", + L"068", + L"069", + L"070", + L"071", + L"072", + L"073", + L"074", + L"075", + L"076", + L"077", + L"078", + L"079", + L"080", + L"081", + L"082", + L"083", + L"084", + L"085", + L"086", + L"087", + L"088", + L"089", + L"090", + L"091", + L"092", + L"093", + L"094", + L"095", + L"096", + L"097", + L"098", + L"099", + L"100", + + // arynn : this is THE LAST option that exists (debug the options screen, doesnt do anything, except exist) + L"TOPTION_LAST_OPTION", + }; diff --git a/Utils/_EnglishText.cpp b/Utils/_EnglishText.cpp index 3254ba757..535ae77f8 100644 --- a/Utils/_EnglishText.cpp +++ b/Utils/_EnglishText.cpp @@ -3515,7 +3515,7 @@ STR16 zOptionsText[] = //Confirmation pop when the user selects.. L"Quit game and return to the main menu?", - L"You need either the Speech option, or the Subtitle option to be enabled.", + L"You need either the Speech option, or the Subtitle option to be enabled.", // arynn : defunct : no more nag screen }; @@ -3691,7 +3691,82 @@ STR16 zOptionsToggleText[] = L"Silent Skyrider", L"Low CPU usage", L"Enhanced Description Box", - L"Forced Turn Mode", // arynn : add forced turn mode + // arynn : add forced turn mode + L"Forced Turn Mode", + // arynn : reset all toggle options, in cases for corrupted JA2.set files (and general debugging of options) + L"Reset ALL game options", + L"Do you really want to reset?", + // arynn : a sample options screen options header, just text, not a real option + L"--DEBUG OPTIONS--", + // arynn : allow debug options that were set in debug.exe to continue in a rel.exe that shares same JA2.set file + L"Retain Debug Options in Rel", + // arynn : a sample option which affects options screen listing only + L"DEBUG Render Option group", + // arynn : a sample DEBUG build option, this will draw slash-rects through current mouse region "hot spots" + L"Render Mouse Regions", + // arynn : a sample options screen options divider, just text, not a real option + L"-----------------", + + L"Option044", // arynn : note : everything south of here (should) only ever show in debug.. i doubt translating would prove useful + L"Option045", + L"Option046", + L"Option047", + L"Option048", + L"Option049", + L"Option050", + L"Option051", + L"Option052", + L"Option053", + L"Option054", + L"Option055", + L"Option056", + L"Option057", + L"Option058", + L"Option059", + L"Option060", + L"Option061", + L"Option062", + L"Option063", + L"Option064", + L"Option065", + L"Option066", + L"Option067", + L"Option068", + L"Option069", + L"Option070", + L"Option071", + L"Option072", + L"Option073", + L"Option074", + L"Option075", + L"Option076", + L"Option077", + L"Option078", + L"Option079", + L"Option080", + L"Option081", + L"Option082", + L"Option083", + L"Option084", + L"Option085", + L"Option086", + L"Option087", + L"Option088", + L"Option089", + L"Option090", + L"Option091", + L"Option092", + L"Option093", + L"Option094", + L"Option095", + L"Option096", + L"Option097", + L"Option098", + L"Option099", + L"Option100", + + // arynn : this is THE LAST option that exists (debug the options screen, doesnt do anything, except exist) + L"THE_LAST_OPTION", }; //This is the help text associated with the above toggles. @@ -3773,7 +3848,82 @@ STR16 zOptionsScreenHelpText[] = L"When ON, Skyrider will not talk anymore.", L"When ON, game will run with much lower CPU usage.", L"When ON, enhanced descriptions will be shown for items and weapons.", - L"When ON and enemy present, Turn Base mode persists untill sector is free (|C|T|R|L+|S|H|I|F|T+|A|L|T+|T).", // arynn : add forced turn mode + // arynn : add forced turn mode + L"When ON and enemy present, Turn Base mode persists untill sector is free (|C|T|R|L+|S|H|I|F|T+|A|L|T+|T).", + // arynn : immediate effect option that fixes corrupt ja2.set keeping of toggle options + L"Click me to fix corrupt game settings", + L"Click me to fix corrupt game settings", + // arynn : a sample options screen options header, this pop up help text never render (well as of yet) + L"(text not rendered)TOPTION_DEBUG_MODE_OPTIONS_HEADER", + // arynn : allow debug options that were set in debug.exe to continue in a rel.exe that shares same JA2.set file + L"Allows debug options that were set in debug.exe to continue in a rel.exe that shares same JA2.set file", + // arynn : a sample option which affects options screen listing only + L"Toggle to display debugging render options", + // arynn : a sample DEBUG build option + L"Attempts to display slash-rects around mouse regions", + // arynn : a sample options screen options divider, this pop up help text never render (well as of yet) + L"(text not rendered)TOPTION_DEBUG_MODE_OPTIONS_END", + // text past this point is for debugging, translating would doubtfully prove usefull + L"044", + L"045", + L"046", + L"047", + L"048", + L"049", + L"050", + L"051", + L"052", + L"053", + L"054", + L"055", + L"056", + L"057", + L"058", + L"059", + L"060", + L"061", + L"062", + L"063", + L"064", + L"065", + L"066", + L"067", + L"068", + L"069", + L"070", + L"071", + L"072", + L"073", + L"074", + L"075", + L"076", + L"077", + L"078", + L"079", + L"080", + L"081", + L"082", + L"083", + L"084", + L"085", + L"086", + L"087", + L"088", + L"089", + L"090", + L"091", + L"092", + L"093", + L"094", + L"095", + L"096", + L"097", + L"098", + L"099", + L"100", + + // arynn : this is THE LAST option that exists (debug the options screen, doesnt do anything, except exist) + L"TOPTION_LAST_OPTION", }; diff --git a/Utils/_FrenchText.cpp b/Utils/_FrenchText.cpp index 1750f5102..597951455 100644 --- a/Utils/_FrenchText.cpp +++ b/Utils/_FrenchText.cpp @@ -3693,6 +3693,81 @@ STR16 zOptionsToggleText[] = L"Faible consommation processeur", L"EDB (mod rajoutant info utiles)", L"Mode tour par tour forc", // arynn : add forced turn mode + // arynn : reset all toggle options, in cases for corrupted JA2.set files (and general debugging of options) + L"Reset ALL game options", + L"Do you really want to reset?", + // arynn : a sample options screen options header, just text, not a real option + L"--DEBUG OPTIONS--", + // arynn : allow debug options that were set in debug.exe to continue in a rel.exe that shares same JA2.set file + L"Retain Debug Options in Rel", + // arynn : a sample option which affects options screen listing only + L"DEBUG Render Option group", + // arynn : a sample DEBUG build option, this will draw slash-rects through current mouse region "hot spots" + L"Render Mouse Regions", + // arynn : a sample options screen options divider, just text, not a real option + L"-----------------", + + L"Option044", // arynn : note : everything south of here (should) only ever show in debug.. i doubt translating would prove useful + L"Option045", + L"Option046", + L"Option047", + L"Option048", + L"Option049", + L"Option050", + L"Option051", + L"Option052", + L"Option053", + L"Option054", + L"Option055", + L"Option056", + L"Option057", + L"Option058", + L"Option059", + L"Option060", + L"Option061", + L"Option062", + L"Option063", + L"Option064", + L"Option065", + L"Option066", + L"Option067", + L"Option068", + L"Option069", + L"Option070", + L"Option071", + L"Option072", + L"Option073", + L"Option074", + L"Option075", + L"Option076", + L"Option077", + L"Option078", + L"Option079", + L"Option080", + L"Option081", + L"Option082", + L"Option083", + L"Option084", + L"Option085", + L"Option086", + L"Option087", + L"Option088", + L"Option089", + L"Option090", + L"Option091", + L"Option092", + L"Option093", + L"Option094", + L"Option095", + L"Option096", + L"Option097", + L"Option098", + L"Option099", + L"Option100", + + // arynn : this is THE LAST option that exists (debug the options screen, doesnt do anything, except exist) + L"THE_LAST_OPTION", + }; //This is the help text associated with the above toggles. @@ -3775,6 +3850,81 @@ STR16 zOptionsScreenHelpText[] = L"Si activ, le jeu restreint l'utilisation du processeur.", L"Si activ, l'EDB sera affich pour les armes et objets.", L"Si cette option est active et que des ennemis sont prsents, \nle mode tour par tour est actif tant qu'il reste \ndes ennemis dans le secteur (|C|T|R|L+|S|H|I|F|T+|A|L|T+|T).", // arynn : add forced turn mode + // arynn : immediate effect option that fixes corrupt ja2.set keeping of toggle options + L"Click me to fix corrupt game settings", + L"Click me to fix corrupt game settings", + // arynn : a sample options screen options header, this pop up help text never render (well as of yet) + L"(text not rendered)TOPTION_DEBUG_MODE_OPTIONS_HEADER", + // arynn : allow debug options that were set in debug.exe to continue in a rel.exe that shares same JA2.set file + L"Allows debug options that were set in debug.exe to continue in a rel.exe that shares same JA2.set file", + // arynn : a sample option which affects options screen listing only + L"Toggle to display debugging render options", + // arynn : a sample DEBUG build option + L"Attempts to display slash-rects around mouse regions", + // arynn : a sample options screen options divider, this pop up help text never render (well as of yet) + L"(text not rendered)TOPTION_DEBUG_MODE_OPTIONS_END", + // text past this point is for debugging, translating would doubtfully prove usefull + L"044", + L"045", + L"046", + L"047", + L"048", + L"049", + L"050", + L"051", + L"052", + L"053", + L"054", + L"055", + L"056", + L"057", + L"058", + L"059", + L"060", + L"061", + L"062", + L"063", + L"064", + L"065", + L"066", + L"067", + L"068", + L"069", + L"070", + L"071", + L"072", + L"073", + L"074", + L"075", + L"076", + L"077", + L"078", + L"079", + L"080", + L"081", + L"082", + L"083", + L"084", + L"085", + L"086", + L"087", + L"088", + L"089", + L"090", + L"091", + L"092", + L"093", + L"094", + L"095", + L"096", + L"097", + L"098", + L"099", + L"100", + + // arynn : this is THE LAST option that exists (debug the options screen, doesnt do anything, except exist) + L"TOPTION_LAST_OPTION", + }; diff --git a/Utils/_GermanText.cpp b/Utils/_GermanText.cpp index 89fd15ffc..69074ca5a 100644 --- a/Utils/_GermanText.cpp +++ b/Utils/_GermanText.cpp @@ -3498,6 +3498,81 @@ STR16 zOptionsToggleText[] = L"Niedrige CPU Belastung", L"Erweiterte Gegenstandsinfo (EDB)", L"Erzwungender Runden-Modus", + // arynn : reset all toggle options, in cases for corrupted JA2.set files (and general debugging of options) + L"Reset ALL game options", + L"Do you really want to reset?", + // arynn : a sample options screen options header, just text, not a real option + L"--DEBUG OPTIONS--", + // arynn : allow debug options that were set in debug.exe to continue in a rel.exe that shares same JA2.set file + L"Retain Debug Options in Rel", + // arynn : a sample option which affects options screen listing only + L"DEBUG Render Option group", + // arynn : a sample DEBUG build option, this will draw slash-rects through current mouse region "hot spots" + L"Render Mouse Regions", + // arynn : a sample options screen options divider, just text, not a real option + L"-----------------", + + L"Option044", // arynn : note : everything south of here (should) only ever show in debug.. i doubt translating would prove useful + L"Option045", + L"Option046", + L"Option047", + L"Option048", + L"Option049", + L"Option050", + L"Option051", + L"Option052", + L"Option053", + L"Option054", + L"Option055", + L"Option056", + L"Option057", + L"Option058", + L"Option059", + L"Option060", + L"Option061", + L"Option062", + L"Option063", + L"Option064", + L"Option065", + L"Option066", + L"Option067", + L"Option068", + L"Option069", + L"Option070", + L"Option071", + L"Option072", + L"Option073", + L"Option074", + L"Option075", + L"Option076", + L"Option077", + L"Option078", + L"Option079", + L"Option080", + L"Option081", + L"Option082", + L"Option083", + L"Option084", + L"Option085", + L"Option086", + L"Option087", + L"Option088", + L"Option089", + L"Option090", + L"Option091", + L"Option092", + L"Option093", + L"Option094", + L"Option095", + L"Option096", + L"Option097", + L"Option098", + L"Option099", + L"Option100", + + // arynn : this is THE LAST option that exists (debug the options screen, doesnt do anything, except exist) + L"THE_LAST_OPTION", + }; //This is the help text associated with the above toggles. @@ -3580,6 +3655,81 @@ STR16 zOptionsScreenHelpText[] = L"Wenn diese Funktion aktiviert ist, wird das Spiel mit viel geringerer CPU Belastung laufen.", L"Wenn diese Funktion aktiviert ist, werden erweiterte Beschreibungen zu den Waffen und Gegenstnden angezeigt.", L"Wenn diese Funktion aktiviert ist und noch Gegner im Sektor sind, bleibt das Spiel im Runden-Mods bis alle Feinde tot sind (|C|T|R|L+|S|H|I|F|T+|A|L|T+|T).", + // arynn : immediate effect option that fixes corrupt ja2.set keeping of toggle options + L"Click me to fix corrupt game settings", + L"Click me to fix corrupt game settings", + // arynn : a sample options screen options header, this pop up help text never render (well as of yet) + L"(text not rendered)TOPTION_DEBUG_MODE_OPTIONS_HEADER", + // arynn : allow debug options that were set in debug.exe to continue in a rel.exe that shares same JA2.set file + L"Allows debug options that were set in debug.exe to continue in a rel.exe that shares same JA2.set file", + // arynn : a sample option which affects options screen listing only + L"Toggle to display debugging render options", + // arynn : a sample DEBUG build option + L"Attempts to display slash-rects around mouse regions", + // arynn : a sample options screen options divider, this pop up help text never render (well as of yet) + L"(text not rendered)TOPTION_DEBUG_MODE_OPTIONS_END", + // text past this point is for debugging, translating would doubtfully prove usefull + L"044", + L"045", + L"046", + L"047", + L"048", + L"049", + L"050", + L"051", + L"052", + L"053", + L"054", + L"055", + L"056", + L"057", + L"058", + L"059", + L"060", + L"061", + L"062", + L"063", + L"064", + L"065", + L"066", + L"067", + L"068", + L"069", + L"070", + L"071", + L"072", + L"073", + L"074", + L"075", + L"076", + L"077", + L"078", + L"079", + L"080", + L"081", + L"082", + L"083", + L"084", + L"085", + L"086", + L"087", + L"088", + L"089", + L"090", + L"091", + L"092", + L"093", + L"094", + L"095", + L"096", + L"097", + L"098", + L"099", + L"100", + + // arynn : this is THE LAST option that exists (debug the options screen, doesnt do anything, except exist) + L"TOPTION_LAST_OPTION", + }; STR16 gzGIOScreenText[] = diff --git a/Utils/_ItalianText.cpp b/Utils/_ItalianText.cpp index debed2a62..9a746cde4 100644 --- a/Utils/_ItalianText.cpp +++ b/Utils/_ItalianText.cpp @@ -3672,6 +3672,81 @@ STR16 zOptionsToggleText[] = L"Low CPU usage", L"Enhanced Description Box", L"Forced Turn Mode", // arynn : add forced turn mode + // arynn : reset all toggle options, in cases for corrupted JA2.set files (and general debugging of options) + L"Reset ALL game options", + L"Do you really want to reset?", + // arynn : a sample options screen options header, just text, not a real option + L"--DEBUG OPTIONS--", + // arynn : allow debug options that were set in debug.exe to continue in a rel.exe that shares same JA2.set file + L"Retain Debug Options in Rel", + // arynn : a sample option which affects options screen listing only + L"DEBUG Render Option group", + // arynn : a sample DEBUG build option, this will draw slash-rects through current mouse region "hot spots" + L"Render Mouse Regions", + // arynn : a sample options screen options divider, just text, not a real option + L"-----------------", + + L"Option044", // arynn : note : everything south of here (should) only ever show in debug.. i doubt translating would prove useful + L"Option045", + L"Option046", + L"Option047", + L"Option048", + L"Option049", + L"Option050", + L"Option051", + L"Option052", + L"Option053", + L"Option054", + L"Option055", + L"Option056", + L"Option057", + L"Option058", + L"Option059", + L"Option060", + L"Option061", + L"Option062", + L"Option063", + L"Option064", + L"Option065", + L"Option066", + L"Option067", + L"Option068", + L"Option069", + L"Option070", + L"Option071", + L"Option072", + L"Option073", + L"Option074", + L"Option075", + L"Option076", + L"Option077", + L"Option078", + L"Option079", + L"Option080", + L"Option081", + L"Option082", + L"Option083", + L"Option084", + L"Option085", + L"Option086", + L"Option087", + L"Option088", + L"Option089", + L"Option090", + L"Option091", + L"Option092", + L"Option093", + L"Option094", + L"Option095", + L"Option096", + L"Option097", + L"Option098", + L"Option099", + L"Option100", + + // arynn : this is THE LAST option that exists (debug the options screen, doesnt do anything, except exist) + L"THE_LAST_OPTION", + }; //This is the help text associated with the above toggles. @@ -3754,6 +3829,81 @@ STR16 zOptionsScreenHelpText[] = L"When ON, game will run with much lower CPU usage.", L"When ON, enhanced descriptions will be shown for items and weapons.", L"When ON and enemy present, Turn Base mode persists untill sector is free (|C|T|R|L+|S|H|I|F|T+|A|L|T+|T).", // arynn : add forced turn mode + // arynn : immediate effect option that fixes corrupt ja2.set keeping of toggle options + L"Click me to fix corrupt game settings", + L"Click me to fix corrupt game settings", + // arynn : a sample options screen options header, this pop up help text never render (well as of yet) + L"(text not rendered)TOPTION_DEBUG_MODE_OPTIONS_HEADER", + // arynn : allow debug options that were set in debug.exe to continue in a rel.exe that shares same JA2.set file + L"Allows debug options that were set in debug.exe to continue in a rel.exe that shares same JA2.set file", + // arynn : a sample option which affects options screen listing only + L"Toggle to display debugging render options", + // arynn : a sample DEBUG build option + L"Attempts to display slash-rects around mouse regions", + // arynn : a sample options screen options divider, this pop up help text never render (well as of yet) + L"(text not rendered)TOPTION_DEBUG_MODE_OPTIONS_END", + // text past this point is for debugging, translating would doubtfully prove usefull + L"044", + L"045", + L"046", + L"047", + L"048", + L"049", + L"050", + L"051", + L"052", + L"053", + L"054", + L"055", + L"056", + L"057", + L"058", + L"059", + L"060", + L"061", + L"062", + L"063", + L"064", + L"065", + L"066", + L"067", + L"068", + L"069", + L"070", + L"071", + L"072", + L"073", + L"074", + L"075", + L"076", + L"077", + L"078", + L"079", + L"080", + L"081", + L"082", + L"083", + L"084", + L"085", + L"086", + L"087", + L"088", + L"089", + L"090", + L"091", + L"092", + L"093", + L"094", + L"095", + L"096", + L"097", + L"098", + L"099", + L"100", + + // arynn : this is THE LAST option that exists (debug the options screen, doesnt do anything, except exist) + L"TOPTION_LAST_OPTION", + }; diff --git a/Utils/_PolishText.cpp b/Utils/_PolishText.cpp index 6a619f952..8798b662f 100644 --- a/Utils/_PolishText.cpp +++ b/Utils/_PolishText.cpp @@ -3686,6 +3686,81 @@ STR16 zOptionsToggleText[] = L"Niskie obcienie procesora", L"Rozszerzone Okno Opisu (EDB)", //Enhanced Description Box L"Wymu tryb turowy", // arynn : add forced turn mode + // arynn : reset all toggle options, in cases for corrupted JA2.set files (and general debugging of options) + L"Reset ALL game options", + L"Do you really want to reset?", + // arynn : a sample options screen options header, just text, not a real option + L"--DEBUG OPTIONS--", + // arynn : allow debug options that were set in debug.exe to continue in a rel.exe that shares same JA2.set file + L"Retain Debug Options in Rel", + // arynn : a sample option which affects options screen listing only + L"DEBUG Render Option group", + // arynn : a sample DEBUG build option, this will draw slash-rects through current mouse region "hot spots" + L"Render Mouse Regions", + // arynn : a sample options screen options divider, just text, not a real option + L"-----------------", + + L"Option044", // arynn : note : everything south of here (should) only ever show in debug.. i doubt translating would prove useful + L"Option045", + L"Option046", + L"Option047", + L"Option048", + L"Option049", + L"Option050", + L"Option051", + L"Option052", + L"Option053", + L"Option054", + L"Option055", + L"Option056", + L"Option057", + L"Option058", + L"Option059", + L"Option060", + L"Option061", + L"Option062", + L"Option063", + L"Option064", + L"Option065", + L"Option066", + L"Option067", + L"Option068", + L"Option069", + L"Option070", + L"Option071", + L"Option072", + L"Option073", + L"Option074", + L"Option075", + L"Option076", + L"Option077", + L"Option078", + L"Option079", + L"Option080", + L"Option081", + L"Option082", + L"Option083", + L"Option084", + L"Option085", + L"Option086", + L"Option087", + L"Option088", + L"Option089", + L"Option090", + L"Option091", + L"Option092", + L"Option093", + L"Option094", + L"Option095", + L"Option096", + L"Option097", + L"Option098", + L"Option099", + L"Option100", + + // arynn : this is THE LAST option that exists (debug the options screen, doesnt do anything, except exist) + L"THE_LAST_OPTION", + }; //This is the help text associated with the above toggles. @@ -3768,6 +3843,81 @@ STR16 zOptionsScreenHelpText[] = L"Jeli WCZONE, gra bdzie obciaa procesor w mniejszym stopniu.", L"Jeli WCZONE, rozszerzone opisy bd pokazane dla przedmiotw i broni.", L"Jeli WCZONE i wrg jest obecny, \ntryb turowy jest wczony, \ndopki sektor nie zostanie oczyszczony (|C|T|R|L+|S|H|I|F|T+|A|L|T+|T).", // arynn : add forced turn mode + // arynn : immediate effect option that fixes corrupt ja2.set keeping of toggle options + L"Click me to fix corrupt game settings", + L"Click me to fix corrupt game settings", + // arynn : a sample options screen options header, this pop up help text never render (well as of yet) + L"(text not rendered)TOPTION_DEBUG_MODE_OPTIONS_HEADER", + // arynn : allow debug options that were set in debug.exe to continue in a rel.exe that shares same JA2.set file + L"Allows debug options that were set in debug.exe to continue in a rel.exe that shares same JA2.set file", + // arynn : a sample option which affects options screen listing only + L"Toggle to display debugging render options", + // arynn : a sample DEBUG build option + L"Attempts to display slash-rects around mouse regions", + // arynn : a sample options screen options divider, this pop up help text never render (well as of yet) + L"(text not rendered)TOPTION_DEBUG_MODE_OPTIONS_END", + // text past this point is for debugging, translating would doubtfully prove usefull + L"044", + L"045", + L"046", + L"047", + L"048", + L"049", + L"050", + L"051", + L"052", + L"053", + L"054", + L"055", + L"056", + L"057", + L"058", + L"059", + L"060", + L"061", + L"062", + L"063", + L"064", + L"065", + L"066", + L"067", + L"068", + L"069", + L"070", + L"071", + L"072", + L"073", + L"074", + L"075", + L"076", + L"077", + L"078", + L"079", + L"080", + L"081", + L"082", + L"083", + L"084", + L"085", + L"086", + L"087", + L"088", + L"089", + L"090", + L"091", + L"092", + L"093", + L"094", + L"095", + L"096", + L"097", + L"098", + L"099", + L"100", + + // arynn : this is THE LAST option that exists (debug the options screen, doesnt do anything, except exist) + L"TOPTION_LAST_OPTION", + }; STR16 gzGIOScreenText[] = diff --git a/Utils/_RussianText.cpp b/Utils/_RussianText.cpp index 1f706ec53..18f8b425b 100644 --- a/Utils/_RussianText.cpp +++ b/Utils/_RussianText.cpp @@ -3687,6 +3687,81 @@ STR16 zOptionsToggleText[] = L" ", L" ", //Enhanced Description Box L" ", // arynn : add Forced Turn Mode + // arynn : reset all toggle options, in cases for corrupted JA2.set files (and general debugging of options) + L"Reset ALL game options", + L"Do you really want to reset?", + // arynn : a sample options screen options header, just text, not a real option + L"--DEBUG OPTIONS--", + // arynn : allow debug options that were set in debug.exe to continue in a rel.exe that shares same JA2.set file + L"Retain Debug Options in Rel", + // arynn : a sample option which affects options screen listing only + L"DEBUG Render Option group", + // arynn : a sample DEBUG build option, this will draw slash-rects through current mouse region "hot spots" + L"Render Mouse Regions", + // arynn : a sample options screen options divider, just text, not a real option + L"-----------------", + + L"Option044", // arynn : note : everything south of here (should) only ever show in debug.. i doubt translating would prove useful + L"Option045", + L"Option046", + L"Option047", + L"Option048", + L"Option049", + L"Option050", + L"Option051", + L"Option052", + L"Option053", + L"Option054", + L"Option055", + L"Option056", + L"Option057", + L"Option058", + L"Option059", + L"Option060", + L"Option061", + L"Option062", + L"Option063", + L"Option064", + L"Option065", + L"Option066", + L"Option067", + L"Option068", + L"Option069", + L"Option070", + L"Option071", + L"Option072", + L"Option073", + L"Option074", + L"Option075", + L"Option076", + L"Option077", + L"Option078", + L"Option079", + L"Option080", + L"Option081", + L"Option082", + L"Option083", + L"Option084", + L"Option085", + L"Option086", + L"Option087", + L"Option088", + L"Option089", + L"Option090", + L"Option091", + L"Option092", + L"Option093", + L"Option094", + L"Option095", + L"Option096", + L"Option097", + L"Option098", + L"Option099", + L"Option100", + + // arynn : this is THE LAST option that exists (debug the options screen, doesnt do anything, except exist) + L"THE_LAST_OPTION", + }; //This is the help text associated with the above toggles. @@ -3769,6 +3844,81 @@ STR16 zOptionsScreenHelpText[] = L" , \n .", L" , \n .", //EDB description L" , \n \n (|C|T|R|L+|S|H|I|F|T+|A|L|T+|T).", //When ON and enemy present, Turn Base mode persists untill sector is free (|C|T|R|L+|S|H|I|F|T+|A|L|T+|T). // arynn : add forced turn mode + // arynn : immediate effect option that fixes corrupt ja2.set keeping of toggle options + L"Click me to fix corrupt game settings", + L"Click me to fix corrupt game settings", + // arynn : a sample options screen options header, this pop up help text never render (well as of yet) + L"(text not rendered)TOPTION_DEBUG_MODE_OPTIONS_HEADER", + // arynn : allow debug options that were set in debug.exe to continue in a rel.exe that shares same JA2.set file + L"Allows debug options that were set in debug.exe to continue in a rel.exe that shares same JA2.set file", + // arynn : a sample option which affects options screen listing only + L"Toggle to display debugging render options", + // arynn : a sample DEBUG build option + L"Attempts to display slash-rects around mouse regions", + // arynn : a sample options screen options divider, this pop up help text never render (well as of yet) + L"(text not rendered)TOPTION_DEBUG_MODE_OPTIONS_END", + // text past this point is for debugging, translating would doubtfully prove usefull + L"044", + L"045", + L"046", + L"047", + L"048", + L"049", + L"050", + L"051", + L"052", + L"053", + L"054", + L"055", + L"056", + L"057", + L"058", + L"059", + L"060", + L"061", + L"062", + L"063", + L"064", + L"065", + L"066", + L"067", + L"068", + L"069", + L"070", + L"071", + L"072", + L"073", + L"074", + L"075", + L"076", + L"077", + L"078", + L"079", + L"080", + L"081", + L"082", + L"083", + L"084", + L"085", + L"086", + L"087", + L"088", + L"089", + L"090", + L"091", + L"092", + L"093", + L"094", + L"095", + L"096", + L"097", + L"098", + L"099", + L"100", + + // arynn : this is THE LAST option that exists (debug the options screen, doesnt do anything, except exist) + L"TOPTION_LAST_OPTION", + }; diff --git a/Utils/_TaiwaneseText.cpp b/Utils/_TaiwaneseText.cpp index b2f903915..9f65b00a3 100644 --- a/Utils/_TaiwaneseText.cpp +++ b/Utils/_TaiwaneseText.cpp @@ -3691,6 +3691,81 @@ STR16 zOptionsToggleText[] = L"Low CPU usage", L"Enhanced Description Box", L"Forced Turn Mode", // arynn : add forced turn mode + // arynn : reset all toggle options, in cases for corrupted JA2.set files (and general debugging of options) + L"Reset ALL game options", + L"Do you really want to reset?", + // arynn : a sample options screen options header, just text, not a real option + L"--DEBUG OPTIONS--", + // arynn : allow debug options that were set in debug.exe to continue in a rel.exe that shares same JA2.set file + L"Retain Debug Options in Rel", + // arynn : a sample option which affects options screen listing only + L"DEBUG Render Option group", + // arynn : a sample DEBUG build option, this will draw slash-rects through current mouse region "hot spots" + L"Render Mouse Regions", + // arynn : a sample options screen options divider, just text, not a real option + L"-----------------", + + L"Option044", // arynn : note : everything south of here (should) only ever show in debug.. i doubt translating would prove useful + L"Option045", + L"Option046", + L"Option047", + L"Option048", + L"Option049", + L"Option050", + L"Option051", + L"Option052", + L"Option053", + L"Option054", + L"Option055", + L"Option056", + L"Option057", + L"Option058", + L"Option059", + L"Option060", + L"Option061", + L"Option062", + L"Option063", + L"Option064", + L"Option065", + L"Option066", + L"Option067", + L"Option068", + L"Option069", + L"Option070", + L"Option071", + L"Option072", + L"Option073", + L"Option074", + L"Option075", + L"Option076", + L"Option077", + L"Option078", + L"Option079", + L"Option080", + L"Option081", + L"Option082", + L"Option083", + L"Option084", + L"Option085", + L"Option086", + L"Option087", + L"Option088", + L"Option089", + L"Option090", + L"Option091", + L"Option092", + L"Option093", + L"Option094", + L"Option095", + L"Option096", + L"Option097", + L"Option098", + L"Option099", + L"Option100", + + // arynn : this is THE LAST option that exists (debug the options screen, doesnt do anything, except exist) + L"THE_LAST_OPTION", + }; //This is the help text associated with the above toggles. @@ -3773,6 +3848,81 @@ STR16 zOptionsScreenHelpText[] = L"When ON, game will run with much lower CPU usage.", L"When ON, enhanced descriptions will be shown for items and weapons.", L"When ON and enemy present, Turn Base mode persists untill sector is free (|C|T|R|L+|S|H|I|F|T+|A|L|T+|T).", // arynn : add forced turn mode + // arynn : immediate effect option that fixes corrupt ja2.set keeping of toggle options + L"Click me to fix corrupt game settings", + L"Click me to fix corrupt game settings", + // arynn : a sample options screen options header, this pop up help text never render (well as of yet) + L"(text not rendered)TOPTION_DEBUG_MODE_OPTIONS_HEADER", + // arynn : allow debug options that were set in debug.exe to continue in a rel.exe that shares same JA2.set file + L"Allows debug options that were set in debug.exe to continue in a rel.exe that shares same JA2.set file", + // arynn : a sample option which affects options screen listing only + L"Toggle to display debugging render options", + // arynn : a sample DEBUG build option + L"Attempts to display slash-rects around mouse regions", + // arynn : a sample options screen options divider, this pop up help text never render (well as of yet) + L"(text not rendered)TOPTION_DEBUG_MODE_OPTIONS_END", + // text past this point is for debugging, translating would doubtfully prove usefull + L"044", + L"045", + L"046", + L"047", + L"048", + L"049", + L"050", + L"051", + L"052", + L"053", + L"054", + L"055", + L"056", + L"057", + L"058", + L"059", + L"060", + L"061", + L"062", + L"063", + L"064", + L"065", + L"066", + L"067", + L"068", + L"069", + L"070", + L"071", + L"072", + L"073", + L"074", + L"075", + L"076", + L"077", + L"078", + L"079", + L"080", + L"081", + L"082", + L"083", + L"084", + L"085", + L"086", + L"087", + L"088", + L"089", + L"090", + L"091", + L"092", + L"093", + L"094", + L"095", + L"096", + L"097", + L"098", + L"099", + L"100", + + // arynn : this is THE LAST option that exists (debug the options screen, doesnt do anything, except exist) + L"TOPTION_LAST_OPTION", + }; diff --git a/builddefines.h b/builddefines.h index e69f9c483..798e81569 100644 --- a/builddefines.h +++ b/builddefines.h @@ -22,7 +22,7 @@ #define FORCE_ASSERTS_ON -#define BLOOD_N_GORE_ENABLED +//#define BLOOD_N_GORE_ENABLED // arynn : del_me : defunct, german build's differed with blood and gore option.. it got universalized //#ifdef _DEBUG // #ifndef JA2TESTVERSION diff --git a/gameloop.cpp b/gameloop.cpp index 21599f48b..f36f78167 100644 --- a/gameloop.cpp +++ b/gameloop.cpp @@ -37,6 +37,9 @@ #include "Rain.h" // end rain +// arynn : render mouse regions +#include "line.h" + //network headers #include "connect.h" @@ -355,6 +358,41 @@ void GameLoop(void) // rain RenderRain(); + //DEBUG MODE : DEBUG RENDER ENTRY : point to drop in debugging render code + if( (gGameSettings.fOptions[TOPTION_RETAIN_DEBUG_OPTIONS_IN_RELEASE]) || (JA2BETAVERSION_FLAG)) + { + // arynn : render mouse regions + if(gGameSettings.fOptions[TOPTION_RENDER_MOUSE_REGIONS]) + { + MOUSE_REGION *curr; + UINT32 uiDestPitchBYTES; + UINT8 *pDestBuf; + + curr = get_first_entry_in_MSYS_RegList(); + + while((curr != NULL) ) + { + pDestBuf = LockVideoSurface( FRAME_BUFFER, &uiDestPitchBYTES ); + SetClippingRegionAndImageWidth( uiDestPitchBYTES, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT ); + LineDraw( TRUE, curr->RegionTopLeftX, curr->RegionTopLeftY, + curr->RegionBottomRightX, curr->RegionBottomRightY, + Get16BPPColor( FROMRGB( 200, 200, 200 )), pDestBuf); + RectangleDraw( TRUE, curr->RegionTopLeftX, curr->RegionTopLeftY, + curr->RegionBottomRightX, curr->RegionBottomRightY, + Get16BPPColor( FROMRGB( 200, 200, 200 )), pDestBuf); + curr = get_next_entry_in_MSYS_RegList(curr); + UnLockVideoSurface( FRAME_BUFFER ); + } + } + } + else + { + //when coming from a recent debug.exe to a rel.exe, and option to carry over debug functions is off, disable debug mode options + gGameSettings.fOptions[TOPTION_RENDER_MOUSE_REGIONS] = FALSE; + } + + + if( gfSkipFrame ) gfSkipFrame = FALSE; else