mirror/re3
1
0
Fork 0
mirror of https://github.com/GTAmodding/re3.git synced 2025-07-07 11:04:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into miami

Browse source 
# Conflicts:
#	src/animation/AnimManager.cpp
#	src/control/CarCtrl.cpp
#	src/control/Curves.cpp
#	src/core/templates.h
This commit is contained in:
Sergeanur 2020-05-10 01:26:12 +03:00
commit 35c41208f5
15 changed files with 31 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/core/main.cpp
View file

@ -91,7 +91,9 @@ void GameInit(void);
void SystemInit(void);
void TheGame(void);
#ifdef DEBUGMENU
void DebugMenuPopulate(void);
#endif
void
@ -328,11 +330,10 @@ Initialise3D(void *param)
{
if (RsRwInitialise(param))
{
//
#ifdef DEBUGMENU
DebugMenuInit();
DebugMenuPopulate();
//
#endif // !DEBUGMENU
return CGame::InitialiseRenderWare();
}
@ -343,8 +344,9 @@ static void
Terminate3D(void)
{
CGame::ShutdownRenderWare();
#ifdef DEBUGMENU
DebugMenuShutdown();
#endif // !DEBUGMENU
RsRwTerminate();
@ -878,7 +880,9 @@ Render2dStuff(void)
CPad::PrintErrorMessage();
CFont::DrawFonts();
#ifdef DEBUGMENU
DebugMenuRender();
#endif
}
void