Merge remote-tracking branch 'origin/master' into MoreLanguages

24 files changed, 839 insertions, 291 deletions

diff --git a/src/core/Cam.cpp b/src/core/Cam.cpp
index 546dfde0..5844b61a 100644
--- a/src/core/Cam.cpp
+++ b/src/core/Cam.cpp
@@ -28,6 +28,7 @@ const float DefaultFOV = 70.0f;	// beta: 80.0f
 
 bool PrintDebugCode = false;
 int16 &DebugCamMode = *(int16*)0x95CCF2;
+bool bFreeCam = false;
 
 void
 CCam::Init(void)
@@ -138,6 +139,11 @@ CCam::Process(void)
 		if(CCamera::m_bUseMouse3rdPerson)
 			Process_FollowPedWithMouse(CameraTarget, TargetOrientation, SpeedVar, TargetSpeedVar);
 		else
+#ifdef FREE_CAM
+			if(bFreeCam)
+				Process_FollowPed_Rotation(CameraTarget, TargetOrientation, SpeedVar, TargetSpeedVar);
+			else
+#endif
 			Process_FollowPed(CameraTarget, TargetOrientation, SpeedVar, TargetSpeedVar);
 		break;
 //	case MODE_AIMING:
@@ -4369,7 +4375,209 @@ CCam::Process_FollowPed_WithBinding(const CVector &CameraTarget, float TargetOri
 	GetVectorsReadyForRW();
 }
 
+#ifdef FREE_CAM
+void
+CCam::Process_FollowPed_Rotation(const CVector &CameraTarget, float TargetOrientation, float, float)
+{
+	FOV = DefaultFOV;
+
+	const float MinDist = 2.0f;
+	const float MaxDist = 2.0f + TheCamera.m_fPedZoomValueSmooth;
+	const float BaseOffset = 0.75f;	// base height of camera above target
+
+	CVector TargetCoors = CameraTarget;
+
+	TargetCoors.z += m_fSyphonModeTargetZOffSet;
+	TargetCoors = DoAverageOnVector(TargetCoors);
+	TargetCoors.z += BaseOffset;	// add offset so alpha evens out to 0
+//	TargetCoors.z += m_fRoadOffSet;
+
+	CVector Dist = Source - TargetCoors;
+	CVector ToCam;
+
+	bool Shooting = false;
+	if(((CPed*)CamTargetEntity)->GetWeapon()->m_eWeaponType != WEAPONTYPE_UNARMED)
+		if(CPad::GetPad(0)->GetWeapon())
+			Shooting = true;
+	if(((CPed*)CamTargetEntity)->GetWeapon()->m_eWeaponType == WEAPONTYPE_DETONATOR ||
+	   ((CPed*)CamTargetEntity)->GetWeapon()->m_eWeaponType == WEAPONTYPE_BASEBALLBAT)
+		Shooting = false;
+
+
+	if(ResetStatics){
+		// Coming out of top down here probably
+		// so keep Beta, reset alpha and calculate vectors
+		Beta = CGeneral::GetATanOfXY(Dist.x, Dist.y);
+		Alpha = 0.0f;
+
+		Dist = MaxDist*CVector(Cos(Alpha) * Cos(Beta), Cos(Alpha) * Sin(Beta), Sin(Alpha));
+		Source = TargetCoors + Dist;
+
+		ResetStatics = false;
+	}
+
+	// Drag the camera along at the look-down offset
+	float CamDist = Dist.Magnitude();
+	if(CamDist == 0.0f)
+		Dist = CVector(1.0f, 1.0f, 0.0f);
+	else if(CamDist < MinDist)
+		Dist *= MinDist/CamDist;
+	else if(CamDist > MaxDist)
+		Dist *= MaxDist/CamDist;
+	CamDist = Dist.Magnitude();
+
+	// Beta = 0 is looking east, HALFPI is north, &c.
+	// Alpha positive is looking up
+	float GroundDist = Dist.Magnitude2D();
+	Beta = CGeneral::GetATanOfXY(-Dist.x, -Dist.y);
+	Alpha = CGeneral::GetATanOfXY(GroundDist, -Dist.z);
+	while(Beta >= PI) Beta -= 2.0f*PI;
+	while(Beta < -PI) Beta += 2.0f*PI;
+	while(Alpha >= PI) Alpha -= 2.0f*PI;
+	while(Alpha < -PI) Alpha += 2.0f*PI;
+
+	// Look around
+	bool UseMouse = false;
+	float MouseX = CPad::GetPad(0)->GetMouseX();
+	float MouseY = CPad::GetPad(0)->GetMouseY();
+	float LookLeftRight, LookUpDown;
+	if((MouseX != 0.0f || MouseY != 0.0f) && !CPad::GetPad(0)->ArePlayerControlsDisabled()){
+		UseMouse = true;
+		LookLeftRight = -2.5f*MouseX;
+		LookUpDown = 4.0f*MouseY;
+	}else{
+		LookLeftRight = -CPad::GetPad(0)->LookAroundLeftRight();
+		LookUpDown = CPad::GetPad(0)->LookAroundUpDown();
+	}
+	float AlphaOffset, BetaOffset;
+	if(UseMouse){
+		BetaOffset = LookLeftRight * TheCamera.m_fMouseAccelHorzntl * FOV/80.0f;
+		AlphaOffset = LookUpDown * TheCamera.m_fMouseAccelVertical * FOV/80.0f;
+	}else{
+		BetaOffset = LookLeftRight * fStickSens * (0.5f/10.0f) * FOV/80.0f * CTimer::GetTimeStep();
+		AlphaOffset = LookUpDown * fStickSens * (0.3f/10.0f) * FOV/80.0f * CTimer::GetTimeStep();
+	}
+
+	// Stop centering once stick has been touched
+	if(BetaOffset)
+		Rotating = false;
+
+	Beta += BetaOffset;
+	Alpha += AlphaOffset;
+	while(Beta >= PI) Beta -= 2.0f*PI;
+	while(Beta < -PI) Beta += 2.0f*PI;
+	if(Alpha > DEGTORAD(45.0f)) Alpha = DEGTORAD(45.0f);
+	if(Alpha < -DEGTORAD(89.5f)) Alpha = -DEGTORAD(89.5f);
+
+
+	float BetaDiff = TargetOrientation+PI - Beta;
+	while(BetaDiff >= PI) BetaDiff -= 2.0f*PI;
+	while(BetaDiff < -PI) BetaDiff += 2.0f*PI;
+	float TargetAlpha = Alpha;
+	// 12deg to account for our little height offset. we're not working on the true alpha here
+	const float AlphaLimitUp = DEGTORAD(15.0f) + DEGTORAD(12.0f);
+	const float AlphaLimitDown = -DEGTORAD(15.0f) + DEGTORAD(12.0f);
+	if(Abs(BetaDiff) < DEGTORAD(25.0f) && ((CPed*)CamTargetEntity)->GetMoveSpeed().Magnitude2D() > 0.01f){
+		// Limit alpha when player is walking towards camera
+		if(TargetAlpha > AlphaLimitUp) TargetAlpha = AlphaLimitUp;
+		if(TargetAlpha < AlphaLimitDown) TargetAlpha = AlphaLimitDown;
+	}
+
+	WellBufferMe(TargetAlpha, &Alpha, &AlphaSpeed, 0.2f, 0.1f, true);
+
+	if(CPad::GetPad(0)->ForceCameraBehindPlayer() || Shooting){
+		m_fTargetBeta = TargetOrientation;
+		Rotating = true;
+	}
+
+	if(Rotating){
+		WellBufferMe(m_fTargetBeta, &Beta, &BetaSpeed, 0.1f, 0.06f, true);
+		float DeltaBeta = m_fTargetBeta - Beta;
+		while(DeltaBeta >= PI) DeltaBeta -= 2*PI;
+		while(DeltaBeta < -PI) DeltaBeta += 2*PI;
+		if(Abs(DeltaBeta) < 0.06f)
+			Rotating = false;
+	}
+
+
+	Front = CVector(Cos(Alpha) * Cos(Beta), Cos(Alpha) * Sin(Beta), Sin(Alpha));
+	Source = TargetCoors - Front*CamDist;
+	TargetCoors.z -= BaseOffset;	// now get back to the real target coors again
+
+	m_cvecTargetCoorsForFudgeInter = TargetCoors;
+
+
+	Front = TargetCoors - Source;
+	Front.Normalise();
+
+
+
+	/*
+	 * Handle collisions - taken from FollowPedWithMouse
+	 */
+
+	CEntity *entity;
+	CColPoint colPoint;
+	// Clip Source and fix near clip
+	CWorld::pIgnoreEntity = CamTargetEntity;
+	entity = nil;
+	if(CWorld::ProcessLineOfSight(TargetCoors, Source, colPoint, entity, true, true, true, true, false, false, true)){
+		float PedColDist = (TargetCoors - colPoint.point).Magnitude();
+		float ColCamDist = CamDist - PedColDist;
+		if(entity->IsPed() && ColCamDist > 1.0f){
+			// Ped in the way but not clipping through
+			if(CWorld::ProcessLineOfSight(colPoint.point, Source, colPoint, entity, true, true, true, true, false, false, true)){
+				PedColDist = (TargetCoors - colPoint.point).Magnitude();
+				Source = colPoint.point;
+				if(PedColDist < 0.9f + 0.3f)
+					RwCameraSetNearClipPlane(Scene.camera, max(PedColDist-0.3f, 0.05f));
+			}else{
+				RwCameraSetNearClipPlane(Scene.camera, min(ColCamDist-0.35f, 0.9f));
+			}
+		}else{
+			Source = colPoint.point;
+			if(PedColDist < 0.9f + 0.3f)
+				RwCameraSetNearClipPlane(Scene.camera, max(PedColDist-0.3f, 0.05f));
+		}
+	}
+	CWorld::pIgnoreEntity = nil;
+
+	float ViewPlaneHeight = Tan(DEGTORAD(FOV) / 2.0f);
+	float ViewPlaneWidth = ViewPlaneHeight * CDraw::FindAspectRatio() * fTweakFOV;
+	float Near = RwCameraGetNearClipPlane(Scene.camera);
+	float radius = ViewPlaneWidth*Near;
+	entity = CWorld::TestSphereAgainstWorld(Source + Front*Near, radius, nil, true, true, false, true, false, false);
+	int i = 0;
+	while(entity){
+		CVector CamToCol = gaTempSphereColPoints[0].point - Source;
+		float frontDist = DotProduct(CamToCol, Front);
+		float dist = (CamToCol - Front*frontDist).Magnitude() / ViewPlaneWidth;
+
+		// Try to decrease near clip
+		dist = max(min(Near, dist), 0.1f);
+		if(dist < Near)
+			RwCameraSetNearClipPlane(Scene.camera, dist);
+
+		// Move forward a bit
+		if(dist == 0.1f)
+			Source += (TargetCoors - Source)*0.3f;
+
+		// Keep testing
+		entity = CWorld::TestSphereAgainstWorld(Source + Front*Near, radius, nil, true, true, false, true, false, false);
+
+		i++;
+		if(i > 5)
+			entity = nil;
+	}
+
+	GetVectorsReadyForRW();
+}
+#endif
+
 STARTPATCHES
