Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink
Browse files
fixed debugmenu
  • Loading branch information
aap committed Jun 12, 2019
1 parent be1a244 commit 58cb42ca24a7aaf4fb9497784a5168a1924b875a
Showing with 18 additions and 8 deletions.
  1. +5 −2 src/main.cpp
  2. +13 −6 src/re3.cpp
@@ -79,6 +79,7 @@ void DestroySplashScreen(void);


extern void (*DebugMenuProcess)(void); extern void (*DebugMenuProcess)(void);
extern void (*DebugMenuRender)(void); extern void (*DebugMenuRender)(void);
void DebugMenuInit(void);




RwRGBA gColourTop; RwRGBA gColourTop;
@@ -350,9 +351,7 @@ Render2dStuff(void)
CPad::PrintErrorMessage(); CPad::PrintErrorMessage();
CFont::DrawFonts(); CFont::DrawFonts();


#if 0
DebugMenuRender(); DebugMenuRender();
#endif
} }


void void
@@ -647,6 +646,10 @@ Initialise3D(void *param)
{ {
if (RsRwInitialise(param)) if (RsRwInitialise(param))
{ {
//
DebugMenuInit();
//

return CGame::InitialiseRenderWare(); return CGame::InitialiseRenderWare();
} }


@@ -91,12 +91,9 @@ DebugMenuInit(void)


} }


int (*RsEventHandler_orig)(int a, int b); void
int DebugMenuPopulate(void)
delayedPatches10(int a, int b)
{ {
DebugMenuInit();

if(DebugMenuLoad()){ if(DebugMenuLoad()){
DebugMenuAddVarBool8("Debug", "Show Ped Road Groups", (int8*)&gbShowPedRoadGroups, nil); DebugMenuAddVarBool8("Debug", "Show Ped Road Groups", (int8*)&gbShowPedRoadGroups, nil);
DebugMenuAddVarBool8("Debug", "Show Car Road Groups", (int8*)&gbShowCarRoadGroups, 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", "Start Credits", CCredits::Start);
DebugMenuAddCmd("Debug", "Stop Credits", CCredits::Stop); 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); return RsEventHandler_orig(a, b);
} }
*/


void __declspec(naked) HeadlightsFix() void __declspec(naked) HeadlightsFix()
{ {
@@ -225,7 +232,7 @@ patch()


InterceptCall(&open_script_orig, open_script, 0x438869); InterceptCall(&open_script_orig, open_script, 0x438869);


InterceptCall(&RsEventHandler_orig, delayedPatches10, 0x58275E); // InterceptCall(&RsEventHandler_orig, delayedPatches10, 0x58275E);
} }


BOOL WINAPI BOOL WINAPI

0 comments on commit 58cb42c

Please sign in to comment.