summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2020-06-01 13:21:19 +0200
committeraap <aap@papnet.eu>2020-06-01 13:21:19 +0200
commit7c7727e7dab52483d9dbcf0002d95a8bf10e7b41 (patch)
treee48c0b57e48957b13066426007f8534ffe939e4c
parentfixed roadblocks (diff)
downloadre3-7c7727e7dab52483d9dbcf0002d95a8bf10e7b41.tar
re3-7c7727e7dab52483d9dbcf0002d95a8bf10e7b41.tar.gz
re3-7c7727e7dab52483d9dbcf0002d95a8bf10e7b41.tar.bz2
re3-7c7727e7dab52483d9dbcf0002d95a8bf10e7b41.tar.lz
re3-7c7727e7dab52483d9dbcf0002d95a8bf10e7b41.tar.xz
re3-7c7727e7dab52483d9dbcf0002d95a8bf10e7b41.tar.zst
re3-7c7727e7dab52483d9dbcf0002d95a8bf10e7b41.zip
-rw-r--r--src/core/main.cpp5
-rw-r--r--src/core/main.h1
-rw-r--r--src/core/re3.cpp4
-rw-r--r--src/render/WaterLevel.h1
4 files changed, 4 insertions, 7 deletions
diff --git a/src/core/main.cpp b/src/core/main.cpp
index a69890b0..eb39b287 100644
--- a/src/core/main.cpp
+++ b/src/core/main.cpp
@@ -73,7 +73,6 @@ float FramesPerSecond = 30.0f;
bool gbPrintShite = false;
bool gbModelViewer;
-//Custom Timebars Toggle
#ifdef TIMEBARS
bool gbShowTimebars;
#endif
@@ -1102,10 +1101,8 @@ Idle(void *arg)
#ifdef TIMEBARS
-//Custom Timebars toggle
if (gbShowTimebars)
- tbDisplay();
-
+ tbDisplay();
#endif
DoRWStuffEndOfFrame();
diff --git a/src/core/main.h b/src/core/main.h
index 5c514bbb..9ad4ed1c 100644
--- a/src/core/main.h
+++ b/src/core/main.h
@@ -14,7 +14,6 @@ extern wchar gUString[256];
extern wchar gUString2[256];
extern bool gbPrintShite;
extern bool gbModelViewer;
-//Custom Timebars Toggle
#ifdef TIMEBARS
extern bool gbShowTimebars;
#endif
diff --git a/src/core/re3.cpp b/src/core/re3.cpp
index c77cf6d9..38854f25 100644
--- a/src/core/re3.cpp
+++ b/src/core/re3.cpp
@@ -461,7 +461,7 @@ DebugMenuPopulate(void)
DebugMenuAddVarBool8("Render", "Don't render Peds", &gbDontRenderPeds, nil);
DebugMenuAddVarBool8("Render", "Don't render Vehicles", &gbDontRenderVehicles, nil);
DebugMenuAddVarBool8("Render", "Don't render Objects", &gbDontRenderObjects, nil);
- DebugMenuAddVarBool8("Render", "Donīt Render Water", &gbDontRenderWater, nil);
+ DebugMenuAddVarBool8("Render", "Don't Render Water", &gbDontRenderWater, nil);
DebugMenuAddVarBool8("Debug", "Edit on", &CSceneEdit::m_bEditOn, nil);
#ifdef MENU_MAP
@@ -492,7 +492,9 @@ DebugMenuPopulate(void)
DebugMenuAddCmd("Debug", "Stop Credits", CCredits::Stop);
DebugMenuAddVarBool8("Debug", "Show DebugStuffInRelease", &gbDebugStuffInRelease, nil);
+#ifdef TIMEBARS
DebugMenuAddVarBool8("Debug", "Show Timebars", &gbShowTimebars, nil);
+#endif
extern bool PrintDebugCode;
extern int16 DebugCamMode;
diff --git a/src/render/WaterLevel.h b/src/render/WaterLevel.h
index 325be0a5..269d6091 100644
--- a/src/render/WaterLevel.h
+++ b/src/render/WaterLevel.h
@@ -65,7 +65,6 @@
#define MAX_BOAT_WAKES 8
extern RwRaster* gpWaterRaster;
-//"Custom" Donīt Render Water Toggle
extern bool gbDontRenderWater;
class CWaterLevel