+#ifdef FREE_CAM
+	Nop(0x468E7B, 0x468E90-0x468E7B);	// disable first person
+#endif
 	InjectHook(0x456F40, WellBufferMe, PATCH_JUMP);
 	InjectHook(0x458410, &CCam::Init, PATCH_JUMP);
 	InjectHook(0x4582F0, &CCam::GetVectorsReadyForRW, PATCH_JUMP);
diff --git a/src/core/Camera.h b/src/core/Camera.h
index 982620a3..3dc74fe7 100644
--- a/src/core/Camera.h
+++ b/src/core/Camera.h
@@ -221,6 +221,9 @@ struct CCam
 	// CCam::Process_Blood_On_The_Tracks
 	// CCam::Process_Cam_Running_Side_Train
 	// CCam::Process_Cam_On_Train_Roof
+
+	// custom stuff
+	void Process_FollowPed_Rotation(const CVector &CameraTarget, float TargetOrientation, float, float);
 };
 static_assert(sizeof(CCam) == 0x1A4, "CCam: wrong size");
 static_assert(offsetof(CCam, Alpha) == 0xA8, "CCam: error");
diff --git a/src/core/CutsceneMgr.cpp b/src/core/CutsceneMgr.cpp
index a3ff2fd0..283f34b8 100644
--- a/src/core/CutsceneMgr.cpp
+++ b/src/core/CutsceneMgr.cpp
@@ -183,7 +183,7 @@ CCutsceneMgr::LoadCutsceneData(const char *szCutsceneName)
 	ms_pCutsceneDir->ReadDirFile("ANIM\\CUTS.DIR");
 
 	CStreaming::RemoveUnusedModelsInLoadedList();
-	CGame::DrasticTidyUpMemory();
+	CGame::DrasticTidyUpMemory(true);
 
 	strcpy(ms_cutsceneName, szCutsceneName);
 	file = CFileMgr::OpenFile("ANIM\\CUTS.IMG", "rb");
@@ -374,8 +374,7 @@ CCutsceneMgr::DeleteCutsceneData(void)
 			DMAudio.ChangeMusicMode(MUSICMODE_GAME);
 	}
 	CTimer::Stop();
-	//TheCamera.GetScreenFadeStatus() == 2; // what for??
-	CGame::DrasticTidyUpMemory();
+	CGame::DrasticTidyUpMemory(TheCamera.GetScreenFadeStatus() == 2);
 	CTimer::Update();
 }
 
diff --git a/src/core/EventList.cpp b/src/core/EventList.cpp
index d72e32c4..d1c76f33 100644
--- a/src/core/EventList.cpp
+++ b/src/core/EventList.cpp
@@ -209,21 +209,9 @@ CEventList::ReportCrimeForEvent(eEventType type, int32 crimeId, bool copsDontCar
 	case EVENT_CAR_SET_ON_FIRE: crime = CRIME_VEHICLE_BURNED; break;
 	default: crime = CRIME_NONE; break;
 	}
-
-#ifdef VC_PED_PORTS
-	if (crime == CRIME_HIT_PED && ((CPed*)crimeId)->IsPointerValid() &&
-		FindPlayerPed()->m_pWanted->m_nWantedLevel == 0 && ((CPed*)crimeId)->bBeingChasedByPolice) {
-
-		if(!((CPed*)crimeId)->DyingOrDead()) {
-			sprintf(gString, "$50 Good Citizen Bonus!");
-			AsciiToUnicode(gString, gUString);
-			CMessages::AddBigMessage(gUString, 5000, 0);
-			CWorld::Players[CWorld::PlayerInFocus].m_nMoney += 50;
-		}
-	} else
-#endif
-		if(crime == CRIME_NONE)
-			return;
+	
+	if(crime == CRIME_NONE)
+		return;
 
 	CVector playerPedCoors = FindPlayerPed()->GetPosition();
 	CVector playerCoors = FindPlayerCoors();
diff --git a/src/core/Frontend.cpp b/src/core/Frontend.cpp
index a002835b..72d7d912 100644
--- a/src/core/Frontend.cpp
+++ b/src/core/Frontend.cpp
@@ -1354,23 +1354,39 @@ void CMenuManager::DrawFrontEndNormal()
 
 	m_aFrontEndSprites[currentSprite].Draw(CRect(MENU_X_LEFT_ALIGNED(50.0f), MENU_Y(50.0f), MENU_X_RIGHT_ALIGNED(50.0f), SCREEN_SCALE_FROM_BOTTOM(95.0f)), CRGBA(255, 255, 255, m_nMenuFadeAlpha > 255 ? 255 : m_nMenuFadeAlpha));
 
