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

ps2 fixes

Browse source
This commit is contained in:
aap 2020-12-20 17:35:37 +01:00
parent 30c8f870eb
commit bfb749d842
1 changed files with 56 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

90
src/core/main.cpp
View file

@ -85,7 +85,7 @@ bool gbModelViewer;
bool gbShowTimebars; bool gbShowTimebars;
#endif #endif
int32 frameCount; volatile int32 frameCount;
RwRGBA gColourTop; RwRGBA gColourTop;
@ -482,11 +482,11 @@ Initialise3D(void *param)
DebugMenuPopulate(); DebugMenuPopulate();
#endif // !DEBUGMENU #endif // !DEBUGMENU
#ifdef CUSTOM_FRONTEND_OPTIONS #ifdef CUSTOM_FRONTEND_OPTIONS
// Apparently this func. can be run multiple times at the start. // Apparently this func. can be run multiple times at the start.
if (numCustomFrontendOptions == 0 && numCustomFrontendScreens == 0) { if (numCustomFrontendOptions == 0 && numCustomFrontendScreens == 0) {
// needs stored language and TheText to be loaded, and last TheText reload is at the start of here // needs stored language and TheText to be loaded, and last TheText reload is at the start of here
CustomFrontendOptionsPopulate(); CustomFrontendOptionsPopulate();
} }
#endif #endif
bool ret = CGame::InitialiseRenderWare(); bool ret = CGame::InitialiseRenderWare();
#ifdef EXTENDED_PIPELINES #ifdef EXTENDED_PIPELINES
@ -1981,6 +1981,20 @@ void SystemInit()
#endif #endif
} }
int VBlankCounter(int ca)
{
frameCount++;
ExitHandler();
return 0;
}
// linked against by RW!
extern "C" void WaitVBlank(void)
{
int32 startFrame = frameCount;
while(startFrame == frameCount);
}
void GameInit() void GameInit()
{ {
if ( !gameAlreadyInitialised ) if ( !gameAlreadyInitialised )
@ -2024,11 +2038,16 @@ void GameInit()
"\\MODELS\\MISC.TXD;1", "\\MODELS\\MISC.TXD;1",
"\\MODELS\\GENERIC.TXD;1", "\\MODELS\\GENERIC.TXD;1",
"\\MODELS\\GTA3.DIR;1", "\\MODELS\\GTA3.DIR;1",
// TODO: japanese?
#ifdef GTA_PAL
"\\TEXT\\ENGLISH.GXT;1", "\\TEXT\\ENGLISH.GXT;1",
"\\TEXT\\FRENCH.GXT;1", "\\TEXT\\FRENCH.GXT;1",
"\\TEXT\\GERMAN.GXT;1", "\\TEXT\\GERMAN.GXT;1",
"\\TEXT\\ITALIAN.GXT;1", "\\TEXT\\ITALIAN.GXT;1",
"\\TEXT\\SPANISH.GXT;1", "\\TEXT\\SPANISH.GXT;1",
#else
"\\TEXT\\AMERICAN.GXT;1",
#endif
"\\TXD\\LOADSC0.TXD;1", "\\TXD\\LOADSC0.TXD;1",
"\\TXD\\LOADSC1.TXD;1", "\\TXD\\LOADSC1.TXD;1",
"\\TXD\\LOADSC2.TXD;1", "\\TXD\\LOADSC2.TXD;1",
@ -2142,6 +2161,36 @@ void GameInit()
} }
} }
void PlayIntroMPEGs()
{
#ifdef GTA_PS2
if (gameAlreadyInitialised)
RpSkySuspend();
InitMPEGPlayer();
#ifdef GTA_PAL
PlayMPEG("cdrom0:\\MOVIES\\DMAPAL.PSS;1", false);
if (CGame::frenchGame || CGame::germanGame)
PlayMPEG("cdrom0:\\MOVIES\\INTROPAF.PSS;1", true);
else
PlayMPEG("cdrom0:\\MOVIES\\INTROPAL.PSS;1", true);
#else
PlayMPEG("cdrom0:\\MOVIES\\DMANTSC.PSS;1", false);
PlayMPEG("cdrom0:\\MOVIES\\INTRNTSC.PSS;1", true);
#endif
ShutdownMPEGPlayer();
if ( gameAlreadyInitialised )
RpSkyResume();
#else
//TODO
#endif
}
int int
main(int argc, char *argv[]) main(int argc, char *argv[])
{ {
@ -2168,35 +2217,8 @@ main(int argc, char *argv[])
// eh? // eh?
} }
#endif #endif
#ifdef GTA_PS2
{
if (gameAlreadyInitialised)
RpSkySuspend();
InitMPEGPlayer(); PlayIntroMPEGs();
#ifdef GTA_PAL
PlayMPEG("cdrom0:\\MOVIES\\DMAPAL.PSS;1", false);
if (CGame::frenchGame || CGame::germanGame)
PlayMPEG("cdrom0:\\MOVIES\\INTROPAF.PSS;1", true);
else
PlayMPEG("cdrom0:\\MOVIES\\INTROPAL.PSS;1", true);
#else
PlayMPEG("cdrom0:\\MOVIES\\DMANTSC.PSS;1", false);
PlayMPEG("cdrom0:\\MOVIES\\INTRNTSC.PSS;1", true);
#endif
ShutdownMPEGPlayer();
if ( gameAlreadyInitialised )
RpSkyResume();
}
#else
//TODO
#endif
GameInit(); GameInit();