mirror/re3
1
0
Fork 0
mirror of https://github.com/GTAmodding/re3.git synced 2024-12-25 07:05:41 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #5 from GTAmodding/master

Browse source 
debugmenu fix
This commit is contained in:
Fire_Head 2019-06-12 13:40:59 +03:00 committed by GitHub
commit 047ecaf171
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/main.cpp
View file

@ -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();
} }

19
src/re3.cpp
View file

@ -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