summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorFilip Gawin <filip.gawin@zoho.com>2021-02-12 02:04:31 +0100
committererorcun <erorcunerorcun@hotmail.com.tr>2021-02-12 19:09:46 +0100
commit0c60ceeb33c06c17b35773ca4095c2d4c342a0dc (patch)
tree167934e328d12c31cd1d058c03411c60b38b3f0d /src/core
parentRemove version text, add toggleable debug info(with commit hash!) (diff)
downloadre3-0c60ceeb33c06c17b35773ca4095c2d4c342a0dc.tar
re3-0c60ceeb33c06c17b35773ca4095c2d4c342a0dc.tar.gz
re3-0c60ceeb33c06c17b35773ca4095c2d4c342a0dc.tar.bz2
re3-0c60ceeb33c06c17b35773ca4095c2d4c342a0dc.tar.lz
re3-0c60ceeb33c06c17b35773ca4095c2d4c342a0dc.tar.xz
re3-0c60ceeb33c06c17b35773ca4095c2d4c342a0dc.tar.zst
re3-0c60ceeb33c06c17b35773ca4095c2d4c342a0dc.zip
Diffstat (limited to 'src/core')
-rw-r--r--src/core/config.h4
-rw-r--r--src/core/main.cpp8
-rw-r--r--src/core/re3.cpp6
3 files changed, 8 insertions, 10 deletions
diff --git a/src/core/config.h b/src/core/config.h
index 506df4c5..71316439 100644
--- a/src/core/config.h
+++ b/src/core/config.h
@@ -195,8 +195,8 @@ enum Config {
// those infamous texts
#define DRAW_GAME_VERSION_TEXT
#ifdef DRAW_GAME_VERSION_TEXT
- #define TOGGLEABLE_VERSION_TEXT
- #define USE_OUR_VERSIONING // If you disable this then game will fetch version peds.col, as R* did while in development
+ // unlike R* development builds, ours has runtime switch on debug menu & .ini, and disabled as default.
+ #define USE_OUR_VERSIONING // If you disable this then game will fetch version from peds.col, as R* did while in development
#endif
// Memory allocation and compression
diff --git a/src/core/main.cpp b/src/core/main.cpp
index bb9bd296..52988afc 100644
--- a/src/core/main.cpp
+++ b/src/core/main.cpp
@@ -94,8 +94,8 @@ bool gbModelViewer;
#ifdef TIMEBARS
bool gbShowTimebars;
#endif
-#ifdef TOGGLEABLE_VERSION_TEXT
-bool gDrawVersionText;
+#ifdef DRAW_GAME_VERSION_TEXT
+bool gDrawVersionText; // Our addition, we think it was always enabled on !MASTER builds
#endif
volatile int32 frameCount;
@@ -1068,9 +1068,7 @@ DisplayGameDebugText()
#ifdef DRAW_GAME_VERSION_TEXT
wchar ver[200];
-#ifdef TOGGLEABLE_VERSION_TEXT
- if(gDrawVersionText)
-#endif
+ if(gDrawVersionText) // This realtime switch is our thing
{
#ifdef USE_OUR_VERSIONING
diff --git a/src/core/re3.cpp b/src/core/re3.cpp
index 9773b880..06789e4a 100644
--- a/src/core/re3.cpp
+++ b/src/core/re3.cpp
@@ -457,7 +457,7 @@ bool LoadINISettings()
#ifdef FIX_SPRITES
ReadIniIfExists("Draw", "FixSprites", &CDraw::ms_bFixSprites);
#endif
-#ifdef TOGGLEABLE_VERSION_TEXT
+#ifdef DRAW_GAME_VERSION_TEXT
extern bool gDrawVersionText;
ReadIniIfExists("General", "DrawVersionText", &gDrawVersionText);
#endif
@@ -554,7 +554,7 @@ void SaveINISettings()
#ifdef FIX_SPRITES
StoreIni("Draw", "FixSprites", CDraw::ms_bFixSprites);
#endif
-#ifdef TOGGLEABLE_VERSION_TEXT
+#ifdef DRAW_GAME_VERSION_TEXT
extern bool gDrawVersionText;
StoreIni("General", "DrawVersionText", gDrawVersionText);
#endif
@@ -997,7 +997,7 @@ extern bool gbRenderWorld2;
DebugMenuAddVarBool8("Draw", "Fix Sprites", &CDraw::ms_bFixSprites, nil);
#endif
-#ifdef TOGGLEABLE_VERSION_TEXT
+#ifdef DRAW_GAME_VERSION_TEXT
extern bool gDrawVersionText;
DebugMenuAddVarBool8("Debug", "Version Text", &gDrawVersionText, nil);
#endif