21 files changed, 601 insertions, 80 deletions

diff --git a/src/animation/AnimBlendHierarchy.cpp b/src/animation/AnimBlendHierarchy.cpp
index 67b19019..c7800de5 100644
--- a/src/animation/AnimBlendHierarchy.cpp
+++ b/src/animation/AnimBlendHierarchy.cpp
@@ -82,3 +82,14 @@ CAnimBlendHierarchy::RemoveUncompressedData(void)
 #endif
 	compressed = 1;
 }
+
+#ifdef USE_CUSTOM_ALLOCATOR
+void
+CAnimBlendHierarchy::MoveMemory(bool onlyone)
+{
+	int i;
+	for(i = 0; i < numSequences; i++)
+		if(sequences[i].MoveMemory() && onlyone)
+			return;
+}
+#endif
diff --git a/src/animation/AnimBlendHierarchy.h b/src/animation/AnimBlendHierarchy.h
index 0144108d..e35b4925 100644
--- a/src/animation/AnimBlendHierarchy.h
+++ b/src/animation/AnimBlendHierarchy.h
@@ -2,6 +2,10 @@
 
 #include "templates.h"
 
+#ifdef MoveMemory
+#undef MoveMemory	// windows shit
+#endif
+
 class CAnimBlendSequence;
 
 // A collection of sequences
@@ -23,6 +27,7 @@ public:
 	void RemoveAnimSequences(void);
 	void Uncompress(void);
 	void RemoveUncompressedData(void);
+	void MoveMemory(bool onlyone = false);
 };
 
 VALIDATE_SIZE(CAnimBlendHierarchy, 0x28);
\ No newline at end of file
diff --git a/src/animation/AnimBlendSequence.cpp b/src/animation/AnimBlendSequence.cpp
index 5a2fa605..c958b71a 100644
--- a/src/animation/AnimBlendSequence.cpp
+++ b/src/animation/AnimBlendSequence.cpp
@@ -176,3 +176,24 @@ CAnimBlendSequence::RemoveUncompressedData(void)
 	keyFrames = nil;
 }
 
+#ifdef USE_CUSTOM_ALLOCATOR
+bool
+CAnimBlendSequence::MoveMemory(void)
+{
+	if(keyFrames){
+		void *newaddr = gMainHeap.MoveMemory(keyFrames);
+		if(newaddr != keyFrames){
+			keyFrames = newaddr;
+			return true;
+		}
+	}else if(keyFramesCompressed){
+		void *newaddr = gMainHeap.MoveMemory(keyFramesCompressed);
+		if(newaddr != keyFramesCompressed){
+			keyFramesCompressed = newaddr;
+			return true;
+		}
+	}
+	return false;
+}
+#endif
+
diff --git a/src/animation/AnimBlendSequence.h b/src/animation/AnimBlendSequence.h
index e51e5aaa..c6e70f22 100644
--- a/src/animation/AnimBlendSequence.h
+++ b/src/animation/AnimBlendSequence.h
@@ -2,6 +2,10 @@
 
 #include "Quaternion.h"
 
+#ifdef MoveMemory
+#undef MoveMemory	// windows shit
+#endif
+
 // TODO: put them somewhere else?
 struct KeyFrame {
 	CQuaternion rotation;
@@ -53,6 +57,7 @@ public:
 	void Uncompress(void);
 	void CompressKeyframes(void);
 	void RemoveUncompressedData(void);
+	bool MoveMemory(void);
 
 #ifdef PED_SKIN
 	void SetBoneTag(int tag) { boneTag = tag; }
diff --git a/src/control/Pickups.cpp b/src/control/Pickups.cpp
index 2503f5c8..1b1c8cbc 100644
--- a/src/control/Pickups.cpp
+++ b/src/control/Pickups.cpp
@@ -353,11 +353,11 @@ CPickup::Update(CPlayerPed *player, CVehicle *vehicle, int playerId)
 
 			m_pObject->GetMatrix().UpdateRW();
 			m_pObject->UpdateRwFrame();
-			if (CWaterLevel::GetWaterLevel(m_pObject->GetPosition().x, m_pObject->GetPosition().y, m_pObject->GetPosition().z + 5.0f, &waterLevel, 0) && waterLevel >= m_pObject->GetPosition().z)
+			if (CWaterLevel::GetWaterLevel(m_pObject->GetPosition().x, m_pObject->GetPosition().y, m_pObject->GetPosition().z + 5.0f, &waterLevel, false) && waterLevel >= m_pObject->GetPosition().z)
 				m_eType = PICKUP_FLOATINGPACKAGE_FLOATING;
 			break;
 		case PICKUP_FLOATINGPACKAGE_FLOATING:
-			if (CWaterLevel::GetWaterLevel(m_pObject->GetPosition().x, m_pObject->GetPosition().y, m_pObject->GetPosition().z + 5.0f, &waterLevel, 0))
+			if (CWaterLevel::GetWaterLevel(m_pObject->GetPosition().x, m_pObject->GetPosition().y, m_pObject->GetPosition().z + 5.0f, &waterLevel, false))
 				m_pObject->GetMatrix().GetPosition().z = waterLevel;
 
 			m_pObject->GetMatrix().UpdateRW();
diff --git a/src/control/Replay.cpp b/src/control/Replay.cpp
index f21703ac..757af0a9 100644
--- a/src/control/Replay.cpp
+++ b/src/control/Replay.cpp
@@ -1,5 +1,5 @@
 #include "common.h"
-
+#ifdef GTA_REPLAY
 #include "AnimBlendAssociation.h"
 #include "Boat.h"
 #include "SpecialFX.h"
@@ -1585,3 +1585,4 @@ void CReplay::Display()
 	if (Mode == MODE_PLAYBACK)
 		CFont::PrintString(SCREEN_SCALE_X(63.5f), SCREEN_SCALE_Y(30.0f), TheText.Get("REPLAY"));
 }