+	static float fadeAlpha = 0.0f;
+	static int lastState = 0;
+
+	// reverseAlpha = PS2 fading (wait for 255->0, then change screen)
 	if (m_nMenuFadeAlpha < 255) {
-		static uint32 LastFade = 0;
+		if (lastState == 1 && !reverseAlpha)
+			fadeAlpha = 0.f;
 
 		if (m_nMenuFadeAlpha <= 0 && reverseAlpha) {
 			reverseAlpha = false;
 			ChangeScreen(pendingScreen, pendingOption, true, false);
 		} else {
+			float timestep = CTimer::GetCurrentTimeInCycles() / (float)CTimer::GetCyclesPerMillisecond();
+
+			// +20 per every 33 ms (1000.f/30.f - original frame limiter fps)
 			if (!reverseAlpha)
-				m_nMenuFadeAlpha += min((CTimer::GetTimeInMillisecondsPauseMode() - LastFade) / 33.0f, 1.0f) * 20.0f;
+				fadeAlpha += (timestep * 100.f) * 20.f / 33.f;
 			else
-				m_nMenuFadeAlpha = max(0, m_nMenuFadeAlpha - min((CTimer::GetTimeInMillisecondsPauseMode() - LastFade) / 33.0f, 1.0f) * 30.0f);
+				fadeAlpha = max(0.0f, fadeAlpha - (timestep * 100.f) * 30.f / 33.f);
 
-			LastFade = CTimer::GetTimeInMillisecondsPauseMode();
+			m_nMenuFadeAlpha = fadeAlpha;
 		} 
+		lastState = 0;
 	} else {
-		if (reverseAlpha)
-			m_nMenuFadeAlpha -= 20;
+		if (lastState == 0) fadeAlpha = 255.f;
+
+		if (reverseAlpha) {
+			float timestep = CTimer::GetCurrentTimeInCycles() / (float)CTimer::GetCyclesPerMillisecond();
+			fadeAlpha -= (timestep * 100.f) * 30.f / 33.f;
+
+			m_nMenuFadeAlpha = fadeAlpha;
+		}
+		lastState = 1;
 
 		// TODO: what is this? waiting mouse?
 		if(field_518 == 4){
@@ -1568,13 +1584,20 @@ void CMenuManager::DrawFrontEndNormal()
 	}
 
 	if (m_nMenuFadeAlpha < 255) {
-		static uint32 LastFade = 0;
 
-		// Famous transparent menu bug. 33.0f = 1000.f/30.f (original frame limiter fps)
+		// Famous transparent menu bug
 #ifdef FIX_BUGS
-		m_nMenuFadeAlpha += min((CTimer::GetTimeInMillisecondsPauseMode() - LastFade) / 33.0f, 1.0f) * 20.0f;
-		LastFade = CTimer::GetTimeInMillisecondsPauseMode();
+		static float fadeAlpha = 0.0f;
+		if (m_nMenuFadeAlpha == 0 && fadeAlpha > 1.0f) fadeAlpha = 0.0f;
+
+		float timestep = CTimer::GetCurrentTimeInCycles() / (float)CTimer::GetCyclesPerMillisecond();
+
+		// +20 per every 33 ms (1000.f/30.f - original frame limiter fps)
+		fadeAlpha += (timestep * 100.f) * 20.f / 33.f;
+		m_nMenuFadeAlpha = fadeAlpha;
 #else
+		static uint32 LastFade = 0;
+
 		if(CTimer::GetTimeInMillisecondsPauseMode() - LastFade > 10){
 			m_nMenuFadeAlpha += 20;
 			LastFade = CTimer::GetTimeInMillisecondsPauseMode();
@@ -1694,9 +1717,6 @@ int CMenuManager::GetStartOptionsCntrlConfigScreens()
 }
 #endif
 
-#if DONT_USE_SUSPICIOUS_FUNCS
-WRAPPER void CMenuManager::InitialiseChangedLanguageSettings() { EAXJMP(0x47A4D0); }
-#else
 void CMenuManager::InitialiseChangedLanguageSettings()
 {
 	if (m_bFrontEnd_ReloadObrTxtGxt) {
@@ -1735,7 +1755,6 @@ void CMenuManager::InitialiseChangedLanguageSettings()
 		}
 	}
 }
-#endif
 
 void CMenuManager::LoadAllTextures()
 {
diff --git a/src/core/Game.cpp b/src/core/Game.cpp
index 3170ab6c..8571e93e 100644
--- a/src/core/Game.cpp
+++ b/src/core/Game.cpp
@@ -1,7 +1,14 @@
+#pragma warning( push )
+#pragma warning( disable : 4005)
+#define DIRECTINPUT_VERSION 0x0800
+#include <dinput.h>
+#pragma warning( pop )
 #include "common.h"
+#include "win.h"
 #include "patcher.h"
 #include "Game.h"
 #include "main.h"
+#include "RwHelper.h"
 #include "Accident.h"
 #include "Antennas.h"
 #include "Bridge.h"
@@ -17,6 +24,7 @@
 #include "Cranes.h"
 #include "Credits.h"
 #include "CutsceneMgr.h"
+#include "DMAudio.h"
 #include "Darkel.h"
 #include "Debug.h"
 #include "EventList.h"
@@ -28,26 +36,32 @@
 #include "Frontend.h"
 #include "GameLogic.h"
 #include "Garages.h"
+#include "GenericGameStorage.h"
 #include "Glass.h"
+#include "HandlingMgr.h"
 #include "Heli.h"
+#include "Hud.h"
 #include "IniFile.h"
+#include "Lights.h"
+#include "MBlur.h"
 #include "Messages.h"
 #include "Pad.h"
 #include "Particle.h"
+#include "ParticleObject.h"
+#include "PedRoutes.h"
 #include "Phones.h"
 #include "Pickups.h"
 #include "Plane.h"
+#include "PlayerSkin.h"
 #include "Population.h"
+#include "Radar.h"
 #include "Record.h"
+#include "References.h"
 #include "Renderer.h"
 #include "Replay.h"
-#include "References.h"
-#include "Radar.h"
 #include "Restart.h"
 #include "RoadBlocks.h"
-#include "PedRoutes.h"
 #include "Rubbish.h"
-#include "RwHelper.h"
 #include "SceneEdit.h"
 #include "Script.h"
 #include "Shadows.h"
@@ -56,11 +70,14 @@
 #include "Sprite2d.h"
 #include "Stats.h"
 #include "Streaming.h"
+#include "SurfaceTable.h"
+#include "TempColModels.h"
 #include "TimeCycle.h"
 #include "TrafficLights.h"
 #include "Train.h"
 #include "TxdStore.h"
 #include "User.h"
+#include "VisibilityPlugins.h"
 #include "WaterCannon.h"
 #include "WaterLevel.h"
 #include "Weapon.h"
@@ -70,6 +87,10 @@
 #include "ZoneCull.h"
 #include "Zones.h"
 
+
+
+#define DEFAULT_VIEWWINDOW (0.7f)
+
 eLevelName &CGame::currLevel = *(eLevelName*)0x941514;
 bool &CGame::bDemoMode = *(bool*)0x5F4DD0;
 bool &CGame::nastyGame = *(bool*)0x5F4DD4;
@@ -82,6 +103,7 @@ char *CGame::aDatFile = (char*)0x773A48;
 bool CGame::russianGame = false;
 #endif
 
+int &gameTxdSlot = *(int*)0x628D88;
 
 bool
 CGame::InitialiseOnceBeforeRW(void)
@@ -92,7 +114,139 @@ CGame::InitialiseOnceBeforeRW(void)
 	return true;
 }
 
-int &gameTxdSlot = *(int*)0x628D88;
+bool
+CGame::InitialiseRenderWare(void)
+{
+	_TexturePoolsInitialise();
+	
+	CTxdStore::Initialise();
+	CVisibilityPlugins::Initialise();
+	
+	/* Create camera */
+	Scene.camera = CameraCreate(RsGlobal.width, RsGlobal.height, TRUE);
+	ASSERT(Scene.camera != nil);
+	if (!Scene.camera)
+	{
+		return (false);
+	}
+	
+	RwCameraSetFarClipPlane(Scene.camera, 2000.0f);
+	RwCameraSetNearClipPlane(Scene.camera, 0.9f);
+	
+	CameraSize(Scene.camera, nil, DEFAULT_VIEWWINDOW, DEFAULT_ASPECT_RATIO);
+	
+	/* Create a world */
+	RwBBox  bbox;
+	
+	bbox.sup.x = bbox.sup.y = bbox.sup.z = 10000.0f;
+	bbox.inf.x = bbox.inf.y = bbox.inf.z = -10000.0f;
+
+	Scene.world = RpWorldCreate(&bbox);
+	ASSERT(Scene.world != nil);
+	if (!Scene.world)
+	{
+		CameraDestroy(Scene.camera);
+		Scene.camera = nil;
+		return (false);
+	}
+	
+	/* Add the camera to the world */
+	RpWorldAddCamera(Scene.world, Scene.camera);
+	LightsCreate(Scene.world);
+	
+	CreateDebugFont();
+	
+	CFont::Initialise();
+	CHud::Initialise();
+	CPlayerSkin::Initialise();
+	
+	return (true);
+}
+
+void CGame::ShutdownRenderWare(void)
+{
+	CMBlur::MotionBlurClose();
+	DestroySplashScreen();
+	CHud::Shutdown();
+	CFont::Shutdown();
+	
+	for ( int32 i = 0; i < NUMPLAYERS; i++ )
+		CWorld::Players[i].DeletePlayerSkin();
+	
+	CPlayerSkin::Shutdown();
+	
+	DestroyDebugFont();
+	
+	/* Destroy world */
+	LightsDestroy(Scene.world);
+	RpWorldRemoveCamera(Scene.world, Scene.camera);
+	RpWorldDestroy(Scene.world);
+	
+	/* destroy camera */
+	CameraDestroy(Scene.camera);
+	
+	Scene.world = nil;
+	Scene.camera = nil;
+	
+	CVisibilityPlugins::Shutdown();
+	
+	_TexturePoolsShutdown();
+}
+
+bool CGame::InitialiseOnceAfterRW(void)
+{
+	TheText.Load();
+	DMAudio.Initialise();
+	CTimer::Initialise();
+	CTempColModels::Initialise();
+	mod_HandlingManager.Initialise();
+	CSurfaceTable::Initialise("DATA\\SURFACE.DAT");
+	CPedStats::Initialise();
+	CTimeCycle::Initialise();
+
+	if ( DMAudio.GetNum3DProvidersAvailable() == 0 )
+		FrontEndMenuManager.m_nPrefsAudio3DProviderIndex = -1;
+
+	if ( FrontEndMenuManager.m_nPrefsAudio3DProviderIndex == -99 || FrontEndMenuManager.m_nPrefsAudio3DProviderIndex == -2 )
+	{
+		CMenuManager::m_PrefsSpeakers = 0;
+		
+		for ( int32 i = 0; i < DMAudio.GetNum3DProvidersAvailable(); i++ )
+		{
+			wchar buff[64];
+			
+			char *name = DMAudio.Get3DProviderName(i);
+			AsciiToUnicode(name, buff);
+			char *providername = UnicodeToAscii(buff);
+			strupr(providername);
+			
+			if ( !strcmp(providername, "MILES FAST 2D POSITIONAL AUDIO") )
+			{
+				FrontEndMenuManager.m_nPrefsAudio3DProviderIndex = i;
+				break;
+			}
+		}
+	}
+
+	DMAudio.SetCurrent3DProvider(FrontEndMenuManager.m_nPrefsAudio3DProviderIndex);
+	DMAudio.SetSpeakerConfig(CMenuManager::m_PrefsSpeakers);
+	DMAudio.SetDynamicAcousticModelingStatus(CMenuManager::m_PrefsDMA);
+	DMAudio.SetMusicMasterVolume(CMenuManager::m_PrefsMusicVolume);
+	DMAudio.SetEffectsMasterVolume(CMenuManager::m_PrefsSfxVolume);
+	DMAudio.SetEffectsFadeVol(127);
+	DMAudio.SetMusicFadeVol(127);
+	CWorld::Players[0].SetPlayerSkin(CMenuManager::m_PrefsSkinFile);
+
+	return true;
+}
+
+void
+CGame::FinalShutdown(void)
+{	
+	CTxdStore::Shutdown();
+	CPedStats::Shutdown();
+	CdStreamShutdown();
+}
 
 bool CGame::Initialise(const char* datFile)
 {
@@ -163,7 +317,7 @@ bool CGame::Initialise(const char* datFile)
 		CStreaming::Init();
 	} else {
 		CStreaming::Init();
-		if (ConvertTextures()) {
+		if (CreateTxdImageForVideoCard()) {
 			CStreaming::Shutdown();
 			CdStreamAddImage("MODELS\\TXD.IMG");
 			CStreaming::Init();
@@ -201,7 +355,7 @@ bool CGame::Initialise(const char* datFile)
 	CSceneEdit::Init();
 	LoadingScreen("Loading the Game", "Load scripts", nil);
 	CTheScripts::Init();
-	CGangs::Initialize();
+	CGangs::Initialise();
 	LoadingScreen("Loading the Game", "Setup game variables", nil);
 	CClock::Initialise(1000);
 	CHeli::InitHelis();
@@ -230,16 +384,227 @@ bool CGame::Initialise(const char* datFile)
 	CTheScripts::Process();
 	TheCamera.Process();
 	LoadingScreen("Loading the Game", "Load scene", nil);
-	CModelInfo::RemoveColModelsFromOtherLevels(CGame::currLevel);
-	CCollision::ms_collisionInMemory = CGame::currLevel;
+	CModelInfo::RemoveColModelsFromOtherLevels(currLevel);
+	CCollision::ms_collisionInMemory = currLevel;
 	for (int i = 0; i < MAX_PADS; i++)
 		CPad::GetPad(i)->Clear(true);
 	return true;
 }
 
-#if 0
-WRAPPER void CGame::Process(void) { EAXJMP(0x48C850); }
-#else
+bool CGame::ShutDown(void)
+{
+	CReplay::FinishPlayback();
+	CPlane::Shutdown();
+	CTrain::Shutdown();
+	CSpecialFX::Shutdown();
+#ifndef PS2
+	CGarages::Shutdown();
+#endif
+	CMovingThings::Shutdown();
+	gPhoneInfo.Shutdown();
+	CWeapon::ShutdownWeapons();
+	CPedType::Shutdown();
+	CMBlur::MotionBlurClose();
+	
+	for (int32 i = 0; i < NUMPLAYERS; i++)
+	{
+		if ( CWorld::Players[i].m_pPed )
+		{
+			CWorld::Remove(CWorld::Players[i].m_pPed);
+			delete CWorld::Players[i].m_pPed;
+			CWorld::Players[i].m_pPed = nil;
+		}
+		
+		CWorld::Players[i].Clear();
+	}
+	
+	CRenderer::Shutdown();
+	CWorld::ShutDown();
+	DMAudio.DestroyAllGameCreatedEntities();
+	CModelInfo::ShutDown();
+	CAnimManager::Shutdown();
+	CCutsceneMgr::Shutdown();
+	CVehicleModelInfo::DeleteVehicleColourTextures();
+	CVehicleModelInfo::ShutdownEnvironmentMaps();
+	CRadar::Shutdown();
+	CStreaming::Shutdown();
+	CTxdStore::GameShutdown();
+	CCollision::Shutdown();
+	CWaterLevel::Shutdown();
+	CRubbish::Shutdown();
+	CClouds::Shutdown();
+	CShadows::Shutdown();
+	CCoronas::Shutdown();
+	CSkidmarks::Shutdown();
+	CWeaponEffects::Shutdown();
+	CParticle::Shutdown();
+	CPools::ShutDown();
+	CTxdStore::RemoveTxdSlot(gameTxdSlot);
+	CdStreamRemoveImages();
+	return true;
+}
+
+void CGame::ReInitGameObjectVariables(void)
+{
+	CGameLogic::InitAtStartOfGame();
+	TheCamera.CCamera::Init();
+	TheCamera.SetRwCamera(Scene.camera);
+	CDebug::DebugInitTextBuffer();
+	CWeather::Init();
+	CUserDisplay::Init();
+	CMessages::Init();
+	CRestart::Initialise();
+	CWorld::bDoingCarCollisions = false;
+	CHud::ReInitialise();
+	CRadar::Initialise();
+	CCarCtrl::ReInit();
+	CTimeCycle::Initialise();
+	CDraw::SetFOV(120.0f);
+	CDraw::ms_fLODDistance = 500.0f;
+	CStreaming::RequestBigBuildings(LEVEL_NONE);
+	CStreaming::LoadAllRequestedModels(false);
+	CPed::Initialise();
+	CEventList::Initialise();
+	CWeapon::InitialiseWeapons();
+	CPopulation::Initialise();
+	
+	for (int i = 0; i < NUMPLAYERS; i++)
+		CWorld::Players[i].Clear();
+	
+	CWorld::PlayerInFocus = 0;
+	CAntennas::Init();
+	CGlass::Init();
+	gPhoneInfo.Initialise();
+	CTheScripts::Init();
+	CGangs::Initialise();
+	CTimer::Initialise();
+	CClock::Initialise(1000);
+	CTheCarGenerators::Init();
+	CHeli::InitHelis();
+	CMovingThings::Init();
+	CDarkel::Init();
+	CStats::Init();
+	CPickups::Init();
+	CPacManPickups::Init();
+	CGarages::Init();
+	CSpecialFX::Init();
+	CWaterCannons::Init();
+	CParticle::ReloadConfig();
+	CCullZones::ResolveVisibilities();
+
+	if ( !FrontEndMenuManager.m_bLoadingSavedGame )
+	{
+		CCranes::InitCranes();
+		CTheScripts::StartTestScript();
+		CTheScripts::Process();
+		TheCamera.Process();
+		CTrain::InitTrains();
+		CPlane::InitPlanes();
+	}
+	
+	for (int32 i = 0; i < MAX_PADS; i++)
+		CPad::GetPad(i)->Clear(true);
+}
+
+void CGame::ReloadIPLs(void)
+{
+	CTimer::Stop();
+	CWorld::RemoveStaticObjects();
+	ThePaths.Init();
+	CCullZones::Init();
+	CFileLoader::ReloadPaths("GTA3.IDE");
+	CFileLoader::LoadScene("INDUST.IPL");
+	CFileLoader::LoadScene("COMMER.IPL");
+	CFileLoader::LoadScene("SUBURBAN.IPL");
+	CFileLoader::LoadScene("CULL.IPL");
+	ThePaths.PreparePathData();
+	CTrafficLights::ScanForLightsOnMap();
+	CRoadBlocks::Init();
+	CCranes::InitCranes();
+	CGarages::Init();
+	CWorld::RepositionCertainDynamicObjects();
+	CCullZones::ResolveVisibilities();
+	CRenderer::SortBIGBuildings();
+	CTimer::Update();
+}
+
+void CGame::ShutDownForRestart(void)
+{
+	CReplay::FinishPlayback();
+	CReplay::EmptyReplayBuffer();
+	DMAudio.DestroyAllGameCreatedEntities();
+	
+	for (int i = 0; i < NUMPLAYERS; i++)
+		CWorld::Players[i].Clear();
+
+	CGarages::SetAllDoorsBackToOriginalHeight();
+	CTheScripts::UndoBuildingSwaps();
+	CTheScripts::UndoEntityInvisibilitySettings();
+	CWorld::ClearForRestart();
+	CTimer::Shutdown();
+	CStreaming::FlushRequestList();
+	CStreaming::DeleteAllRwObjects();
+	CStreaming::RemoveAllUnusedModels();
+	CStreaming::ms_disableStreaming = false;
+	CRadar::RemoveRadarSections();
+	FrontEndMenuManager.UnloadTextures();
+	CParticleObject::RemoveAllParticleObjects();
+	CPedType::Shutdown();
+	CSpecialFX::Shutdown();
+	TidyUpMemory(true, false);
+}
+
+void CGame::InitialiseWhenRestarting(void)
+{
+	CRect rect(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT);
+	CRGBA color(255, 255, 255, 255);
+	
+	CTimer::Initialise();
+	CSprite2d::SetRecipNearClip();
+	
+	b_FoundRecentSavedGameWantToLoad = false;
+	
+	TheCamera.Init();
+	
+	if ( FrontEndMenuManager.m_bLoadingSavedGame == true )
+	{
+		RestoreForStartLoad();
+		CStreaming::LoadScene(TheCamera.GetPosition());
+	}
+	
+	ReInitGameObjectVariables();
+	
+	if ( FrontEndMenuManager.m_bLoadingSavedGame == true )
+	{
+		if ( GenericLoad() == true )
+		{
+			DMAudio.ResetTimers(CTimer::GetTimeInMilliseconds());
+			CTrain::InitTrains();
+			CPlane::InitPlanes();
+		}
+		else
+		{
+			for ( int32 i = 0; i < 50; i++ )
+			{
+				HandleExit();
+				FrontEndMenuManager.MessageScreen("FED_LFL"); // Loading save game has failed. The game will restart now. 
+			}
+			
+			ShutDownForRestart();
+			CTimer::Stop();
+			CTimer::Initialise();
+			FrontEndMenuManager.m_bLoadingSavedGame = false;
+			ReInitGameObjectVariables();
+			currLevel = LEVEL_INDUSTRIAL;
+			CCollision::SortOutCollisionAfterLoad();
+		}
+	}
+	
+	CTimer::Update();
+	
+	DMAudio.ChangeMusicMode(MUSICMODE_GAME);
+}
+
 extern void (*DebugMenuProcess)(void);
 void CGame::Process(void) 
 {
@@ -315,50 +680,34 @@ void CGame::Process(void)
 		}
 	}
 }
-#endif
 
-void CGame::ReloadIPLs(void)
+void CGame::DrasticTidyUpMemory(bool)
 {
-	CTimer::Stop();
-	CWorld::RemoveStaticObjects();
-	ThePaths.Init();
-	CCullZones::Init();
-	CFileLoader::ReloadPaths("GTA3.IDE");
-	CFileLoader::LoadScene("INDUST.IPL");
-	CFileLoader::LoadScene("COMMER.IPL");
-	CFileLoader::LoadScene("SUBURBAN.IPL");
-	CFileLoader::LoadScene("CULL.IPL");
-	ThePaths.PreparePathData();
-	CTrafficLights::ScanForLightsOnMap();
-	CRoadBlocks::Init();
-	CCranes::InitCranes();
-	CGarages::Init();
-	CWorld::RepositionCertainDynamicObjects();
-	CCullZones::ResolveVisibilities();
-	CRenderer::SortBIGBuildings();
-	CTimer::Update();
+#ifdef PS2
+	// meow
+#endif
 }
 
-#if 0
-WRAPPER void CGame::FinalShutdown(void) { EAXJMP(0x48BEC0); }
-#else
-void
-CGame::FinalShutdown(void)
+void CGame::TidyUpMemory(bool, bool)
 {
-	CTxdStore::Shutdown();
-	CPedStats::Shutdown();
-	CdStreamShutdown();
-}
+#ifdef PS2
+	// meow
 #endif
-
-WRAPPER bool CGame::InitialiseRenderWare(void) { EAXJMP(0x48BBA0); }
-WRAPPER void CGame::ShutdownRenderWare(void) { EAXJMP(0x48BCB0); }
-WRAPPER void CGame::ShutDown(void) { EAXJMP(0x48C3A0); }
-WRAPPER void CGame::ShutDownForRestart(void) { EAXJMP(0x48C6B0); }
-WRAPPER void CGame::InitialiseWhenRestarting(void) { EAXJMP(0x48C740); }
-WRAPPER bool CGame::InitialiseOnceAfterRW(void) { EAXJMP(0x48BD50); }
+}
 
 STARTPATCHES
