a3x/re3
1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-12-23 01:20:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
Nikolay Korolev 2020-12-20 17:08:21 +03:00
parent fc72ff24d0 30c8f870eb
commit db012aa9e0
7 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
premake5.lua
View file

@ -234,6 +234,7 @@ project "re3"
files { addSrcFiles("src/audio") } files { addSrcFiles("src/audio") }
files { addSrcFiles("src/audio/eax") } files { addSrcFiles("src/audio/eax") }
files { addSrcFiles("src/audio/oal") } files { addSrcFiles("src/audio/oal") }
files { addSrcFiles("src/buildings") }
files { addSrcFiles("src/collision") } files { addSrcFiles("src/collision") }
files { addSrcFiles("src/control") } files { addSrcFiles("src/control") }
files { addSrcFiles("src/core") } files { addSrcFiles("src/core") }
@ -257,6 +258,7 @@ project "re3"
includedirs { "src/audio" } includedirs { "src/audio" }
includedirs { "src/audio/eax" } includedirs { "src/audio/eax" }
includedirs { "src/audio/oal" } includedirs { "src/audio/oal" }
includedirs { "src/buildings" }
includedirs { "src/collision" } includedirs { "src/collision" }
includedirs { "src/control" } includedirs { "src/control" }
includedirs { "src/core" } includedirs { "src/core" }

0
src/entities/Building.cpp → src/buildings/Building.cpp
View file

0
src/entities/Building.h → src/buildings/Building.h
View file

0
src/entities/Solid.h → src/buildings/Solid.h
View file

0
src/entities/Treadable.cpp → src/buildings/Treadable.cpp
View file

0
src/entities/Treadable.h → src/buildings/Treadable.h
View file

25
src/core/Game.cpp
View file

@ -264,9 +264,9 @@ CGame::InitialiseRenderWare(void)
CFont::Initialise(); CFont::Initialise();
CHud::Initialise(); CHud::Initialise();
POP_MEMID(); POP_MEMID();
#endif
// TODO: define // TODO: define
CPlayerSkin::Initialise(); CPlayerSkin::Initialise();
#endif
return (true); return (true);
} }
@ -317,8 +317,8 @@ bool CGame::InitialiseOnceAfterRW(void)
CSurfaceTable::Initialise("DATA\\SURFACE.DAT"); CSurfaceTable::Initialise("DATA\\SURFACE.DAT");
CPedStats::Initialise(); CPedStats::Initialise();
CTimeCycle::Initialise(); CTimeCycle::Initialise();
#endif
#ifndef GTA_PS2
if ( DMAudio.GetNum3DProvidersAvailable() == 0 ) if ( DMAudio.GetNum3DProvidersAvailable() == 0 )
FrontEndMenuManager.m_nPrefsAudio3DProviderIndex = -1; FrontEndMenuManager.m_nPrefsAudio3DProviderIndex = -1;
@ -356,8 +356,9 @@ bool CGame::InitialiseOnceAfterRW(void)
DMAudio.SetEffectsMasterVolume(CMenuManager::m_PrefsSfxVolume); DMAudio.SetEffectsMasterVolume(CMenuManager::m_PrefsSfxVolume);
DMAudio.SetEffectsFadeVol(127); DMAudio.SetEffectsFadeVol(127);
DMAudio.SetMusicFadeVol(127); DMAudio.SetMusicFadeVol(127);
#endif
CWorld::Players[0].SetPlayerSkin(CMenuManager::m_PrefsSkinFile); CWorld::Players[0].SetPlayerSkin(CMenuManager::m_PrefsSkinFile);
#endif
return true; return true;
} }
@ -457,28 +458,24 @@ bool CGame::Initialise(const char* datFile)
CCarCtrl::Init(); CCarCtrl::Init();
POP_MEMID(); POP_MEMID();
PUSH_MEMID(MEMID_DEF_MODELS);
#if GTA_VERSION > GTA3_PS2_160 #if GTA_VERSION > GTA3_PS2_160
InitModelIndices(); InitModelIndices();
#endif #endif
PUSH_MEMID(MEMID_DEF_MODELS);
CModelInfo::Initialise(); CModelInfo::Initialise();
#if GTA_VERSION <= GTA3_PS2_160
CPedStats::Initialise(); // InitialiseOnceAfterRW #if GTA_VERSION > GTA3_PS2_160
#else
// probably moved before LoadLevel for multiplayer maps? // probably moved before LoadLevel for multiplayer maps?
CPickups::Init(); CPickups::Init();
CTheCarGenerators::Init(); CTheCarGenerators::Init();
#endif
#ifndef GTA_PS2 // or GTA_VERSION?
CdStreamAddImage("MODELS\\GTA3.IMG"); CdStreamAddImage("MODELS\\GTA3.IMG");
#endif
#if GTA_VERSION > GTA3_PS2_160
CFileLoader::LoadLevel("DATA\\DEFAULT.DAT"); CFileLoader::LoadLevel("DATA\\DEFAULT.DAT");
CFileLoader::LoadLevel(datFile); CFileLoader::LoadLevel(datFile);
#else #else
CPedStats::Initialise(); // InitialiseOnceAfterRW
CFileLoader::LoadLevel("GTA3.DAT"); CFileLoader::LoadLevel("GTA3.DAT");
#endif #endif
@ -520,7 +517,9 @@ bool CGame::Initialise(const char* datFile)
CStreaming::LoadInitialPeds(); CStreaming::LoadInitialPeds();
CStreaming::RequestBigBuildings(LEVEL_GENERIC); CStreaming::RequestBigBuildings(LEVEL_GENERIC);
CStreaming::LoadAllRequestedModels(false); CStreaming::LoadAllRequestedModels(false);
#if GTA_VERSION > GTA3_PS2_160
printf("Streaming uses %zuK of its memory", CStreaming::ms_memoryUsed / 1024); // original modifier was %d printf("Streaming uses %zuK of its memory", CStreaming::ms_memoryUsed / 1024); // original modifier was %d
#endif
LoadingScreen("Loading the Game", "Load animations", GetRandomSplashScreen()); LoadingScreen("Loading the Game", "Load animations", GetRandomSplashScreen());
PUSH_MEMID(MEMID_ANIMATION); PUSH_MEMID(MEMID_ANIMATION);
@ -618,11 +617,11 @@ bool CGame::Initialise(const char* datFile)
CRecordDataForChase::Init(); CRecordDataForChase::Init();
CReplay::Init(); CReplay::Init();
LoadingScreen("Loading the Game", "Start script", nil);
#ifdef PS2_MENU #ifdef PS2_MENU
if ( !TheMemoryCard.m_bWantToLoad ) if ( !TheMemoryCard.m_bWantToLoad )
#endif #endif
{ {
LoadingScreen("Loading the Game", "Start script", nil);
CTheScripts::StartTestScript(); CTheScripts::StartTestScript();
CTheScripts::Process(); CTheScripts::Process();
TheCamera.Process(); TheCamera.Process();