summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2020-06-01 10:44:45 +0200
committerGitHub <noreply@github.com>2020-06-01 10:44:45 +0200
commitf69313237e1b986c4468cad46bbaf8636bc7c4ac (patch)
tree50a0c86b32d12d1078fe63e532a74a3ba6b22622 /src
parentfixed bumper colmodel (diff)
parentAdd files via upload (diff)
downloadre3-f69313237e1b986c4468cad46bbaf8636bc7c4ac.tar
re3-f69313237e1b986c4468cad46bbaf8636bc7c4ac.tar.gz
re3-f69313237e1b986c4468cad46bbaf8636bc7c4ac.tar.bz2
re3-f69313237e1b986c4468cad46bbaf8636bc7c4ac.tar.lz
re3-f69313237e1b986c4468cad46bbaf8636bc7c4ac.tar.xz
re3-f69313237e1b986c4468cad46bbaf8636bc7c4ac.tar.zst
re3-f69313237e1b986c4468cad46bbaf8636bc7c4ac.zip
Diffstat (limited to 'src')
-rw-r--r--src/core/config.h4
-rw-r--r--src/core/main.cpp8
-rw-r--r--src/core/main.h4
-rw-r--r--src/core/re3.cpp6
-rw-r--r--src/render/WaterLevel.cpp7
-rw-r--r--src/render/WaterLevel.h2
6 files changed, 29 insertions, 2 deletions
diff --git a/src/core/config.h b/src/core/config.h
index 9b620cef..837d8165 100644
--- a/src/core/config.h
+++ b/src/core/config.h
@@ -186,7 +186,7 @@ enum Config {
# define NO_CDCHECK
# define CHATTYSPLASH // print what the game is loading
# define DEBUGMENU
-//# define TIMEBARS // print debug timers
+# define TIMEBARS // print debug timers
#endif
#define FIX_BUGS // fixes bugs that we've came across during reversing, TODO: use this more
@@ -228,7 +228,7 @@ enum Config {
#define CUSTOM_FRONTEND_OPTIONS
// Script
-#define USE_DEBUG_SCRIPT_LOADER // makes game load main_freeroam.scm by default
+#define USE_DEBUG_SCRIPT_LOADER // Loads main.scm by default. Hold R for main_freeroam.scm and D for main_d.scm
#define USE_MEASUREMENTS_IN_METERS // makes game use meters instead of feet in script
#define USE_PRECISE_MEASUREMENT_CONVERTION // makes game convert feet to meeters more precisely
#define MISSION_REPLAY // mobile feature
diff --git a/src/core/main.cpp b/src/core/main.cpp
index b5e222be..a69890b0 100644
--- a/src/core/main.cpp
+++ b/src/core/main.cpp
@@ -73,6 +73,10 @@ float FramesPerSecond = 30.0f;
bool gbPrintShite = false;
bool gbModelViewer;
+//Custom Timebars Toggle
+#ifdef TIMEBARS
+bool gbShowTimebars;
+#endif
int32 frameCount;
@@ -1096,8 +1100,12 @@ Idle(void *arg)
#endif
CCredits::Render();
+
#ifdef TIMEBARS
+//Custom Timebars toggle
+ if (gbShowTimebars)
tbDisplay();
+
#endif
DoRWStuffEndOfFrame();
diff --git a/src/core/main.h b/src/core/main.h
index 32a880d6..5c514bbb 100644
--- a/src/core/main.h
+++ b/src/core/main.h
@@ -14,6 +14,10 @@ extern wchar gUString[256];
extern wchar gUString2[256];
extern bool gbPrintShite;
extern bool gbModelViewer;
+//Custom Timebars Toggle
+#ifdef TIMEBARS
+extern bool gbShowTimebars;
+#endif
class CSprite2d;
diff --git a/src/core/re3.cpp b/src/core/re3.cpp
index df394056..c77cf6d9 100644
--- a/src/core/re3.cpp
+++ b/src/core/re3.cpp
@@ -28,6 +28,8 @@
#include "debugmenu.h"
#include "Frontend.h"
#include "Text.h"
+#include "WaterLevel.h"
+#include "main.h"
#ifndef _WIN32
#include "assert.h"
@@ -459,6 +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("Debug", "Edit on", &CSceneEdit::m_bEditOn, nil);
#ifdef MENU_MAP
@@ -488,6 +491,9 @@ DebugMenuPopulate(void)
DebugMenuAddCmd("Debug", "Start Credits", CCredits::Start);
DebugMenuAddCmd("Debug", "Stop Credits", CCredits::Stop);
+ DebugMenuAddVarBool8("Debug", "Show DebugStuffInRelease", &gbDebugStuffInRelease, nil);
+ DebugMenuAddVarBool8("Debug", "Show Timebars", &gbShowTimebars, nil);
+
extern bool PrintDebugCode;
extern int16 DebugCamMode;
DebugMenuAddVarBool8("Cam", "Use mouse Cam", &CCamera::m_bUseMouse3rdPerson, nil);
diff --git a/src/render/WaterLevel.cpp b/src/render/WaterLevel.cpp
index 1a28ce83..6133b1d7 100644
--- a/src/render/WaterLevel.cpp
+++ b/src/render/WaterLevel.cpp
@@ -35,6 +35,8 @@ bool CWaterLevel::WavesCalculatedThisFrame;
RpAtomic *CWaterLevel::ms_pWavyAtomic;
RpGeometry *CWaterLevel::apGeomArray[8];
int16 CWaterLevel::nGeomUsed;
+//"Custom" Donīt Render Water Toggle
+bool gbDontRenderWater;
//RwTexture *gpWaterTex;
//RwRaster *gpWaterRaster;
@@ -332,6 +334,11 @@ SectorRadius(float fSize)
void
CWaterLevel::RenderWater()
{
+//"Custom" Donīt Render Water Toggle
+#ifndef MASTER
+ if (gbDontRenderWater)
+ return;
+#endif
bool bUseCamEndX = false;
bool bUseCamStartY = false;
diff --git a/src/render/WaterLevel.h b/src/render/WaterLevel.h
index 985c9744..325be0a5 100644
--- a/src/render/WaterLevel.h
+++ b/src/render/WaterLevel.h
@@ -65,6 +65,8 @@
#define MAX_BOAT_WAKES 8
extern RwRaster* gpWaterRaster;
+//"Custom" Donīt Render Water Toggle
+extern bool gbDontRenderWater;
class CWaterLevel
{