-	InjectHook(0x48C850, CGame::Process, PATCH_JUMP);
+	InjectHook(0x48BB80, CGame::InitialiseOnceBeforeRW, PATCH_JUMP);
+	InjectHook(0x48BBA0, CGame::InitialiseRenderWare, PATCH_JUMP);
+	InjectHook(0x48BCB0, CGame::ShutdownRenderWare, PATCH_JUMP);
+	InjectHook(0x48BD50, CGame::InitialiseOnceAfterRW, PATCH_JUMP);
 	InjectHook(0x48BEC0, CGame::FinalShutdown, PATCH_JUMP);
+	InjectHook(0x48BED0, CGame::Initialise, PATCH_JUMP);
+	InjectHook(0x48C3A0, CGame::ShutDown, PATCH_JUMP);
+	InjectHook(0x48C4B0, CGame::ReInitGameObjectVariables, PATCH_JUMP);
+	InjectHook(0x48C620, CGame::ReloadIPLs, PATCH_JUMP);
+	InjectHook(0x48C6B0, CGame::ShutDownForRestart, PATCH_JUMP);
+	InjectHook(0x48C740, CGame::InitialiseWhenRestarting, PATCH_JUMP);
+	InjectHook(0x48C850, CGame::Process, PATCH_JUMP);
+	InjectHook(0x48CA10, CGame::DrasticTidyUpMemory, PATCH_JUMP);
+	InjectHook(0x48CA20, CGame::TidyUpMemory, PATCH_JUMP);
 ENDPATCHES
diff --git a/src/core/Game.h b/src/core/Game.h
index 991c8718..318ff54b 100644
--- a/src/core/Game.h
+++ b/src/core/Game.h
@@ -23,19 +23,20 @@ public:
 	static bool &playingIntro;
 	static char *aDatFile;	//[32];
 
-	static bool Initialise(const char *datFile);
 	static bool InitialiseOnceBeforeRW(void);
 	static bool InitialiseRenderWare(void);
-	static bool InitialiseOnceAfterRW(void);
-	static void InitialiseWhenRestarting(void);
-	static void ShutDown(void);
 	static void ShutdownRenderWare(void);
+	static bool InitialiseOnceAfterRW(void);
 	static void FinalShutdown(void);
+	static bool Initialise(const char *datFile);
+	static bool ShutDown(void);
+	static void ReInitGameObjectVariables(void);
+	static void ReloadIPLs(void);
 	static void ShutDownForRestart(void);
+	static void InitialiseWhenRestarting(void);
 	static void Process(void);
-	static void ReloadIPLs(void);
-
+	
 	// NB: these do something on PS2
-	static void TidyUpMemory(bool, bool) {}
-	static void DrasticTidyUpMemory(void) {}
+	static void TidyUpMemory(bool, bool);
+	static void DrasticTidyUpMemory(bool);
 };
diff --git a/src/core/Pad.h b/src/core/Pad.h
index 6cabdf54..84919f32 100644
--- a/src/core/Pad.h
+++ b/src/core/Pad.h
@@ -4,7 +4,7 @@ enum {
 	PLAYERCONTROL_ENABLED = 0,
 	PLAYERCONTROL_DISABLED_1 = 1,
 	PLAYERCONTROL_DISABLED_2 = 2,
-	PLAYERCONTROL_DISABLED_4 = 4,
+	PLAYERCONTROL_GARAGE = 4,
 	PLAYERCONTROL_DISABLED_8 = 8,
 	PLAYERCONTROL_DISABLED_10 = 16,
 	PLAYERCONTROL_DISABLED_20 = 32, // used on CPlayerInfo::MakePlayerSafe
@@ -433,7 +433,10 @@ public:
 	int16 GetRightStickX(void)    { return NewState.RightStickX; }
 	int16 GetRightStickY(void)    { return NewState.RightStickY; }
 
-  bool ArePlayerControlsDisabled(void) { return DisablePlayerControls != PLAYERCONTROL_ENABLED; }
+	bool ArePlayerControlsDisabled(void) { return DisablePlayerControls != PLAYERCONTROL_ENABLED; }
+	void SetDisablePlayerControls(uint8 who) { DisablePlayerControls |= who; }
+	void SetEnablePlayerControls(uint8 who) { DisablePlayerControls &= ~who; }
+	bool IsPlayerControlsDisabledBy(uint8 who) { return DisablePlayerControls & who; }
 };
 
 VALIDATE_SIZE(CPad, 0xFC);
diff --git a/src/core/Radar.cpp b/src/core/Radar.cpp
index 6421520b..1c634760 100644
--- a/src/core/Radar.cpp
+++ b/src/core/Radar.cpp
@@ -75,9 +75,6 @@ static_assert(RADAR_TILE_SIZE == (WORLD_SIZE_Y / RADAR_NUM_TILES), "CRadar: not
 #define RADAR_MIN_SPEED (0.3f)

 #define RADAR_MAX_SPEED (0.9f)

 

-#if 0

-WRAPPER void CRadar::CalculateBlipAlpha(float) { EAXJMP(0x4A4F90); }

-#else

 uint8 CRadar::CalculateBlipAlpha(float dist)

 {

 	if (dist <= 1.0f)

@@ -88,55 +85,35 @@ uint8 CRadar::CalculateBlipAlpha(float dist)
 

 	return 128;

 }

-#endif

 

-#if 0

-WRAPPER void CRadar::ChangeBlipBrightness(int32, int32) { EAXJMP(0x4A57A0); }

-#else

 void CRadar::ChangeBlipBrightness(int32 i, int32 bright)

 {

 	int index = GetActualBlipArrayIndex(i);

 	if (index != -1)

 		ms_RadarTrace[index].m_bDim = bright != 1;

 }

-#endif

 

-#if 0

-WRAPPER void CRadar::ChangeBlipColour(int32, int32) { EAXJMP(0x4A5770); }

-#else

 void CRadar::ChangeBlipColour(int32 i, int32 color)

 {

 	int index = GetActualBlipArrayIndex(i);

 	if (index != -1)

 		ms_RadarTrace[index].m_nColor = color;

 }

-#endif

 

-#if 0

-WRAPPER void CRadar::ChangeBlipDisplay(int32, eBlipDisplay) { EAXJMP(0x4A5810); }

-#else

 void CRadar::ChangeBlipDisplay(int32 i, eBlipDisplay display)

 {

 	int index = GetActualBlipArrayIndex(i);

 	if (index != -1)

 		ms_RadarTrace[index].m_eBlipDisplay = display;

 }

-#endif

 

-#if 0

-WRAPPER void CRadar::ChangeBlipScale(int32, int32) { EAXJMP(0x4A57E0); }

-#else

 void CRadar::ChangeBlipScale(int32 i, int32 scale)

 {

 	int index = GetActualBlipArrayIndex(i);

 	if (index != -1)

 		ms_RadarTrace[index].m_wScale = scale;

 }

-#endif

 

-#if 0

-WRAPPER void CRadar::ClearBlip(int32) { EAXJMP(0x4A5720); }

-#else

 void CRadar::ClearBlip(int32 i)

 {

 	int index = GetActualBlipArrayIndex(i);

@@ -148,11 +125,7 @@ void CRadar::ClearBlip(int32 i)
 		ms_RadarTrace[index].m_IconID = RADAR_SPRITE_NONE;

 	}

 }

