mirror of
https://github.com/halpz/re3.git
synced 2024-12-22 17:35:29 +00:00
some more little ps2 fixes
This commit is contained in:
parent
84a9ca0524
commit
43b4c8dd33
|
@ -371,7 +371,11 @@ CGame::FinalShutdown(void)
|
|||
CdStreamShutdown();
|
||||
}
|
||||
|
||||
#if GTA_VERSION <= GTA3_PS2_160
|
||||
bool CGame::Initialise(void)
|
||||
#else
|
||||
bool CGame::Initialise(const char* datFile)
|
||||
#endif
|
||||
{
|
||||
#ifdef GTA_PS2
|
||||
// TODO: upload VU0 collision code here
|
||||
|
|
|
@ -30,7 +30,11 @@ public:
|
|||
static void ShutdownRenderWare(void);
|
||||
static bool InitialiseOnceAfterRW(void);
|
||||
static void FinalShutdown(void);
|
||||
#if GTA_VERSION <= GTA3_PS2_160
|
||||
static bool Initialise(void);
|
||||
#else
|
||||
static bool Initialise(const char *datFile);
|
||||
#endif
|
||||
static bool ShutDown(void);
|
||||
static void ReInitGameObjectVariables(void);
|
||||
static void ReloadIPLs(void);
|
||||
|
|
|
@ -1688,7 +1688,7 @@ void TheGame(void)
|
|||
|
||||
CTimer::Initialise();
|
||||
|
||||
#ifdef GTA_PS2
|
||||
#if GTA_VERSION <= GTA3_PS2_160
|
||||
CGame::Initialise();
|
||||
#else
|
||||
CGame::Initialise("DATA\\GTA3.DAT");
|
||||
|
@ -1758,7 +1758,7 @@ void TheGame(void)
|
|||
|
||||
PUSH_MEMID(MEMID_RENDER);
|
||||
|
||||
if (!FrontEndMenuManager.m_bMenuActive || FrontEndMenuManager.m_bRenderGameInMenu == true && TheCamera.GetScreenFadeStatus() != FADE_2 )
|
||||
if ((!FrontEndMenuManager.m_bMenuActive || FrontEndMenuManager.m_bRenderGameInMenu == true) && TheCamera.GetScreenFadeStatus() != FADE_2 )
|
||||
{
|
||||
|
||||
PUSH_MEMID(MEMID_RENDERLIST);
|
||||
|
@ -1766,14 +1766,22 @@ void TheGame(void)
|
|||
CRenderer::PreRender();
|
||||
POP_MEMID();
|
||||
|
||||
#ifdef FIX_BUGS
|
||||
// This has to be done BEFORE RwCameraBeginUpdate
|
||||
RwCameraSetFarClipPlane(Scene.camera, CTimeCycle::GetFarClip());
|
||||
RwCameraSetFogDistance(Scene.camera, CTimeCycle::GetFogStart());
|
||||
#endif
|
||||
|
||||
if (CWeather::LightningFlash && !CCullZones::CamNoRain())
|
||||
DoRWStuffStartOfFrame_Horizon(255, 255, 255, 255, 255, 255, 255);
|
||||
else
|
||||
DoRWStuffStartOfFrame_Horizon(CTimeCycle::GetSkyTopRed(), CTimeCycle::GetSkyTopGreen(), CTimeCycle::GetSkyTopBlue(), CTimeCycle::GetSkyBottomRed(), CTimeCycle::GetSkyBottomGreen(), CTimeCycle::GetSkyBottomBlue(), 255);
|
||||
|
||||
DefinedState();
|
||||
#ifndef FIX_BUGS
|
||||
RwCameraSetFarClipPlane(Scene.camera, CTimeCycle::GetFarClip());
|
||||
RwCameraSetFogDistance(Scene.camera, CTimeCycle::GetFogStart());
|
||||
#endif
|
||||
|
||||
RenderScene();
|
||||
RenderDebugShit();
|
||||
|
@ -1794,8 +1802,7 @@ void TheGame(void)
|
|||
#endif
|
||||
CVisibilityPlugins::SetRenderWareCamera(Scene.camera);
|
||||
RwCameraClear(Scene.camera, &gColourTop, rwCAMERACLEARZ);
|
||||
if (!RsCameraBeginUpdate(Scene.camera))
|
||||
break;
|
||||
RsCameraBeginUpdate(Scene.camera);
|
||||
}
|
||||
|
||||
RenderMenus();
|
||||
|
|
Loading…
Reference in a new issue