summaryrefslogtreecommitdiffstats
path: root/src/core/re3.cpp
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2020-11-30 23:47:10 +0100
committerNikolay Korolev <nickvnuk@gmail.com>2020-11-30 23:47:10 +0100
commitbcc51f4a284f7d96d388ec093a3e12c6ab6337c1 (patch)
tree3311da68498fc0556882464cb905fa42bd42d06d /src/core/re3.cpp
parentMerge remote-tracking branch 'upstream/master' (diff)
parentadded a few registered pointers and memory debug (diff)
downloadre3-bcc51f4a284f7d96d388ec093a3e12c6ab6337c1.tar
re3-bcc51f4a284f7d96d388ec093a3e12c6ab6337c1.tar.gz
re3-bcc51f4a284f7d96d388ec093a3e12c6ab6337c1.tar.bz2
re3-bcc51f4a284f7d96d388ec093a3e12c6ab6337c1.tar.lz
re3-bcc51f4a284f7d96d388ec093a3e12c6ab6337c1.tar.xz
re3-bcc51f4a284f7d96d388ec093a3e12c6ab6337c1.tar.zst
re3-bcc51f4a284f7d96d388ec093a3e12c6ab6337c1.zip
Diffstat (limited to 'src/core/re3.cpp')
-rw-r--r--src/core/re3.cpp11
1 files changed, 11 insertions, 0 deletions
diff --git a/src/core/re3.cpp b/src/core/re3.cpp
index ee747218..506b2714 100644
--- a/src/core/re3.cpp
+++ b/src/core/re3.cpp
@@ -29,6 +29,7 @@
#include "Script.h"
#include "postfx.h"
#include "custompipes.h"
+#include "MemoryHeap.h"
#ifdef DONT_TRUST_RECOGNIZED_JOYSTICKS
#include "FileMgr.h"
@@ -383,6 +384,10 @@ SwitchToMission(void)
}
#endif
+#ifdef USE_CUSTOM_ALLOCATOR
+static void ParseHeap(void) { gMainHeap.ParseHeap(); }
+#endif
+
static const char *carnames[] = {
"landstal", "idaho", "stinger", "linerun", "peren", "sentinel", "patriot", "firetruk", "trash", "stretch", "manana", "infernus", "blista", "pony",
"mule", "cheetah", "ambulan", "fbicar", "moonbeam", "esperant", "taxi", "kuruma", "bobcat", "mrwhoop", "bfinject", "corpse", "police", "enforcer",
@@ -565,6 +570,12 @@ DebugMenuPopulate(void)
DebugMenuAddVarBool8("Render", "Don't render Objects", &gbDontRenderObjects, nil);
DebugMenuAddVarBool8("Render", "Don't Render Water", &gbDontRenderWater, nil);
+#ifndef FINAL
+ DebugMenuAddVarBool8("Debug", "Print Memory Usage", &gbPrintMemoryUsage, nil);
+#ifdef USE_CUSTOM_ALLOCATOR
+ DebugMenuAddCmd("Debug", "Parse Heap", ParseHeap);
+#endif
+#endif
DebugMenuAddVarBool8("Debug", "Show cullzone debug stuff", &gbShowCullZoneDebugStuff, nil);
DebugMenuAddVarBool8("Debug", "Disable zone cull", &gbDisableZoneCull, nil);