From affd3c6baa9505328a804263434b14ee0aba1b3f Mon Sep 17 00:00:00 2001
From: Sergeanur <s.anureev@yandex.ua>
Date: Sun, 20 Dec 2020 12:39:44 +0200
Subject: [PATCH 1/2] buildings directory

---
 premake5.lua                              | 2 ++
 src/{entities => buildings}/Building.cpp  | 0
 src/{entities => buildings}/Building.h    | 0
 src/{entities => buildings}/Solid.h       | 0
 src/{entities => buildings}/Treadable.cpp | 0
 src/{entities => buildings}/Treadable.h   | 0
 6 files changed, 2 insertions(+)
 rename src/{entities => buildings}/Building.cpp (100%)
 rename src/{entities => buildings}/Building.h (100%)
 rename src/{entities => buildings}/Solid.h (100%)
 rename src/{entities => buildings}/Treadable.cpp (100%)
 rename src/{entities => buildings}/Treadable.h (100%)

diff --git a/premake5.lua b/premake5.lua
index 85f4d082..ea26b0ac 100644
--- a/premake5.lua
+++ b/premake5.lua
@@ -234,6 +234,7 @@ project "re3"
 	files { addSrcFiles("src/audio") }
 	files { addSrcFiles("src/audio/eax") }
 	files { addSrcFiles("src/audio/oal") }
+	files { addSrcFiles("src/buildings") }
 	files { addSrcFiles("src/collision") }
 	files { addSrcFiles("src/control") }
 	files { addSrcFiles("src/core") }
@@ -257,6 +258,7 @@ project "re3"
 	includedirs { "src/audio" }
 	includedirs { "src/audio/eax" }
 	includedirs { "src/audio/oal" }
+	includedirs { "src/buildings" }
 	includedirs { "src/collision" }
 	includedirs { "src/control" }
 	includedirs { "src/core" }
diff --git a/src/entities/Building.cpp b/src/buildings/Building.cpp
similarity index 100%
rename from src/entities/Building.cpp
rename to src/buildings/Building.cpp
diff --git a/src/entities/Building.h b/src/buildings/Building.h
similarity index 100%
rename from src/entities/Building.h
rename to src/buildings/Building.h
diff --git a/src/entities/Solid.h b/src/buildings/Solid.h
similarity index 100%
rename from src/entities/Solid.h
rename to src/buildings/Solid.h
diff --git a/src/entities/Treadable.cpp b/src/buildings/Treadable.cpp
similarity index 100%
rename from src/entities/Treadable.cpp
rename to src/buildings/Treadable.cpp
diff --git a/src/entities/Treadable.h b/src/buildings/Treadable.h
similarity index 100%
rename from src/entities/Treadable.h
rename to src/buildings/Treadable.h

From 30c8f870eb9be57a25ef9901be6b1ab46172e597 Mon Sep 17 00:00:00 2001
From: aap <aap@papnet.eu>
Date: Sun, 20 Dec 2020 14:28:09 +0100
Subject: [PATCH 2/2] little ps2 fixes

---
 src/core/Game.cpp | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

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