+#endif
diff --git a/src/control/Replay.h b/src/control/Replay.h
index 66bee3bf..cb58a602 100644
--- a/src/control/Replay.h
+++ b/src/control/Replay.h
@@ -63,6 +63,12 @@ struct CStoredDetailedAnimationState
 
 void PlayReplayFromHD(void);
 
+#ifdef GTA_REPLAY
+#define REPLAY_STUB
+#else
+#define REPLAY_STUB {}
+#endif
+
 class CReplay
 {
 	enum {
@@ -273,20 +279,24 @@ private:
 #endif
 
 public:
-	static void Init(void);
-	static void DisableReplays(void);
-	static void EnableReplays(void);
-	static void Update(void);
-	static void FinishPlayback(void);
-	static void EmptyReplayBuffer(void);
-	static void Display(void);
-	static void TriggerPlayback(uint8 cam_mode, float cam_x, float cam_y, float cam_z, bool load_scene);
-	static void StreamAllNecessaryCarsAndPeds(void);
-	static bool ShouldStandardCameraBeProcessed(void);
+	static void Init(void) REPLAY_STUB;
+	static void DisableReplays(void) REPLAY_STUB;
+	static void EnableReplays(void) REPLAY_STUB;
+	static void Update(void) REPLAY_STUB;
+	static void FinishPlayback(void) REPLAY_STUB;
+	static void EmptyReplayBuffer(void) REPLAY_STUB;
+	static void Display(void) REPLAY_STUB;
+	static void TriggerPlayback(uint8 cam_mode, float cam_x, float cam_y, float cam_z, bool load_scene) REPLAY_STUB;
+	static void StreamAllNecessaryCarsAndPeds(void) REPLAY_STUB;
 
+#ifndef GTA_REPLAY
+	static bool ShouldStandardCameraBeProcessed(void) { return true; }
+	static bool IsPlayingBack() { return false; }
+	static bool IsPlayingBackFromFile() { return false; }
+#else
+	static bool ShouldStandardCameraBeProcessed(void);
 	static bool IsPlayingBack() { return Mode == MODE_PLAYBACK; }
 	static bool IsPlayingBackFromFile() { return bPlayingBackFromFile; }
-
 private:
 	static void RecordThisFrame(void);
 	static void StorePedUpdate(CPed *ped, int id);
@@ -314,4 +324,5 @@ private:
 
 	/* Absolute nonsense, but how could this function end up being outside of class? */
 	friend void PlayReplayFromHD(void); 
+#endif
 };
diff --git a/src/core/Camera.cpp b/src/core/Camera.cpp
index 1e1aa722..51876c93 100644
--- a/src/core/Camera.cpp
+++ b/src/core/Camera.cpp
@@ -94,9 +94,9 @@ CCamera::Init(void)
 #endif
 
 #ifdef PS2_MENU
-	if ( !TheMemoryCard.m_bWantToLoad && !FrontEndMenuManager.m_bWantToRestart ) {
+	if ( !TheMemoryCard.m_bWantToLoad && !FrontEndMenuManager.m_bWantToRestart )
 #endif
-	
+	{
 	#ifdef FIX_BUGS
 		static const CCamera DummyCamera = CCamera(0.f);
 		*this = DummyCamera;
@@ -110,9 +110,7 @@ CCamera::Init(void)
 	#endif
 		m_pRwCamera = nil;
 	
-#ifdef PS2_MENU
 	}
-#endif
 	
 	m_1rstPersonRunCloseToAWall = false;
 	m_fPositionAlongSpline = 0.0f;
@@ -719,10 +717,14 @@ CCamera::Process(void)
 		LODDistMultiplier = 70.0f/CDraw::GetFOV() * CDraw::GetAspectRatio()/(4.0f/3.0f);
 	else
 		LODDistMultiplier = 1.0f;
-	// missing on PS2
+#ifdef FIX_BUGS
+	// from VC. to high values bug out spawns
+	LODDistMultiplier = Min(LODDistMultiplier, 2.2f);
+#endif
+#if GTA_VERSION > GTA3_PS2_160
 	GenerationDistMultiplier = LODDistMultiplier;
 	LODDistMultiplier *= CRenderer::ms_lodDistScale;
-	//
+#endif
 
 	// Keep track of speed
 	if(m_bJustInitalised || m_bJust_Switched){
diff --git a/src/core/FileLoader.cpp b/src/core/FileLoader.cpp
index aeaede56..b9d475b8 100644
--- a/src/core/FileLoader.cpp
+++ b/src/core/FileLoader.cpp
@@ -59,7 +59,13 @@ CFileLoader::LoadLevel(const char *filename)
 		savedTxd = RwTexDictionaryCreate();
 		RwTexDictionarySetCurrent(savedTxd);
 	}
+#if GTA_VERSION <= GTA3_PS2_160
+	CFileMgr::ChangeDir("\\DATA\\");
 	fd = CFileMgr::OpenFile(filename, "r");
+	CFileMgr::ChangeDir("\\");
+#else
+	fd = CFileMgr::OpenFile(filename, "r");
+#endif
 	assert(fd > 0);
 
 	for(line = LoadLine(fd); line; line = LoadLine(fd)){
diff --git a/src/core/Game.cpp b/src/core/Game.cpp
index d22a7184..6b9fd11f 100644
--- a/src/core/Game.cpp
+++ b/src/core/Game.cpp
@@ -91,6 +91,9 @@
 #include "screendroplets.h"
 #include "crossplatform.h"
 #include "MemoryHeap.h"
+#ifdef USE_TEXTURE_POOL
+#include "TexturePools.h"
+#endif
 
 eLevelName CGame::currLevel;
 bool CGame::bDemoMode = true;
@@ -167,6 +170,7 @@ void ReplaceAtomicPipeCallback();
 #endif // PS2_ALPHA_TEST
 #endif // !LIBRW
 
+// missing altogether on PS2, mostly done in GameInit there it seems
 bool
 CGame::InitialiseRenderWare(void)
 {
@@ -233,6 +237,7 @@ CGame::InitialiseRenderWare(void)
 	return (true);
 }
 
+// missing altogether on PS2
 void CGame::ShutdownRenderWare(void)
 {
 	CMBlur::MotionBlurClose();
@@ -265,16 +270,19 @@ void CGame::ShutdownRenderWare(void)
 #endif
 }
 
+// missing altogether on PS2
 bool CGame::InitialiseOnceAfterRW(void)
 {
+#if GTA_VERSION > GTA3_PS2_160
 	TheText.Load();
-	DMAudio.Initialise();
+	DMAudio.Initialise();	// before TheGame() on PS2
 	CTimer::Initialise();
 	CTempColModels::Initialise();
 	mod_HandlingManager.Initialise();
 	CSurfaceTable::Initialise("DATA\\SURFACE.DAT");
 	CPedStats::Initialise();
 	CTimeCycle::Initialise();
+#endif
 
 	if ( DMAudio.GetNum3DProvidersAvailable() == 0 )
 		FrontEndMenuManager.m_nPrefsAudio3DProviderIndex = -1;
@@ -318,6 +326,7 @@ bool CGame::InitialiseOnceAfterRW(void)
 	return true;
 }
 
+// missing altogether on PS2
 void
 CGame::FinalShutdown(void)
 {	
@@ -330,10 +339,15 @@ bool CGame::Initialise(const char* datFile)
 {
 #ifdef GTA_PS2
 	// TODO: upload VU0 collision code here
-#else
+#endif
+
+#if GTA_VERSION > GTA3_PS2_160
 	ResetLoadingScreenBar();
 	strcpy(aDatFile, datFile);
 	CPools::Initialise();	// done in CWorld on PS2
+#endif
+
+#ifndef GTA_PS2
 	CIniFile::LoadIniFile();
 #endif
 
@@ -367,13 +381,15 @@ bool CGame::Initialise(const char* datFile)
 	CWeather::Init();
 	CCullZones::Init();
 	CCollision::Init();
-#ifdef PS2_MENU
+#ifdef PS2_MENU	// TODO: is this the right define?
 	TheText.Load();
 #endif
 	CTheZones::Init();
 	CUserDisplay::Init();
 	CMessages::Init();
+#if GTA_VERSION > GTA3_PS2_160
 	CMessages::ClearAllMessagesDisplayedByGame();
+#endif
 	CRecordDataForGame::Init();
 	CRestart::Initialise();
 
@@ -381,11 +397,17 @@ bool CGame::Initialise(const char* datFile)
 	CWorld::Initialise();
 	POP_MEMID();
 
+#if GTA_VERSION <= GTA3_PS2_160
+	mod_HandlingManager.Initialise();
+	CSurfaceTable::Initialise("DATA\\SURFACE.DAT");
+	CTempColModels::Initialise();
+#endif
+
 	PUSH_MEMID(MEMID_TEXTURES);
 	CParticle::Initialise();
 	POP_MEMID();
 
-#ifdef GTA_PS2
+#if GTA_VERSION <= GTA3_PS2_160
 	gStartX = -180.0f;
 	gStartY = 180.0f;
 	gStartZ = 14.0f;
@@ -400,20 +422,31 @@ bool CGame::Initialise(const char* datFile)
 	CCarCtrl::Init();
 	POP_MEMID();
 
-#ifndef GTA_PS2
+#if GTA_VERSION > GTA3_PS2_160
 	InitModelIndices();
 #endif
 
 	PUSH_MEMID(MEMID_DEF_MODELS);
 	CModelInfo::Initialise();
-#ifndef GTA_PS2
+#if GTA_VERSION <= GTA3_PS2_160
+	CPedStats::Initialise();	// InitialiseOnceAfterRW
+#else
 	// 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
+	CFileLoader::LoadLevel("GTA3.DAT");
+#endif
+
 #ifdef EXTENDED_PIPELINES
 	// for generic fallback
 	CustomPipes::SetTxdFindCallback();
@@ -424,18 +457,25 @@ bool CGame::Initialise(const char* datFile)
 	CTheZones::PostZoneCreation();
 	POP_MEMID();
 
+#if GTA_VERSION <= GTA3_PS2_160
+	TestModelIndices();
+#endif
 	LoadingScreen("Loading the Game", "Setup paths", GetRandomSplashScreen());
 	ThePaths.PreparePathData();
-	// done elsewhere on PS2
+#if GTA_VERSION > GTA3_PS2_160
 	for (int i = 0; i < NUMPLAYERS; i++)
 		CWorld::Players[i].Clear();
 	CWorld::Players[0].LoadPlayerSkin();
 	TestModelIndices();
-	//
+#endif
 
 	LoadingScreen("Loading the Game", "Setup water", nil);
 	CWaterLevel::Initialise("DATA\\WATER.DAT");
+#if GTA_VERSION <= GTA3_PS2_160
+	CTimeCycle::Initialise();	// InitialiseOnceAfterRW
+#else
 	TheConsole.Init();
+#endif
 	CDraw::SetFOV(120.0f);
 	CDraw::ms_fLODDistance = 500.0f;
 
@@ -472,6 +512,11 @@ bool CGame::Initialise(const char* datFile)
 
 	LoadingScreen("Loading the Game", "Setup game variables", nil);
 	CPopulation::Initialise();
+#if GTA_VERSION <= GTA3_PS2_160
+	for (int i = 0; i < NUMPLAYERS; i++)
+		CWorld::Players[i].Clear();
+//	CWorld::Players[0].LoadPlayerSkin();	// TODO: use a define for this
+#endif
 	CWorld::PlayerInFocus = 0;
 	CCoronas::Init();
 	CShadows::Init();
@@ -480,7 +525,7 @@ bool CGame::Initialise(const char* datFile)
 	CAntennas::Init();
 	CGlass::Init();
 	gPhoneInfo.Initialise();
-#ifndef GTA_PS2
+#ifndef GTA_PS2		// TODO: define for this
 	CSceneEdit::Initialise();
 #endif
 
@@ -491,11 +536,11 @@ bool CGame::Initialise(const char* datFile)
 	POP_MEMID();
 
 	LoadingScreen("Loading the Game", "Setup game variables", nil);
-#ifdef GTA_PS2
+#if GTA_VERSION <= GTA3_PS2_160
 	CTimer::Initialise();
 #endif
 	CClock::Initialise(1000);
-#ifdef GTA_PS2
+#if GTA_VERSION <= GTA3_PS2_160
 	CTheCarGenerators::Init();
 #endif
 	CHeli::InitHelis();
@@ -503,27 +548,35 @@ bool CGame::Initialise(const char* datFile)
 	CMovingThings::Init();
 	CDarkel::Init();
 	CStats::Init();
-#ifdef GTA_PS2
+#if GTA_VERSION <= GTA3_PS2_160
 	CPickups::Init();
 #endif
 	CPacManPickups::Init();
-	// CGarages::Init(); here on PS2 instead
+#if GTA_VERSION <= GTA3_PS2_160
+	CGarages::Init();
+#endif
 	CRubbish::Init();
 	CClouds::Init();
-#ifdef GTA_PS2
+#if GTA_VERSION <= GTA3_PS2_160
 	CRemote::Init();
 #endif
 	CSpecialFX::Init();
 	CWaterCannons::Init();
 	CBridge::Init();
+#if GTA_VERSION > GTA3_PS2_160
 	CGarages::Init();
+#endif
 
 	LoadingScreen("Loading the Game", "Position dynamic objects", nil);
 	CWorld::RepositionCertainDynamicObjects();
-	// CCullZones::ResolveVisibilities(); on PS2 here instead
+#if GTA_VERSION <= GTA3_PS2_160
+	CCullZones::ResolveVisibilities();
+#endif
 
 	LoadingScreen("Loading the Game", "Initialise vehicle paths", nil);
+#if GTA_VERSION > GTA3_PS2_160
 	CCullZones::ResolveVisibilities();
+#endif
 	CTrain::InitTrains();
 	CPlane::InitPlanes();
 	CCredits::Init();
@@ -532,15 +585,13 @@ bool CGame::Initialise(const char* datFile)
 
 #ifdef PS2_MENU
 	if ( !TheMemoryCard.m_bWantToLoad )
-	{
 #endif
-	LoadingScreen("Loading the Game", "Start script", nil);
-	CTheScripts::StartTestScript();
-	CTheScripts::Process();
-	TheCamera.Process();
-#ifdef PS2_MENU
+	{
+		LoadingScreen("Loading the Game", "Start script", nil);
+		CTheScripts::StartTestScript();
+		CTheScripts::Process();
+		TheCamera.Process();
 	}
-#endif
 
 	LoadingScreen("Loading the Game", "Load scene", nil);
 	CModelInfo::RemoveColModelsFromOtherLevels(currLevel);
@@ -556,7 +607,7 @@ bool CGame::ShutDown(void)
 	CPlane::Shutdown();
 	CTrain::Shutdown();
 	CSpecialFX::Shutdown();
-#ifndef PS2
+#if GTA_VERSION > GTA3_PS2_160
 	CGarages::Shutdown();
 #endif
 	CMovingThings::Shutdown();
@@ -597,7 +648,9 @@ bool CGame::ShutDown(void)
 	CSkidmarks::Shutdown();
 	CWeaponEffects::Shutdown();
 	CParticle::Shutdown();
+#if GTA_VERSION > GTA3_PS2_160
 	CPools::ShutDown();
+#endif
 	CTxdStore::RemoveTxdSlot(gameTxdSlot);
 	CdStreamRemoveImages();
 	return true;
@@ -608,13 +661,11 @@ void CGame::ReInitGameObjectVariables(void)
 	CGameLogic::InitAtStartOfGame();
 #ifdef PS2_MENU
 	if ( !TheMemoryCard.m_bWantToLoad )
-	{
 #endif
-	TheCamera.Init();
-	TheCamera.SetRwCamera(Scene.camera);
-#ifdef PS2_MENU
+	{
+		TheCamera.Init();
+		TheCamera.SetRwCamera(Scene.camera);
 	}
-#endif
 	CDebug::DebugInitTextBuffer();
 	CWeather::Init();
 	CUserDisplay::Init();
@@ -623,7 +674,7 @@ void CGame::ReInitGameObjectVariables(void)
 	CWorld::bDoingCarCollisions = false;
 	CHud::ReInitialise();
 	CRadar::Initialise();
-#ifdef GTA_PS2
+#if GTA_VERSION <= GTA3_PS2_160
 	gStartX = -180.0f;
 	gStartY = 180.0f;
 	gStartZ = 14.0f;
@@ -646,7 +697,7 @@ void CGame::ReInitGameObjectVariables(void)
 		CWorld::Players[i].Clear();
 	
 	CWorld::PlayerInFocus = 0;
-#ifdef GTA_PS2
+#if GTA_VERSION <= GTA3_PS2_160
 	CWeaponEffects::Init();
 	CSkidmarks::Init();
 #endif
@@ -669,7 +720,7 @@ void CGame::ReInitGameObjectVariables(void)
 	CPickups::Init();
 	CPacManPickups::Init();
 	CGarages::Init();
-#ifdef GTA_PS2
+#if GTA_VERSION <= GTA3_PS2_160
 	CClouds::Init();
 	CRemote::Init();
 #endif
@@ -739,7 +790,7 @@ void CGame::ShutDownForRestart(void)
 	CRadar::RemoveRadarSections();
 	FrontEndMenuManager.UnloadTextures();
 	CParticleObject::RemoveAllParticleObjects();
-#ifndef PS2
+#if GTA_VERSION >= GTA3_PS2_160
 	CPedType::Shutdown();
 	CSpecialFX::Shutdown();
 #endif
@@ -925,7 +976,9 @@ void CGame::Process(void)
 		CSkidmarks::Update();
 		CAntennas::Update();
 		CGlass::Update();
+#ifndef GTA_PS2		// TODO: define
 		CSceneEdit::Update();
+#endif
 		CEventList::Update();
 		CParticle::Update();
 		gFireManager.Update();
@@ -977,23 +1030,163 @@ void CGame::Process(void)
 #endif
 }
 
-void CGame::DrasticTidyUpMemory(bool)
+int32 gNumMemMoved;
+
+RwTexture *
+MoveTextureMemoryCB(RwTexture *texture, void *pData)
+{
+	// TODO
+	return texture;
+}
+
+bool
+TidyUpModelInfo(CBaseModelInfo *,bool)
+{
+	// TODO
+	return false;
+}
+
+void CGame::DrasticTidyUpMemory(bool flushDraw)
 {
 #ifdef USE_CUSTOM_ALLOCATOR
-	// meow
+	bool removedCol = false;
+
+	TidyUpMemory(true, flushDraw);
+
+	if(gMainHeap.GetLargestFreeBlock() < 200000 && !playingIntro){
+		CStreaming::RemoveIslandsNotUsed(LEVEL_INDUSTRIAL);
+		CStreaming::RemoveIslandsNotUsed(LEVEL_COMMERCIAL);
+		CStreaming::RemoveIslandsNotUsed(LEVEL_SUBURBAN);
+		TidyUpMemory(true, flushDraw);
+	}
+
+	if(gMainHeap.GetLargestFreeBlock() < 200000 && !playingIntro){
+		CModelInfo::RemoveColModelsFromOtherLevels(LEVEL_GENERIC);
+		TidyUpMemory(true, flushDraw);
+		removedCol = true;
+	}
+
+	if(gMainHeap.GetLargestFreeBlock() < 200000 && !playingIntro){
+		CStreaming::RemoveBigBuildings(LEVEL_INDUSTRIAL);
+		CStreaming::RemoveBigBuildings(LEVEL_COMMERCIAL);
+		CStreaming::RemoveBigBuildings(LEVEL_SUBURBAN);
+		TidyUpMemory(true, flushDraw);
+	}
+
+	if(removedCol){
+		// different on PS2
+		CFileLoader::LoadCollisionFromDatFile(CCollision::ms_collisionInMemory);
+	}
+
+	if(!playingIntro)
+		CStreaming::RequestBigBuildings(currLevel);
+
+	CStreaming::LoadAllRequestedModels(true);
 #endif
 }
 
-void CGame::TidyUpMemory(bool, bool)
+void CGame::TidyUpMemory(bool moveTextures, bool flushDraw)
 {
 #ifdef USE_CUSTOM_ALLOCATOR
-	// meow
+	printf("Largest free block before tidy %d\n", gMainHeap.GetLargestFreeBlock());
+
+	if(moveTextures){
+		if(flushDraw){
+#ifdef GTA_PS2
+			for(int i = 0; i < sweMaxFlips+1; i++){
+#else
+			for(int i = 0; i < 5; i++){	// probably more than needed
+#endif
+				RwCameraBeginUpdate(Scene.camera);
+				RwCameraEndUpdate(Scene.camera);
+				RwCameraShowRaster(Scene.camera, nil, 0);
+			}
+		}
+		int fontSlot = CTxdStore::FindTxdSlot("fonts");
+
+		for(int i = 0; i < TXDSTORESIZE; i++){
+			if(i == fontSlot ||
+			   CTxdStore::GetSlot(i) == nil)
+				continue;
+			RwTexDictionary *txd = CTxdStore::GetSlot(i)->texDict;
+			if(txd)
+				RwTexDictionaryForAllTextures(txd, MoveTextureMemoryCB, nil);
+		}
+	}
+
+	// animations
+	for(int i = 0; i < NUMANIMATIONS; i++){
+		CAnimBlendHierarchy *anim = CAnimManager::GetAnimation(i);
+		if(anim == nil)
+			continue;	// cannot happen
+		anim->MoveMemory();
+	}
+
+	// model info
+	for(int i = 0; i < MODELINFOSIZE; i++){
+		CBaseModelInfo *mi = CModelInfo::GetModelInfo(i);
+		if(mi == nil)
+			continue;
+		TidyUpModelInfo(mi, false);
+	}
+
+	printf("Largest free block after tidy %d\n", gMainHeap.GetLargestFreeBlock());
 #endif
 }
 
 void CGame::ProcessTidyUpMemory(void)
 {
 #ifdef USE_CUSTOM_ALLOCATOR
-	// meow
+	static int32 modelIndex = 0;
+	static int32 animIndex = 0;
+	static int32 txdIndex = 0;
+	bool txdReturn = false;
+	RwTexDictionary *txd = nil;
+	gNumMemMoved = 0;
+
+	// model infos
+	for(int numCleanedUp = 0; numCleanedUp < 10; numCleanedUp++){
+		CBaseModelInfo *mi;
+		do{
+			mi = CModelInfo::GetModelInfo(modelIndex);
+			modelIndex++;
+			if(modelIndex >= MODELINFOSIZE)
+				modelIndex = 0;
+		}while(mi == nil);
+
+		if(TidyUpModelInfo(mi, true))
+			return;
+	}
+
+	// tex dicts
+	for(int numCleanedUp = 0; numCleanedUp < 3; numCleanedUp++){
+		if(gNumMemMoved > 80)
+			break;
+
+		do{
+#ifdef FIX_BUGS
+			txd = nil;
+#endif
+			if(CTxdStore::GetSlot(txdIndex))
+				txd = CTxdStore::GetSlot(txdIndex)->texDict;
+			txdIndex++;
+			if(txdIndex >= TXDSTORESIZE)
+				txdIndex = 0;
+		}while(txd == nil);
+
+		RwTexDictionaryForAllTextures(txd, MoveTextureMemoryCB, &txdReturn);
+		if(txdReturn)
+			return;
+	}
+
+	// animations
+	CAnimBlendHierarchy *anim;
+	do{
+		anim = CAnimManager::GetAnimation(animIndex);
+		animIndex++;
+		if(animIndex >= NUMANIMATIONS)
+			animIndex = 0;
+	}while(anim == nil);	// always != nil
+	anim->MoveMemory(true);
 #endif
 }
diff --git a/src/core/World.cpp b/src/core/World.cpp
index 70388b38..844a4fb7 100644
--- a/src/core/World.cpp
+++ b/src/core/World.cpp
@@ -53,7 +53,7 @@ bool CWorld::bIncludeCarTyres;
 void
 CWorld::Initialise()
 {
-#ifdef GTA_PS2
+#if GTA_VERSION <= GTA3_PS2_160
 	CPools::Initialise();
 #endif
 	pIgnoreEntity = nil;
@@ -1791,6 +1791,9 @@ CWorld::ShutDown(void)
 		}
 	}
 	ms_listMovingEntityPtrs.Flush();
+#if GTA_VERSION <= GTA3_PS2_160
+	CPools::Shutdown();
+#endif
 }
 
 void
diff --git a/src/core/config.h b/src/core/config.h
index 5d528d50..07e91ee2 100644
--- a/src/core/config.h
+++ b/src/core/config.h
@@ -196,6 +196,7 @@ enum Config {
 #		define RANDOMSPLASH	// use random splash as on PS2
 #		define PS2_MATFX
 #	endif
+#	define GTA_REPLAY
 #elif defined GTA_XBOX
 #endif
 
diff --git a/src/core/main.cpp b/src/core/main.cpp
index 102548b6..fa16b6c2 100644
--- a/src/core/main.cpp
+++ b/src/core/main.cpp
@@ -415,6 +415,7 @@ PluginAttach(void)
 	return TRUE;
 }
 
+// rather different on PS2
 static RwBool 
 Initialise3D(void *param)
 {
diff --git a/src/rw/MemoryHeap.cpp b/src/rw/MemoryHeap.cpp
index 0b333ce1..469262d3 100644
--- a/src/rw/MemoryHeap.cpp
+++ b/src/rw/MemoryHeap.cpp
@@ -187,7 +187,7 @@ CMemoryHeap::Malloc(uint32 size)
 	void *mem = Malloc(size);
 	if (removeCollision) {
 		CTimer::Stop();
-		// different on PS2
+		// TODO: different on PS2
 		CFileLoader::LoadCollisionFromDatFile(CCollision::ms_collisionInMemory);
 		removeCollision = false;
 		CTimer::Update();
diff --git a/src/rw/MemoryHeap.h b/src/rw/MemoryHeap.h
index 484cbfab..23163c1c 100644
--- a/src/rw/MemoryHeap.h
+++ b/src/rw/MemoryHeap.h
@@ -198,6 +198,7 @@ public:
 	void TidyHeap(void);
 	uint32 GetMemoryUsed(int32 id);
 	uint32 GetBlocksUsed(int32 id);
+	int32 GetLargestFreeBlock(void) { return m_freeList.m_last.m_prev->m_size; }
 
 	void ParseHeap(void);
 
diff --git a/src/rw/RwHelper.cpp b/src/rw/RwHelper.cpp
index ee370c37..e0133985 100644
--- a/src/rw/RwHelper.cpp
+++ b/src/rw/RwHelper.cpp
@@ -605,11 +605,6 @@ CameraCreate(RwInt32 width, RwInt32 height, RwBool zBuffer)
 	return (nil);
 }
 
-#ifdef USE_TEXTURE_POOL
-WRAPPER void _TexturePoolsInitialise() { EAXJMP(0x598B10); }
-WRAPPER void _TexturePoolsShutdown() { EAXJMP(0x598B30); }
-#endif
-
 #ifdef LIBRW
 #include <rpmatfx.h>
 #include "VehicleModelInfo.h"
diff --git a/src/rw/RwHelper.h b/src/rw/RwHelper.h
index ed9b03ab..1a5f64b1 100644
--- a/src/rw/RwHelper.h
+++ b/src/rw/RwHelper.h
@@ -50,8 +50,6 @@ RwCamera *CameraCreate(RwInt32 width,
                        RwBool zBuffer);
 
 					   
-void _TexturePoolsInitialise();
-void _TexturePoolsShutdown();
 
 RpAtomic *ConvertPlatformAtomic(RpAtomic *atomic, void *data);
 
diff --git a/src/rw/TexturePools.cpp b/src/rw/TexturePools.cpp
new file mode 100644
index 00000000..c2ba6cf9
--- /dev/null
+++ b/src/rw/TexturePools.cpp
@@ -0,0 +1,221 @@
+#ifndef LIBRW
+
+#include <d3d8.h>
+#define WITHD3D
+#include "common.h"
+#include "TexturePools.h"
+
+// TODO: this needs to be integrated into RW
+
+extern "C" LPDIRECT3DDEVICE8 _RwD3DDevice;
+
+CTexturePool aTexturePools[12];
+CPaletteList PaletteList;
+int numTexturePools;
+int MaxPaletteIndex;
+bool bUsePaletteIndex = true;
+
+
+void
+CTexturePool::Create(D3DFORMAT _Format, int _size, uint32 mipmapLevels, int32 numTextures)
+{
+	Format = _Format;
+	size = _size;
+	levels = mipmapLevels;
+	pTextures = new IDirect3DTexture8 *[numTextures];
+	texturesMax = numTextures;
+	texturesNum = 0;
+	texturesUsed = 0;
+}
+
+void
+CTexturePool::Release()
+{
+	int i = 0;
+	while (i < texturesNum) {
+		pTextures[i]->Release();
+		i++;
+	}
+
+	delete[] pTextures;
+
+	pTextures = nil;
+	texturesNum = 0;
+	texturesUsed = 0;
+}
+
+IDirect3DTexture8 *
+CTexturePool::FindTexture()
+{
+	if (texturesNum == 0)
+		return nil;
+	texturesUsed--;
+	return pTextures[--texturesNum];
+}
+
+bool
+CTexturePool::AddTexture(IDirect3DTexture8 *texture)
+{
+	++texturesUsed;
+	if (texturesNum >= texturesMax)
+		return false;
+	pTextures[texturesNum] = texture;
+	++texturesNum;
+	return true;
+}
+
+void
+CTexturePool::Resize(int numTextures)
+{
+	if (numTextures == texturesMax)
+		return;
+
+	IDirect3DTexture8 **newTextures = new IDirect3DTexture8 *[numTextures];
+
+	for (int i = 0; i < texturesNum && i < numTextures; i++)
+		newTextures[i] = pTextures[i];
+
+	if (numTextures < texturesNum) {
+		for (int i = numTextures; i < texturesNum; i++)
+			pTextures[i]->Release();
+	}
+	delete[] pTextures;
+	pTextures = newTextures;
+	texturesMax = numTextures;
+}
+
+void
+CPaletteList::Alloc(int max)
+{
+	Data = new int[max];
+	Max = max;
+	Num = 0;
+}
+
+void
+CPaletteList::Free()
+{
+	delete[] Data;
+	Data = nil;
+	Num = 0;
+}
+
+int
+CPaletteList::Find()
+{
+	if (Num == 0)
+		return -1;
+	return Data[--Num];
+}
+
+void
+CPaletteList::Add(int item)
+{
+	if (Num < Max)
+		Data[Num++] = item;
+	else {
+		Resize(2 * Max);
+		Add(item);
+	}
+}
+
+void
+CPaletteList::Resize(int max)
+{
+	if (max == Max)
+		return;
+
+	int *newData = new int[4 * max];
+	for (int i = 0; i < Num && i < max; i++)
+		newData[i] = Data[i];
+	delete[] Data;
+	Data = newData;
+	Max = max;
+}
+
+HRESULT
+CreateTexture(int width, int height, int levels, D3DFORMAT Format, IDirect3DTexture8 **texture)
+{
+	if (width == height) {
+		for (int i = 0; i < numTexturePools; i++) {
+			if (width != aTexturePools[i].GetSize() && levels == aTexturePools[i].levels && Format == aTexturePools[i].Format) 
+				*texture = aTexturePools[i].FindTexture();
+		}
+	}
+	if (*texture)
+		return D3D_OK;
+	else
+		return _RwD3DDevice->CreateTexture(width, height, levels, 0, Format, D3DPOOL_MANAGED, texture);
+}
+
+void
+ReleaseTexture(IDirect3DTexture8 *texture)
+{
+	int levels = 1;
+	if (texture->GetLevelCount() > 1)
+		levels = 0;
+
+	D3DSURFACE_DESC SURFACE_DESC;
+
+	texture->GetLevelDesc(0, &SURFACE_DESC);
+
+	if (SURFACE_DESC.Width == SURFACE_DESC.Height) {
+		for (int i = 0; i < numTexturePools; i++) {
+			if (SURFACE_DESC.Width == aTexturePools[i].GetSize() && SURFACE_DESC.Format == aTexturePools[i].Format && levels == aTexturePools[i].levels) {
+				if (!aTexturePools[i].AddTexture(texture)) {
+					if (aTexturePools[i].texturesUsed > 3 * aTexturePools[i].texturesMax / 2) {
+						aTexturePools[i].Resize(2 * aTexturePools[i].texturesMax);
+						aTexturePools[i].texturesUsed--;
+						aTexturePools[i].AddTexture(texture);
+					} else {
+						texture->Release();
+					}
+				}
+				return;
+			}
+		}
+	}
+	if (numTexturePools < 12 && bUsePaletteIndex && levels != 0 && SURFACE_DESC.Width == SURFACE_DESC.Height &&
+	    (SURFACE_DESC.Width == 64 || SURFACE_DESC.Width == 128 || SURFACE_DESC.Width == 256)) {
+		aTexturePools[numTexturePools].Create(SURFACE_DESC.Format, SURFACE_DESC.Width, 1, 16);
+		aTexturePools[numTexturePools].AddTexture(texture);
+		numTexturePools++;
+	} else
+		texture->Release();
+}
+
+int
+FindAvailablePaletteIndex()
+{
+	int index = PaletteList.Find();
+	if (index == -1)
+		index = MaxPaletteIndex++;
+	return index;
+}
+
+void
+AddAvailablePaletteIndex(int index)
+{
+	if (bUsePaletteIndex)
+		PaletteList.Add(index);
+}
+
+void
+_TexturePoolsInitialise()
+{
+	PaletteList.Alloc(100);
+	MaxPaletteIndex = 0;
+}
+
+void
+_TexturePoolsShutdown()
+{
+	for (int i = 0; i < numTexturePools; i++)
+		aTexturePools[i].Release();
+
+	numTexturePools = 0;
+	bUsePaletteIndex = false;
+	PaletteList.Free();
+}
+
+#endif // !LIBRW
\ No newline at end of file
diff --git a/src/rw/TexturePools.h b/src/rw/TexturePools.h
new file mode 100644
index 00000000..75187432
--- /dev/null
+++ b/src/rw/TexturePools.h
@@ -0,0 +1,42 @@
+#pragma once
+
+class CTexturePool
+{
+public:
+	D3DFORMAT Format;
+	int size;
+	uint32 levels;
+	int32 texturesMax;
+	int32 texturesUsed;
+	int32 texturesNum;
+	IDirect3DTexture8 **pTextures;
+
+public:
+	CTexturePool() {}
+	void Create(D3DFORMAT _Format, int size, uint32 mipmapLevels, int32 numTextures);
+	void Release();
+	IDirect3DTexture8 *FindTexture();
+	bool AddTexture(IDirect3DTexture8 *texture);
+	void Resize(int numTextures);
+#ifdef FIX_BUGS
+	int GetSize() { return size; }
+#else
+	float GetSize() { return size; }
+#endif
+};
+
+class CPaletteList
+{
+	int Max;
+	int Num;
+	int *Data;
+public:
+	void Alloc(int max);
+	void Free();
+	int Find();
+	void Add(int item);
+	void Resize(int max);
+};
+
+void _TexturePoolsInitialise();
+void _TexturePoolsShutdown();
\ No newline at end of file
diff --git a/src/skel/glfw/glfw.cpp b/src/skel/glfw/glfw.cpp
index cad84b8a..7354c90a 100644
--- a/src/skel/glfw/glfw.cpp
+++ b/src/skel/glfw/glfw.cpp
@@ -1453,12 +1453,14 @@ WinMain(HINSTANCE instance,
 	RwChar** argv;
 	SystemParametersInfo(SPI_SETFOREGROUNDLOCKTIMEOUT, 0, nil, SPIF_SENDCHANGE);
 
-#if 0
-	// TODO: make this an option somewhere
-	AllocConsole();
-	freopen("CONIN$", "r", stdin);
-	freopen("CONOUT$", "w", stdout);
-	freopen("CONOUT$", "w", stderr);
+#ifndef MASTER
+	if (strstr(cmdLine, "-console"))
+	{
+		AllocConsole();
+		freopen("CONIN$", "r", stdin);
+		freopen("CONOUT$", "w", stdout);
+		freopen("CONOUT$", "w", stderr);
+	}
 #endif
 
 #else
diff --git a/src/skel/win/win.cpp b/src/skel/win/win.cpp
index 6d0c2d67..c16ea2a1 100644
--- a/src/skel/win/win.cpp
+++ b/src/skel/win/win.cpp
@@ -2011,16 +2011,18 @@ WinMain(HINSTANCE instance,
 	RwChar **argv;
 	SystemParametersInfo(SPI_SETFOREGROUNDLOCKTIMEOUT, 0, nil, SPIF_SENDCHANGE);
 
-#ifdef USE_CUSTOM_ALLOCATOR
-	InitMemoryMgr();
+#ifndef MASTER
+	if (strstr(cmdLine, "-console"))
+	{
+		AllocConsole();
+		freopen("CONIN$", "r", stdin);
+		freopen("CONOUT$", "w", stdout);
+		freopen("CONOUT$", "w", stderr);
+	}
 #endif
 
-#if 1
-	// TODO: make this an option somewhere
-	AllocConsole();
-	freopen("CONIN$", "r", stdin);
-	freopen("CONOUT$", "w", stdout);
-	freopen("CONOUT$", "w", stderr);
+#ifdef USE_CUSTOM_ALLOCATOR
+	InitMemoryMgr();
 #endif
 
 	/*