-#endif

 

-#if 0

-WRAPPER void CRadar::ClearBlipForEntity(eBlipType, int32) { EAXJMP(0x4A56C0); }

-#else

 void CRadar::ClearBlipForEntity(eBlipType type, int32 id)

 {

 	for (int i = 0; i < NUMRADARBLIPS; i++) {

@@ -165,11 +138,7 @@ void CRadar::ClearBlipForEntity(eBlipType type, int32 id)
 		}

 	};

 }

-#endif

 

-#if 0

-WRAPPER int CRadar::ClipRadarPoly(CVector2D *poly, const CVector2D *in) { EAXJMP(0x4A64A0); }

-#else

 // Why not a proper clipping algorithm?

 int CRadar::ClipRadarPoly(CVector2D *poly, const CVector2D *rect)

 {

@@ -249,7 +218,6 @@ int CRadar::ClipRadarPoly(CVector2D *poly, const CVector2D *rect)
 

 	return n;

 }

-#endif

 

 bool CRadar::DisplayThisBlip(int32 counter)

 {

@@ -263,9 +231,6 @@ bool CRadar::DisplayThisBlip(int32 counter)
 	}

 }

 

-#if 0

-WRAPPER void CRadar::Draw3dMarkers() { EAXJMP(0x4A4C70); }

-#else

 void CRadar::Draw3dMarkers()

 {

 	for (int i = 0; i < NUMRADARBLIPS; i++) {

@@ -317,12 +282,7 @@ void CRadar::Draw3dMarkers()
 		}

 	}

 }

-#endif

-

 

-#if 0

-WRAPPER void CRadar::DrawBlips() { EAXJMP(0x4A42F0); }

-#else

 void CRadar::DrawBlips()

 {

 	if (!TheCamera.m_WideScreenOn && CHud::m_Wants_To_Draw_Hud) {

@@ -580,12 +540,7 @@ void CRadar::DrawBlips()
 		}

 	}

 }

-#endif

-

 

-#if 0

-WRAPPER void CRadar::DrawMap () { EAXJMP(0x4A4200); }

-#else

 void CRadar::DrawMap()

 {

 	if (!TheCamera.m_WideScreenOn && CHud::m_Wants_To_Draw_Hud) {

@@ -605,11 +560,7 @@ void CRadar::DrawMap()
 		DrawRadarMap();

 	}

 }

-#endif 

 

-#if 0

-WRAPPER void CRadar::DrawRadarMap() { EAXJMP(0x4A6C20); }

-#else

 void CRadar::DrawRadarMap()

 {

 	// Game calculates an unused CRect here

@@ -642,11 +593,7 @@ void CRadar::DrawRadarMap()
 	DrawRadarSection(x, y + 1);

 	DrawRadarSection(x + 1, y + 1);

 }

-#endif

 

-#if 0

-WRAPPER void CRadar::DrawRadarMask() { EAXJMP(0x4A69C0); }

-#else

 void CRadar::DrawRadarMask() 

 { 

 	CVector2D corners[4] = {

@@ -690,11 +637,7 @@ void CRadar::DrawRadarMask()
 

 	RwD3D8SetRenderState(rwRENDERSTATESTENCILFUNCTION, rwSTENCILFUNCTIONGREATER);

 }

-#endif

 

-#if 0

-WRAPPER void CRadar::DrawRadarSection(int32, int32) { EAXJMP(0x4A67E0); }

-#else

 void CRadar::DrawRadarSection(int32 x, int32 y)

 {

 	int i;

@@ -738,20 +681,12 @@ void CRadar::DrawRadarSection(int32 x, int32 y)
 //	if(numVertices > 2)

 	RwIm2DRenderPrimitive(rwPRIMTYPETRIFAN, CSprite2d::GetVertices(), numVertices);

 }

-#endif

 

-#if 0

-WRAPPER void CRadar::DrawRadarSprite(uint16 sprite, float x, float y, uint8 alpha) { EAXJMP(0x4A5EF0); }

-#else

 void CRadar::DrawRadarSprite(uint16 sprite, float x, float y, uint8 alpha)

 {

 	RadarSprites[sprite]->Draw(CRect(x - SCREEN_SCALE_X(8.0f), y - SCREEN_SCALE_Y(8.0f), x + SCREEN_SCALE_X(8.0f), y + SCREEN_SCALE_Y(8.0f)), CRGBA(255, 255, 255, alpha));

 }

-#endif

 

-#if 0

-WRAPPER void CRadar::DrawRotatingRadarSprite(CSprite2d* sprite, float x, float y, float angle, int32 alpha) { EAXJMP(0x4A5D10); }

-#else

 void CRadar::DrawRotatingRadarSprite(CSprite2d* sprite, float x, float y, float angle, int32 alpha)

 {

 	CVector curPosn[4];

@@ -778,11 +713,7 @@ void CRadar::DrawRotatingRadarSprite(CSprite2d* sprite, float x, float y, float
 

 	sprite->Draw(curPosn[2].x, curPosn[2].y, curPosn[3].x, curPosn[3].y, curPosn[0].x, curPosn[0].y, curPosn[1].x, curPosn[1].y, CRGBA(255, 255, 255, alpha));

 }

-#endif 

 

-#if 0

-WRAPPER int32 CRadar::GetActualBlipArrayIndex(int32) { EAXJMP(0x4A41C0); }

-#else

 int32 CRadar::GetActualBlipArrayIndex(int32 i)

 {

 	if (i == -1)

@@ -792,11 +723,7 @@ int32 CRadar::GetActualBlipArrayIndex(int32 i)
 	else

 		return (uint16)i;

 }

-#endif

 

-#if 0

-WRAPPER int32 CRadar::GetNewUniqueBlipIndex(int32) { EAXJMP(0x4A4180); }

-#else

 int32 CRadar::GetNewUniqueBlipIndex(int32 i)

 {

 	if (ms_RadarTrace[i].m_BlipIndex >= UINT16_MAX - 1)

@@ -805,11 +732,7 @@ int32 CRadar::GetNewUniqueBlipIndex(int32 i)
 		ms_RadarTrace[i].m_BlipIndex++;

 	return i | (ms_RadarTrace[i].m_BlipIndex << 16);

 }

-#endif

 

-#if 0

-WRAPPER uint32 CRadar::GetRadarTraceColour(uint32 color, bool bright) { EAXJMP(0x4A5BB0); }

-#else

 uint32 CRadar::GetRadarTraceColour(uint32 color, bool bright)

 {

 	int32 c;

@@ -862,7 +785,6 @@ uint32 CRadar::GetRadarTraceColour(uint32 color, bool bright)
 	};

 	return c;

 }

-#endif

 

 const char* gRadarTexNames[] = {

 	"radar00", "radar01", "radar02", "radar03", "radar04", "radar05", "radar06", "radar07",

@@ -875,9 +797,6 @@ const char* gRadarTexNames[] = {
 	"radar56", "radar57", "radar58", "radar59", "radar60", "radar61", "radar62", "radar63",

 };

 

-#if 0

-WRAPPER void CRadar::Initialise() { EAXJMP(0x4A3EF0); }

-#else

 void

 CRadar::Initialise()

 {

@@ -894,11 +813,7 @@ CRadar::Initialise()
 	for (int i = 0; i < 64; i++) 

 		gRadarTxdIds[i] = CTxdStore::FindTxdSlot(gRadarTexNames[i]);

 }

-#endif

 

-#if 0

-WRAPPER float CRadar::LimitRadarPoint(CVector2D &point) { EAXJMP(0x4A4F30); }

-#else

 float CRadar::LimitRadarPoint(CVector2D &point)

 {

 	float dist, invdist;

@@ -911,11 +826,7 @@ float CRadar::LimitRadarPoint(CVector2D &point)
 	}

 	return dist;

 }

-#endif

 

-#if 0

-WRAPPER void CRadar::LoadAllRadarBlips(int32) { EAXJMP(0x4A6F30); }

-#else

 void CRadar::LoadAllRadarBlips(uint8 *buf, uint32 size)

 {

 	Initialise();

@@ -927,11 +838,7 @@ INITSAVEBUF
 

 VALIDATESAVEBUF(size);

 }

-#endif

 

-#if 0

-WRAPPER void CRadar::LoadTextures() { EAXJMP(0x4A4030); }

-#else

 void

 CRadar::LoadTextures()

 {

@@ -959,42 +866,26 @@ CRadar::LoadTextures()
 	WeaponSprite.SetTexture("radar_weapon");

 	CTxdStore::PopCurrentTxd();

 }

-#endif

 

-#if 0

-WRAPPER void RemoveMapSection(int32, int32) { EAXJMP(0x00); }

-#else

 void RemoveMapSection(int32 x, int32 y)

 {

 	if (x >= 0 && x <= 7 && y >= 0 && y <= 7)

 		CStreaming::RemoveTxd(gRadarTxdIds[x + RADAR_NUM_TILES * y]);

 }

-#endif

 

-#if 0

-WRAPPER void CRadar::RemoveRadarSections() { EAXJMP(0x4A60E0); }

-#else

 void CRadar::RemoveRadarSections()

 {

 	for (int i = 0; i < 8; i++)

 		for (int j = 0; j < 8; j++)

 			RemoveMapSection(i, j);

 }

-#endif

 

-#if 0

-WRAPPER void CRadar::RequestMapSection(int32, int32) { EAXJMP(0x00); }

-#else

 void CRadar::RequestMapSection(int32 x, int32 y)

 {

 	ClipRadarTileCoords(x, y);

 	CStreaming::RequestTxd(gRadarTxdIds[x + RADAR_NUM_TILES * y], STREAMFLAGS_DONT_REMOVE | STREAMFLAGS_DEPENDENCY);

 }

-#endif

 

-#if 0

-WRAPPER void CRadar::SaveAllRadarBlips(uint8 *buf, uint32 *size) { EAXJMP(0x4A6E30); }

-#else

 void CRadar::SaveAllRadarBlips(uint8 *buf, uint32 *size)

 {

 	*size = SAVE_HEADER_SIZE + sizeof(ms_RadarTrace);

@@ -1006,11 +897,7 @@ INITSAVEBUF
 

 VALIDATESAVEBUF(*size);

 }

-#endif

 

-#if 0

-WRAPPER void CRadar::SetBlipSprite(int32, int32) { EAXJMP(0x4A5840); }

-#else

 void CRadar::SetBlipSprite(int32 i, int32 icon)

 {

 	int index = CRadar::GetActualBlipArrayIndex(i);

@@ -1018,11 +905,7 @@ void CRadar::SetBlipSprite(int32 i, int32 icon)
 		ms_RadarTrace[index].m_IconID = icon;

 	}

 }

