a3x/re3
1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2025-01-11 05:54:09 +00:00
Code Issues Projects Releases Wiki Activity

main.cpp mostly checked against ps2 now

Browse source
This commit is contained in:
aap 2020-12-20 19:13:37 +01:00
parent 036263993e
commit f60b450ee8
2 changed files with 26 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/core/Game.cpp
View file

@ -209,7 +209,7 @@ CGame::InitialiseRenderWare(void)
return (false); return (false);
} }
RwCameraSetFarClipPlane(Scene.camera, 2000.0f); // 250.0f on PS2 but who cares RwCameraSetFarClipPlane(Scene.camera, 2000.0f);
RwCameraSetNearClipPlane(Scene.camera, 0.9f); RwCameraSetNearClipPlane(Scene.camera, 0.9f);
CameraSize(Scene.camera, nil, DEFAULT_VIEWWINDOW, DEFAULT_ASPECT_RATIO); CameraSize(Scene.camera, nil, DEFAULT_VIEWWINDOW, DEFAULT_ASPECT_RATIO);

47
src/core/main.cpp
View file

@ -406,19 +406,21 @@ PluginAttach(void)
} }
#ifdef GTA_PS2 #ifdef GTA_PS2
#define NUM_PREALLOC_ATOMICS 3245 #define NUM_PREALLOC_ATOMICS 1800
#define NUM_PREALLOC_CLUMPS 101 #define NUM_PREALLOC_CLUMPS 80
#define NUM_PREALLOC_FRAMES 2821 #define NUM_PREALLOC_FRAMES 2600
#define NUM_PREALLOC_GEOMETRIES 1404 #define NUM_PREALLOC_GEOMETRIES 850
#define NUM_PREALLOC_TEXDICTS 106 #define NUM_PREALLOC_TEXDICTS 121
#define NUM_PREALLOC_TEXTURES 1900 #define NUM_PREALLOC_TEXTURES 1700
#define NUM_PREALLOC_MATERIALS 3300 #define NUM_PREALLOC_MATERIALS 2600
bool preAlloc; bool preAlloc;
void void
PreAllocateRwObjects(void) PreAllocateRwObjects(void)
{ {
int i; int i;
PUSH_MEMID(MEMID_PRE_ALLOC);
void **tmp = new void*[0x8000]; void **tmp = new void*[0x8000];
preAlloc = true; preAlloc = true;
@ -459,6 +461,7 @@ PreAllocateRwObjects(void)
delete[] tmp; delete[] tmp;
preAlloc = false; preAlloc = false;
POP_MEMID();
} }
#endif #endif
@ -1378,9 +1381,7 @@ RenderMenus(void)
{ {
if (FrontEndMenuManager.m_bMenuActive) if (FrontEndMenuManager.m_bMenuActive)
{ {
PUSH_MEMID(MEMID_FRONTEND);
FrontEndMenuManager.DrawFrontEnd(); FrontEndMenuManager.DrawFrontEnd();
POP_MEMID();
} }
} }
@ -1722,17 +1723,14 @@ void TheGame(void)
CTimer::Initialise(); CTimer::Initialise();
#ifdef GTA_PS2
CGame::Initialise();
#else
CGame::Initialise("DATA\\GTA3.DAT"); CGame::Initialise("DATA\\GTA3.DAT");
#endif
Const char *splash = GetRandomSplashScreen(); // inlined here Const char *splash = GetRandomSplashScreen(); // inlined here
LoadingScreen("Starting Game", NULL, splash); LoadingScreen("Starting Game", NULL, splash);
#ifdef GTA_PS2 #ifdef GTA_PS2
// TODO(MIAMI): not checked yet
if ( TheMemoryCard.CheckCardInserted(CARD_ONE) == CMemoryCard::NO_ERR_SUCCESS if ( TheMemoryCard.CheckCardInserted(CARD_ONE) == CMemoryCard::NO_ERR_SUCCESS
&& TheMemoryCard.ChangeDirectory(CARD_ONE, TheMemoryCard.Cards[CARD_ONE].dir) && TheMemoryCard.ChangeDirectory(CARD_ONE, TheMemoryCard.Cards[CARD_ONE].dir)
&& TheMemoryCard.FindMostRecentFileName(CARD_ONE, TheMemoryCard.MostRecentFile) == true && TheMemoryCard.FindMostRecentFileName(CARD_ONE, TheMemoryCard.MostRecentFile) == true
@ -1756,7 +1754,7 @@ void TheGame(void)
while (true) while (true)
{ {
if (WANT_TO_LOAD) if (FOUND_GAME_TO_LOAD)
{ {
Const char *splash1 = GetLevelSplashScreen(CGame::currLevel); Const char *splash1 = GetLevelSplashScreen(CGame::currLevel);
LoadSplash(splash1); LoadSplash(splash1);
@ -1792,14 +1790,18 @@ void TheGame(void)
PUSH_MEMID(MEMID_RENDER); PUSH_MEMID(MEMID_RENDER);
// m_bRenderGameInMenu is there in III PS2 but I don't know about VC PS2. CRenderer::ConstructRenderList();
if (!FrontEndMenuManager.m_bMenuActive || /*FrontEndMenuManager.m_bRenderGameInMenu == true && */TheCamera.GetScreenFadeStatus() != FADE_2 )
{
PUSH_MEMID(MEMID_RENDERLIST); if ((!FrontEndMenuManager.m_bMenuActive || FrontEndMenuManager.m_bRenderGameInMenu == true) && TheCamera.GetScreenFadeStatus() != FADE_2 )
CRenderer::ConstructRenderList(); {
CRenderer::PreRender(); CRenderer::PreRender();
POP_MEMID(); // TODO(MIAMI): something ps2all specific
#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()) if (CWeather::LightningFlash && !CCullZones::CamNoRain())
DoRWStuffStartOfFrame_Horizon(255, 255, 255, 255, 255, 255, 255); DoRWStuffStartOfFrame_Horizon(255, 255, 255, 255, 255, 255, 255);
@ -1807,8 +1809,10 @@ void TheGame(void)
DoRWStuffStartOfFrame_Horizon(CTimeCycle::GetSkyTopRed(), CTimeCycle::GetSkyTopGreen(), CTimeCycle::GetSkyTopBlue(), CTimeCycle::GetSkyBottomRed(), CTimeCycle::GetSkyBottomGreen(), CTimeCycle::GetSkyBottomBlue(), 255); DoRWStuffStartOfFrame_Horizon(CTimeCycle::GetSkyTopRed(), CTimeCycle::GetSkyTopGreen(), CTimeCycle::GetSkyTopBlue(), CTimeCycle::GetSkyBottomRed(), CTimeCycle::GetSkyBottomGreen(), CTimeCycle::GetSkyBottomBlue(), 255);
DefinedState(); DefinedState();
#ifndef FIX_BUGS
RwCameraSetFarClipPlane(Scene.camera, CTimeCycle::GetFarClip()); RwCameraSetFarClipPlane(Scene.camera, CTimeCycle::GetFarClip());
RwCameraSetFogDistance(Scene.camera, CTimeCycle::GetFogStart()); RwCameraSetFogDistance(Scene.camera, CTimeCycle::GetFogStart());
#endif
RenderScene(); RenderScene();
RenderDebugShit(); RenderDebugShit();
@ -1825,8 +1829,7 @@ void TheGame(void)
CameraSize(Scene.camera, NULL, SCREEN_VIEWWINDOW, SCREEN_ASPECT_RATIO); CameraSize(Scene.camera, NULL, SCREEN_VIEWWINDOW, SCREEN_ASPECT_RATIO);
CVisibilityPlugins::SetRenderWareCamera(Scene.camera); CVisibilityPlugins::SetRenderWareCamera(Scene.camera);
RwCameraClear(Scene.camera, &gColourTop, CLEARMODE); RwCameraClear(Scene.camera, &gColourTop, CLEARMODE);
if (!RsCameraBeginUpdate(Scene.camera)) RsCameraBeginUpdate(Scene.camera);
break;
} }
RenderMenus(); RenderMenus();