2 files changed, 18 insertions, 8 deletions

diff --git a/src/main.cpp b/src/main.cpp
index f8f9561d..e56d6938 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -79,6 +79,7 @@ void DestroySplashScreen(void);
 
 extern void (*DebugMenuProcess)(void);
 extern void (*DebugMenuRender)(void);
+void DebugMenuInit(void);
 
 
 RwRGBA gColourTop;
@@ -350,9 +351,7 @@ Render2dStuff(void)
 	CPad::PrintErrorMessage();
 	CFont::DrawFonts();
 
-#if 0
 	DebugMenuRender();
-#endif
 }
 
 void
@@ -647,6 +646,10 @@ Initialise3D(void *param)
 {
 	if (RsRwInitialise(param))
 	{
+		//
+		DebugMenuInit();
+		//
+
 		return CGame::InitialiseRenderWare();
 	}
 
diff --git a/src/re3.cpp b/src/re3.cpp
index cff70ff4..55ce5699 100644
--- a/src/re3.cpp
+++ b/src/re3.cpp
@@ -91,12 +91,9 @@ DebugMenuInit(void)
 
 }
 
-int (*RsEventHandler_orig)(int a, int b);
-int
-delayedPatches10(int a, int b)
+void
+DebugMenuPopulate(void)
 {
-	DebugMenuInit();
-
 	if(DebugMenuLoad()){
 		DebugMenuAddVarBool8("Debug", "Show Ped Road Groups", (int8*)&gbShowPedRoadGroups, nil);
 		DebugMenuAddVarBool8("Debug", "Show Car Road Groups", (int8*)&gbShowCarRoadGroups, nil);
@@ -110,9 +107,19 @@ delayedPatches10(int a, int b)
 		DebugMenuAddCmd("Debug", "Start Credits", CCredits::Start);
 		DebugMenuAddCmd("Debug", "Stop Credits", CCredits::Stop);
 	}
+}
+
+/*
+int (*RsEventHandler_orig)(int a, int b);
+int
+delayedPatches10(int a, int b)
+{
+	DebugMenuInit();
+	DebugMenuPopulate();
 
 	return RsEventHandler_orig(a, b);
 }
+*/
 
 void __declspec(naked) HeadlightsFix()
 {
@@ -225,7 +232,7 @@ patch()
 
 	InterceptCall(&open_script_orig, open_script, 0x438869);
 
-	InterceptCall(&RsEventHandler_orig, delayedPatches10, 0x58275E);
+//	InterceptCall(&RsEventHandler_orig, delayedPatches10, 0x58275E);
 }
 
 BOOL WINAPI