-#endif

 

-#if 0

-WRAPPER int32 CRadar::SetCoordBlip(eBlipType, CVector, int32, eBlipDisplay display) { EAXJMP(0x4A5590); }

-#else

 int CRadar::SetCoordBlip(eBlipType type, CVector pos, int32 color, eBlipDisplay display)

 {

 	int nextBlip;

@@ -1043,11 +926,7 @@ int CRadar::SetCoordBlip(eBlipType type, CVector pos, int32 color, eBlipDisplay
 	ms_RadarTrace[nextBlip].m_IconID = RADAR_SPRITE_NONE;

 	return CRadar::GetNewUniqueBlipIndex(nextBlip);

 }

-#endif

 

-#if 0

-WRAPPER int CRadar::SetEntityBlip(eBlipType type, int32, int32, eBlipDisplay) { EAXJMP(0x4A5640); }

-#else

 int CRadar::SetEntityBlip(eBlipType type, int32 handle, int32 color, eBlipDisplay display)

 {

 	int nextBlip;

@@ -1066,11 +945,7 @@ int CRadar::SetEntityBlip(eBlipType type, int32 handle, int32 color, eBlipDispla
 	ms_RadarTrace[nextBlip].m_IconID = RADAR_SPRITE_NONE;

 	return GetNewUniqueBlipIndex(nextBlip);

 }

-#endif

 

-#if 0

-WRAPPER void CRadar::SetRadarMarkerState(int32, bool) { EAXJMP(0x4A5C60); }

-#else

 void CRadar::SetRadarMarkerState(int32 counter, bool flag)

 {

 	CEntity *e;

@@ -1091,11 +966,7 @@ void CRadar::SetRadarMarkerState(int32 counter, bool flag)
 	if (e)

 		e->bHasBlip = flag;

 }

-#endif

 

-#if 0

-WRAPPER void CRadar::ShowRadarMarker(CVector pos, uint32 color, float radius) { EAXJMP(0x4A59C0); }

-#else

 void CRadar::ShowRadarMarker(CVector pos, uint32 color, float radius) {

 	float f1 = radius * 1.4f;

 	float f2 = radius * 0.5f;

@@ -1117,11 +988,7 @@ void CRadar::ShowRadarMarker(CVector pos, uint32 color, float radius) {
 	p2 = pos - TheCamera.GetRight()*f2;

 	CTheScripts::ScriptDebugLine3D(p1.x, p1.y, p1.z, p2.x, p2.y, p2.z, color, color);

 }

-#endif

 

-#if 0

-WRAPPER void CRadar::ShowRadarTrace(float x, float y, uint32 size, uint8 red, uint8 green, uint8 blue, uint8 alpha) { EAXJMP(0x4A5870); }

-#else

 void CRadar::ShowRadarTrace(float x, float y, uint32 size, uint8 red, uint8 green, uint8 blue, uint8 alpha)

 {

 	if (!CHud::m_Wants_To_Draw_Hud || TheCamera.m_WideScreenOn)

@@ -1130,7 +997,6 @@ void CRadar::ShowRadarTrace(float x, float y, uint32 size, uint8 red, uint8 gree
 	CSprite2d::DrawRect(CRect(x - SCREEN_SCALE_X(size + 1.0f), y - SCREEN_SCALE_Y(size + 1.0f), SCREEN_SCALE_X(size + 1.0f) + x, SCREEN_SCALE_Y(size + 1.0f) + y), CRGBA(0, 0, 0, alpha));

 	CSprite2d::DrawRect(CRect(x - SCREEN_SCALE_X(size), y - SCREEN_SCALE_Y(size), SCREEN_SCALE_X(size) + x, SCREEN_SCALE_Y(size) + y), CRGBA(red, green, blue, alpha));

 }

-#endif

 

 void CRadar::ShowRadarTraceWithHeight(float x, float y, uint32 size, uint8 red, uint8 green, uint8 blue, uint8 alpha, uint8 mode)

 {

@@ -1156,9 +1022,6 @@ void CRadar::ShowRadarTraceWithHeight(float x, float y, uint32 size, uint8 red,
 	}

 }

 

-#if 0

-WRAPPER void CRadar::Shutdown() { EAXJMP(0x4A3F60); }

-#else

 void CRadar::Shutdown()

 {

 	AsukaSprite.Delete();

@@ -1183,20 +1046,12 @@ void CRadar::Shutdown()
 	WeaponSprite.Delete();

 	RemoveRadarSections();

 }

-#endif

 

-#if 0

-WRAPPER void CRadar::StreamRadarSections(const CVector &posn) { EAXJMP(0x4A6B60); }

-#else

 void CRadar::StreamRadarSections(const CVector &posn)

 {

 	StreamRadarSections(floorf((2000.0f + posn.x) / 500.0f), ceilf(7.0f - (2000.0f + posn.y) / 500.0f));

 }

-#endif

 

-#if 0

-WRAPPER void CRadar::StreamRadarSections(int32 x, int32 y) { EAXJMP(0x4A6100); }

-#else

 void CRadar::StreamRadarSections(int32 x, int32 y)

 {

 	for (int i = 0; i < RADAR_NUM_TILES; ++i) {

@@ -1208,11 +1063,7 @@ void CRadar::StreamRadarSections(int32 x, int32 y)
 		};

 	};

 }

-#endif

 

-#if 0

-WRAPPER void CRadar::TransformRealWorldToTexCoordSpace(CVector2D &out, const CVector2D &in, int32 x, int32 y) { EAXJMP(0x4A5530); }

-#else

 void CRadar::TransformRealWorldToTexCoordSpace(CVector2D &out, const CVector2D &in, int32 x, int32 y)

 {

 	out.x = in.x - (x * RADAR_TILE_SIZE + WORLD_MIN_X);

@@ -1220,11 +1071,7 @@ void CRadar::TransformRealWorldToTexCoordSpace(CVector2D &out, const CVector2D &
 	out.x /= RADAR_TILE_SIZE;

 	out.y /= RADAR_TILE_SIZE;

 }

-#endif

 

-#if 0

-WRAPPER void CRadar::TransformRadarPointToRealWorldSpace(CVector2D &out, const CVector2D &in) { EAXJMP(0x4A5300); }

-#else

 void CRadar::TransformRadarPointToRealWorldSpace(CVector2D &out, const CVector2D &in)

 {

 	float s, c;

@@ -1255,7 +1102,6 @@ void CRadar::TransformRadarPointToRealWorldSpace(CVector2D &out, const CVector2D
 

 	out = out * m_radarRange + vec2DRadarOrigin;

 }

-#endif

 

 // Radar space goes from -1.0 to 1.0 in x and y, top right is (1.0, 1.0)

 void CRadar::TransformRadarPointToScreenSpace(CVector2D &out, const CVector2D &in)

@@ -1265,9 +1111,6 @@ void CRadar::TransformRadarPointToScreenSpace(CVector2D &out, const CVector2D &i
 	out.y = (1.0f - in.y)*0.5f*SCREEN_SCALE_Y(RADAR_HEIGHT) + SCREEN_SCALE_FROM_BOTTOM(RADAR_BOTTOM + RADAR_HEIGHT);

 }

 

-#if 0

-WRAPPER void CRadar::TransformRealWorldPointToRadarSpace(CVector2D &out, const CVector2D &in) { EAXJMP(0x4A50D0); }

-#else

 void CRadar::TransformRealWorldPointToRadarSpace(CVector2D &out, const CVector2D &in)

 {

 	float s, c;

@@ -1299,11 +1142,7 @@ void CRadar::TransformRealWorldPointToRadarSpace(CVector2D &out, const CVector2D
 	out.x = s * y + c * x;

 	out.y = c * y - s * x;

 }

-#endif

 

-#if 0

-WRAPPER void CRadar::GetTextureCorners(int32 x, int32 y, CVector2D *out) { EAXJMP(0x4A61C0); };

-#else

 // Transform from section indices to world coordinates

 void CRadar::GetTextureCorners(int32 x, int32 y, CVector2D *out)

 {

@@ -1326,11 +1165,7 @@ void CRadar::GetTextureCorners(int32 x, int32 y, CVector2D *out)
 	out[3].x = RADAR_TILE_SIZE * (x);

 	out[3].y = RADAR_TILE_SIZE * (y);

 }

-#endif

 

-#if 0

-WRAPPER void CRadar::ClipRadarTileCoords(int32 &, int32 &) { EAXJMP(0x00); };

-#else

 void CRadar::ClipRadarTileCoords(int32 &x, int32 &y)

 {

 	if (x < 0)

@@ -1342,24 +1177,16 @@ void CRadar::ClipRadarTileCoords(int32 &x, int32 &y)
 	if (y > RADAR_NUM_TILES-1)

 		y = RADAR_NUM_TILES-1;

 }

-#endif

 

 

-#if 0

-WRAPPER bool CRadar::IsPointInsideRadar(const CVector2D &) { EAXJMP(0x4A6160); }

-#else

 bool CRadar::IsPointInsideRadar(const CVector2D &point)

 {

 	if (point.x < -1.0f || point.x > 1.0f) return false;

 	if (point.y < -1.0f || point.y > 1.0f) return false;

 	return true;

 }

-#endif

 

 // clip line p1,p2 against (-1.0, 1.0) in x and y, set out to clipped point closest to p1

-#if 0

-WRAPPER int CRadar::LineRadarBoxCollision(CVector2D &, const CVector2D &, const CVector2D &) { EAXJMP(0x4A6250); }

-#else

 int CRadar::LineRadarBoxCollision(CVector2D &out, const CVector2D &p1, const CVector2D &p2)

 {

 	float d1, d2;

@@ -1430,7 +1257,6 @@ int CRadar::LineRadarBoxCollision(CVector2D &out, const CVector2D &p1, const CVe
 

 	return edge;

 }

-#endif

 

 STARTPATCHES

 	InjectHook(0x4A3EF0, CRadar::Initialise, PATCH_JUMP);

diff --git a/src/core/RwHelper.cpp b/src/core/RwHelper.cpp
index 1030d69e..6325bf15 100644
--- a/src/core/RwHelper.cpp
+++ b/src/core/RwHelper.cpp
@@ -352,7 +352,25 @@ WRAPPER bool CheckVideoCardCaps(void) { EAXJMP(0x592740); }
 WRAPPER void WriteVideoCardCapsFile(void) { EAXJMP(0x5927D0); }
 WRAPPER void ConvertingTexturesScreen(uint32, uint32, const char*) { EAXJMP(0x592880); }
 WRAPPER void DealWithTxdWriteError(uint32, uint32, const char*) { EAXJMP(0x592BF0); }
-WRAPPER bool ConvertTextures() { EAXJMP(0x592C70); }
+WRAPPER bool CreateTxdImageForVideoCard() { EAXJMP(0x592C70); }
+
+void CreateDebugFont()
+{
+	;
+}
+
+void DestroyDebugFont()
+{
+	;
+}
+
+void FlushObrsPrintfs()
+{
+	;
+}
+
+WRAPPER void _TexturePoolsInitialise() { EAXJMP(0x598B10); }
+WRAPPER void _TexturePoolsShutdown() { EAXJMP(0x598B30); }
 
 STARTPATCHES
 	//InjectHook(0x526450, GetFirstObjectCallback, PATCH_JUMP);
diff --git a/src/core/RwHelper.h b/src/core/RwHelper.h
index 1f0290cc..a9f0bdf4 100644
--- a/src/core/RwHelper.h
+++ b/src/core/RwHelper.h
@@ -3,6 +3,9 @@
 void *RwMallocAlign(RwUInt32 size, RwUInt32 align);
 void RwFreeAlign(void *mem);
 
+void CreateDebugFont();
+void DestroyDebugFont();
+void FlushObrsPrintfs();
 void DefinedState(void);
 RwFrame *GetFirstChild(RwFrame *frame);
 RwObject *GetFirstObject(RwFrame *frame);
@@ -17,7 +20,7 @@ bool CheckVideoCardCaps(void);
 void WriteVideoCardCapsFile(void);
 void ConvertingTexturesScreen(uint32, uint32, const char*);
 void DealWithTxdWriteError(uint32, uint32, const char*);
-bool ConvertTextures(); // not a real name
+bool CreateTxdImageForVideoCard();
 
 bool RpClumpGtaStreamRead1(RwStream *stream);
 RpClump *RpClumpGtaStreamRead2(RwStream *stream);
@@ -31,3 +34,7 @@ void CameraDestroy(RwCamera *camera);
 RwCamera *CameraCreate(RwInt32 width,
                        RwInt32 height,
                        RwBool zBuffer);
+
+					   
+void _TexturePoolsInitialise();
+void _TexturePoolsShutdown();
\ No newline at end of file
diff --git a/src/core/Stats.cpp b/src/core/Stats.cpp
index 93eeb759..9478479b 100644
--- a/src/core/Stats.cpp
+++ b/src/core/Stats.cpp
@@ -48,6 +48,8 @@ int32& CStats::LongestFlightInDodo = *(int32*)0x8F5FE4;
 int32& CStats::TimeTakenDefuseMission = *(int32*)0x880E24;
 int32& CStats::TotalNumberKillFrenzies = *(int32*)0x8E2884;
 int32& CStats::TotalNumberMissions = *(int32*)0x8E2820;
+int32& CStats::KgOfExplosivesUsed = *(int32*)0x8F2510;
+int32& CStats::CarsCrushed = *(int32*)0x943050;
 int32(&CStats::FastestTimes)[CStats::TOTAL_FASTEST_TIMES] = *(int32(*)[CStats::TOTAL_FASTEST_TIMES])*(uintptr*)0x6E9128;
 int32(&CStats::HighestScores)[CStats::TOTAL_HIGHEST_SCORES] = *(int32(*)[CStats::TOTAL_HIGHEST_SCORES]) * (uintptr*)0x8622B0;
 
diff --git a/src/core/Stats.h b/src/core/Stats.h
index 0a750d5e..1d220905 100644
--- a/src/core/Stats.h
+++ b/src/core/Stats.h
@@ -53,6 +53,8 @@ public:
 	static int32 &TotalNumberMissions;
 	static int32(&FastestTimes)[TOTAL_FASTEST_TIMES];
 	static int32(&HighestScores)[TOTAL_HIGHEST_SCORES];
+	static int32 &KgOfExplosivesUsed;
+	static int32 &CarsCrushed;
 
 public:
 	static void RegisterFastestTime(int32, int32);
diff --git a/src/core/Timer.cpp b/src/core/Timer.cpp
index bcf84560..a46e1d8b 100644
--- a/src/core/Timer.cpp
+++ b/src/core/Timer.cpp
@@ -75,9 +75,6 @@ void CTimer::Shutdown(void)
 	;
 }
 
-#if 0
-WRAPPER void CTimer::Update(void) { EAXJMP(0x4ACF70); }
-#else
 void CTimer::Update(void)
 {
 	m_snPreviousTimeInMilliseconds = m_snTimeInMilliseconds;
@@ -149,7 +146,6 @@ void CTimer::Update(void)
   
 	m_FrameCounter++;
 }
-#endif
 
 void CTimer::Suspend(void)
 {
diff --git a/src/core/TxdStore.cpp b/src/core/TxdStore.cpp
index ab970b99..c751147d 100644
--- a/src/core/TxdStore.cpp
+++ b/src/core/TxdStore.cpp
@@ -10,7 +10,7 @@ CPool<TxdDef,TxdDef> *&CTxdStore::ms_pTxdPool = *(CPool<TxdDef,TxdDef>**)0x8F5FB
 RwTexDictionary *&CTxdStore::ms_pStoredTxd = *(RwTexDictionary**)0x9405BC;
 
 void
-CTxdStore::Initialize(void)
+CTxdStore::Initialise(void)
 {
 	if(ms_pTxdPool == nil)
 		ms_pTxdPool = new CPool<TxdDef,TxdDef>(TXDSTORESIZE);
@@ -187,7 +187,7 @@ CTxdStore::RemoveTxd(int slot)
 }
 
 STARTPATCHES
-	InjectHook(0x527440, CTxdStore::Initialize, PATCH_JUMP);
+	InjectHook(0x527440, CTxdStore::Initialise, PATCH_JUMP);
 	InjectHook(0x527470, CTxdStore::Shutdown, PATCH_JUMP);
 	InjectHook(0x527490, CTxdStore::GameShutdown, PATCH_JUMP);
 	InjectHook(0x5274E0, CTxdStore::AddTxdSlot, PATCH_JUMP);
diff --git a/src/core/TxdStore.h b/src/core/TxdStore.h
index a9e57d31..12ac708f 100644
--- a/src/core/TxdStore.h
+++ b/src/core/TxdStore.h
@@ -13,7 +13,7 @@ class CTxdStore
 	static CPool<TxdDef,TxdDef> *&ms_pTxdPool;
 	static RwTexDictionary *&ms_pStoredTxd;
 public:
-	static void Initialize(void);
+	static void Initialise(void);
 	static void Shutdown(void);
 	static void GameShutdown(void);
 	static int AddTxdSlot(const char *name);
diff --git a/src/core/Wanted.cpp b/src/core/Wanted.cpp
index 7af753e8..29294a2b 100644
--- a/src/core/Wanted.cpp
+++ b/src/core/Wanted.cpp
@@ -7,19 +7,16 @@
 #include "ZoneCull.h"
 #include "Darkel.h"
 #include "DMAudio.h"
+#include "CopPed.h"
 #include "Wanted.h"
+#include "General.h"
 
 int32 &CWanted::MaximumWantedLevel = *(int32*)0x5F7714;	// 6
 int32 &CWanted::nMaximumWantedLevel = *(int32*)0x5F7718;	// 6400
 
-WRAPPER void CWanted::Reset() { EAXJMP(0x4AD790) };
-WRAPPER void CWanted::Update() { EAXJMP(0x4AD7B0) };
-
 void
 CWanted::Initialise()
 {
-	int i;
-
 	m_nChaos = 0;
 	m_nLastUpdateTime = 0;
 	m_nLastWantedLevelChange = 0;
@@ -34,10 +31,12 @@ CWanted::Initialise()
 	m_bArmyRequired = false;
 	m_fCrimeSensitivity = 1.0f;
 	m_nWantedLevel = 0;
-        m_CopsBeatingSuspect = 0;
-	for(i = 0; i < 10; i++)
+	m_CopsBeatingSuspect = 0;
+
+	for (int i = 0; i < ARRAY_SIZE(m_pCops); i++)
 		m_pCops[i] = nil;
-        ClearQdCrimes();
+
+	ClearQdCrimes();
 }
 
 bool
@@ -61,7 +60,7 @@ CWanted::AreArmyRequired()
 int32
 CWanted::NumOfHelisRequired()
 {
-	if (m_bIgnoredByCops)
+	if (m_bIgnoredByCops || m_bIgnoredByEveryone)
 		return 0;
 
 	switch (m_nWantedLevel) {
@@ -79,9 +78,10 @@ CWanted::NumOfHelisRequired()
 void
 CWanted::SetWantedLevel(int32 level)
 {
-	ClearQdCrimes();
 	if (level > MaximumWantedLevel)
 		level = MaximumWantedLevel;
+
+	ClearQdCrimes();
 	switch (level) {
 	case 0:
 		m_nChaos = 0;
@@ -360,10 +360,107 @@ CWanted::WorkOutPolicePresence(CVector posn, float radius)
 	return numPolice;
 }
 
+void
+CWanted::Update(void)
+{
+	if (CTimer::GetTimeInMilliseconds() - m_nLastUpdateTime > 1000) {
+		if (m_nWantedLevel > 1) {
+			m_nLastUpdateTime = CTimer::GetTimeInMilliseconds();
+		} else {
+			float radius = 18.0f;
+			CVector playerPos = FindPlayerCoors();
+			if (WorkOutPolicePresence(playerPos, radius) == 0) {
+				m_nLastUpdateTime = CTimer::GetTimeInMilliseconds();
+				m_nChaos = max(0, m_nChaos - 1);
+				UpdateWantedLevel();
+			}
+		}
+		UpdateCrimesQ();
+		bool orderMessedUp = false;
+		int currCopNum = 0;
+		bool foundEmptySlot = false;
+		for (int i = 0; i < ARRAY_SIZE(m_pCops); i++) {
+			if (m_pCops[i]) {
+				++currCopNum;
+				if (foundEmptySlot)
+					orderMessedUp = true;
+			} else {
+				foundEmptySlot = true;
+			}
+		}
+		if (currCopNum != m_CurrentCops) {
+			printf("CopPursuit total messed up: re-setting\n");
+			m_CurrentCops = currCopNum;
+		}
+		if (orderMessedUp) {
+			printf("CopPursuit pointer list messed up: re-sorting\n");
+			bool fixed = true;
+			for (int i = 0; i < ARRAY_SIZE(m_pCops); i++) {
+				if (!m_pCops[i]) {
+					for (int j = i; j < ARRAY_SIZE(m_pCops); j++) {
+						if (m_pCops[j]) {
+							m_pCops[i] = m_pCops[j];
+							m_pCops[j] = nil;
+							fixed = false;
+							break;
+						}
+					}
+					if (fixed)
+						break;
+				}
+			}
+		}
+	}
+}
+
+void
+CWanted::ResetPolicePursuit(void)
+{
+	for(int i = 0; i < ARRAY_SIZE(m_pCops); i++) {
+		CCopPed *cop = m_pCops[i];
+		if (!cop)
+			continue;
+
+		cop->m_bIsInPursuit = false;
+		cop->m_objective = OBJECTIVE_NONE;
+		cop->m_prevObjective = OBJECTIVE_NONE;
+		cop->m_nLastPedState = PED_NONE;
+		if (!cop->DyingOrDead()) {
+			cop->SetWanderPath(CGeneral::GetRandomNumberInRange(0.0f, 8.0f));
+		}
+		m_pCops[i] = nil;
+	}
+	m_CurrentCops = 0;
+}
+
+void
+CWanted::Reset(void)
+{
+	ResetPolicePursuit();
+	Initialise();
+}
+
+void
+CWanted::UpdateCrimesQ(void)
+{
+	for(int i = 0; i < ARRAY_SIZE(m_aCrimes); i++) {
+
+		CCrimeBeingQd &crime = m_aCrimes[i];
+		if (crime.m_nType != CRIME_NONE) {
+			if (CTimer::GetTimeInMilliseconds() > crime.m_nTime + 500 && !crime.m_bReported) {
+				ReportCrimeNow(crime.m_nType, crime.m_vecPosn, crime.m_bPoliceDoesntCare);
+				crime.m_bReported = true;
+			}
+			if (CTimer::GetTimeInMilliseconds() > crime.m_nTime + 10000)
+				crime.m_nType = CRIME_NONE;
+		}
+	}
+}
+
 STARTPATCHES
 	InjectHook(0x4AD6E0, &CWanted::Initialise, PATCH_JUMP);
-//	InjectHook(0x4AD790, &CWanted::Reset, PATCH_JUMP);
-//	InjectHook(0x4AD7B0, &CWanted::Update, PATCH_JUMP);
+	InjectHook(0x4AD790, &CWanted::Reset, PATCH_JUMP);
+	InjectHook(0x4AD7B0, &CWanted::Update, PATCH_JUMP);
 	InjectHook(0x4AD900, &CWanted::UpdateWantedLevel, PATCH_JUMP);
 	InjectHook(0x4AD9F0, &CWanted::RegisterCrime, PATCH_JUMP);
 	InjectHook(0x4ADA10, &CWanted::RegisterCrime_Immediately, PATCH_JUMP);
@@ -374,10 +471,10 @@ STARTPATCHES
 	InjectHook(0x4ADBC0, &CWanted::AreFbiRequired, PATCH_JUMP);
 	InjectHook(0x4ADBE0, &CWanted::AreArmyRequired, PATCH_JUMP);
 	InjectHook(0x4ADC00, &CWanted::NumOfHelisRequired, PATCH_JUMP);
-//	InjectHook(0x4ADC40, &CWanted::ResetPolicePursuit, PATCH_JUMP);
+	InjectHook(0x4ADC40, &CWanted::ResetPolicePursuit, PATCH_JUMP);
 	InjectHook(0x4ADD00, &CWanted::WorkOutPolicePresence, PATCH_JUMP);
 	InjectHook(0x4ADF20, &CWanted::ClearQdCrimes, PATCH_JUMP);
 	InjectHook(0x4ADFD0, &CWanted::AddCrimeToQ, PATCH_JUMP);
-//	InjectHook(0x4AE090, &CWanted::UpdateCrimesQ, PATCH_JUMP);
+	InjectHook(0x4AE090, &CWanted::UpdateCrimesQ, PATCH_JUMP);
 	InjectHook(0x4AE110, &CWanted::ReportCrimeNow, PATCH_JUMP);
 ENDPATCHES
diff --git a/src/core/Wanted.h b/src/core/Wanted.h
index f6dbe8d0..9823529c 100644
--- a/src/core/Wanted.h
+++ b/src/core/Wanted.h
@@ -30,7 +30,7 @@ class CCrimeBeingQd
 public:
 	eCrimeType m_nType;
 	uint32 m_nId;
-	int32 m_nTime;
+	uint32 m_nTime;
 	CVector m_vecPosn;
 	bool m_bReported;
 	bool m_bPoliceDoesntCare;
@@ -78,6 +78,8 @@ public:
 	void ReportCrimeNow(eCrimeType type, const CVector &coors, bool policeDoesntCare);
 	void UpdateWantedLevel();
 	void Reset();
+	void ResetPolicePursuit();
+	void UpdateCrimesQ();
 	void Update();
 
 	bool IsIgnored(void) { return m_bIgnoredByCops || m_bIgnoredByEveryone; }
diff --git a/src/core/World.cpp b/src/core/World.cpp
index 1dda1056..4a0230ce 100644
--- a/src/core/World.cpp
+++ b/src/core/World.cpp
@@ -19,6 +19,7 @@
 #include "Messages.h"
 #include "Replay.h"
 #include "Population.h"
+#include "Fire.h"
 
 CColPoint *gaTempSphereColPoints = (CColPoint*)0x6E64C0;	// [32]
 
@@ -39,6 +40,7 @@ bool &CWorld::bProcessCutsceneOnly = *(bool*)0x95CD8B;
 bool &CWorld::bDoingCarCollisions = *(bool*)0x95CD8C;
 bool &CWorld::bIncludeCarTyres = *(bool*)0x95CDAA;
 
+WRAPPER void CWorld::ClearForRestart(void) { EAXJMP(0x4AE850); }
 WRAPPER void CWorld::AddParticles(void) { EAXJMP(0x4B4010); }
 WRAPPER void CWorld::ShutDown(void) { EAXJMP(0x4AE450); }
 WRAPPER void CWorld::RepositionCertainDynamicObjects() { EAXJMP(0x4B42B0); }
@@ -53,6 +55,7 @@ WRAPPER void CWorld::FindObjectsOfTypeInRangeSectorList(uint32, CPtrList&, CVect
 WRAPPER void CWorld::FindMissionEntitiesIntersectingCube(const CVector&, const CVector&, int16*, int16, CEntity**, bool, bool, bool) { EAXJMP(0x4B3680); }
 WRAPPER void CWorld::ClearCarsFromArea(float, float, float, float, float, float) { EAXJMP(0x4B50E0); }
 WRAPPER void CWorld::ClearPedsFromArea(float, float, float, float, float, float) { EAXJMP(0x4B52B0); }
+WRAPPER void CWorld::CallOffChaseForArea(float, float, float, float) { EAXJMP(0x4B5530); }
 
 void
 CWorld::Initialise()
@@ -1052,6 +1055,19 @@ CWorld::ExtinguishAllCarFiresInArea(CVector point, float range)
 }
 
 void
+CWorld::SetCarsOnFire(float x, float y, float z, float radius, CEntity *reason)
+{
+	int poolSize = CPools::GetVehiclePool()->GetSize();
+	for (int poolIndex = poolSize - 1; poolIndex >= 0; poolIndex--) {
+		CVehicle *veh = CPools::GetVehiclePool()->GetSlot(poolIndex);
+		if (veh && veh->m_status != STATUS_WRECKED && !veh->m_pCarFire && !veh->bFireProof) {
+			if (Abs(veh->GetPosition().z - z) < 5.0f && Abs(veh->GetPosition().x - x) < radius && Abs(veh->GetPosition().y - y) < radius)
+					gFireManager.StartFire(veh, reason, 0.8f, true);
+		}
+	}
+}
+
+void
 CWorld::Process(void)
 {
 	if (!(CTimer::GetFrameCounter() & 63))
diff --git a/src/core/World.h b/src/core/World.h
index 4b19e629..c4103eb2 100644
--- a/src/core/World.h
+++ b/src/core/World.h
@@ -115,6 +115,7 @@ public:
 	static void FindMissionEntitiesIntersectingCube(const CVector&, const CVector&, int16*, int16, CEntity**, bool, bool, bool);
 	static void ClearCarsFromArea(float, float, float, float, float, float);
 	static void ClearPedsFromArea(float, float, float, float, float, float);
+	static void CallOffChaseForArea(float, float, float, float);
 
 	static float GetSectorX(float f) { return ((f - WORLD_MIN_X)/SECTOR_SIZE_X); }
 	static float GetSectorY(float f) { return ((f - WORLD_MIN_Y)/SECTOR_SIZE_Y); }
@@ -130,10 +131,12 @@ public:
 	static void StopAllLawEnforcersInTheirTracks();
 	static void SetAllCarsCanBeDamaged(bool);
 	static void ExtinguishAllCarFiresInArea(CVector, float);
+	static void SetCarsOnFire(float, float, float, float, CEntity*);
 
 	static void Initialise();
 	static void AddParticles();
 	static void ShutDown();
+	static void ClearForRestart(void);
 	static void RepositionCertainDynamicObjects();
 	static void RemoveStaticObjects();
 	static void Process();
diff --git a/src/core/config.h b/src/core/config.h
index 4015e868..b4f3b7b2 100644
--- a/src/core/config.h
+++ b/src/core/config.h
@@ -100,6 +100,7 @@ enum Config {
 	NUMPHONES = 50,
 	NUMPEDGROUPS = 31,
 	NUMMODELSPERPEDGROUP = 8,
+	NUMSHOTINFOS = 100,
 
 	NUMROADBLOCKS = 600,
 
@@ -116,6 +117,8 @@ enum Config {
 
 	NUM_AUDIO_REFLECTIONS = 5,
 	NUM_SCRIPT_MAX_ENTITIES = 40,
+
+	NUM_GARAGE_STORED_CARS = 6
 };
 
 // We'll use this once we're ready to become independent of the game
@@ -207,4 +210,6 @@ enum Config {
 // #define NEW_WALK_AROUND_ALGORITHM	// to make walking around vehicles/objects less awkward
 #define CANCELLABLE_CAR_ENTER
 
+// Camera
 #define IMPROVED_CAMERA		// Better Debug cam, and maybe more in the future
+//#define FREE_CAM		// Rotating cam
diff --git a/src/core/main.cpp b/src/core/main.cpp
index 663b09da..50543b1e 100644
--- a/src/core/main.cpp
+++ b/src/core/main.cpp
@@ -90,7 +90,6 @@ void DoFade(void);
 void Render2dStuffAfterFade(void);
 
 CSprite2d *LoadSplash(const char *name);
-void DestroySplashScreen(void);
 
 
 extern void (*DebugMenuProcess)(void);
@@ -327,7 +326,7 @@ DoRWStuffEndOfFrame(void)
 {
 	CDebug::DisplayScreenStrings();	// custom
 	CDebug::DebugDisplayTextBuffer();
-	// FlushObrsPrintfs();
+	FlushObrsPrintfs();
 	RwCameraEndUpdate(Scene.camera);
 	RsCameraShowRaster(Scene.camera);
 }
diff --git a/src/core/main.h b/src/core/main.h
index 570189b3..5e9401b9 100644
--- a/src/core/main.h
+++ b/src/core/main.h
@@ -28,6 +28,7 @@ void InitialiseGame(void);
 void LoadingScreen(const char *str1, const char *str2, const char *splashscreen);
 void LoadingIslandScreen(const char *levelName);
 CSprite2d *LoadSplash(const char *name);
+void DestroySplashScreen(void);
 char *GetLevelSplashScreen(int level);
 char *GetRandomSplashScreen(void);
 void LittleTest(void);
diff --git a/src/core/re3.cpp b/src/core/re3.cpp
index a65e6d76..500bf230 100644
--- a/src/core/re3.cpp
+++ b/src/core/re3.cpp
@@ -372,6 +372,10 @@ DebugMenuPopulate(void)
 
 		extern bool PrintDebugCode;
 		extern int16 &DebugCamMode;
+#ifdef FREE_CAM
+		extern bool bFreeCam;
+		DebugMenuAddVarBool8("Cam", "Free Cam", (int8*)&bFreeCam, nil);
+#endif
 		DebugMenuAddVarBool8("Cam", "Print Debug Code", (int8*)&PrintDebugCode, nil);
 		DebugMenuAddVar("Cam", "Cam Mode", &DebugCamMode, nil, 1, 0, CCam::MODE_EDITOR, nil);
 		DebugMenuAddCmd("Cam", "Normal", []() { DebugCamMode = 0; });