Import Cai1Hsu/re3 @ miami (reVC / GTA:VC decompilation)HEADmiami

Snapshot import (no upstream history) into git.ancap.in.ua/claude, per @lzcnt.
Source: https://github.com/Cai1Hsu/re3 branch miami.

93 files changed, 59900 insertions, 0 deletions

diff --git a/src/core/Accident.cpp b/src/core/Accident.cpp
new file mode 100644
index 0000000..c861132
--- /dev/null
+++ b/src/core/Accident.cpp
@@ -0,0 +1,128 @@
+#include "common.h"
+
+#include "Accident.h"
+
+#include "Ped.h"
+#include "Pools.h"
+#include "World.h"
+
+CAccidentManager gAccidentManager;
+
+CAccident*
+CAccidentManager::GetNextFreeAccident()
+{
+	for (int i = 0; i < NUM_ACCIDENTS; i++) {
+		if (m_aAccidents[i].m_pVictim == nil)
+			return &m_aAccidents[i];
+	}
+
+	return nil;
+}
+
+void
+CAccidentManager::ReportAccident(CPed *ped)
+{
+	if (!ped->IsPlayer() && ped->CharCreatedBy != MISSION_CHAR && !ped->bRenderScorched && !ped->bBodyPartJustCameOff && ped->bAllowMedicsToReviveMe && !ped->bIsInWater) {
+		for (int i = 0; i < NUM_ACCIDENTS; i++) {
+			if (m_aAccidents[i].m_pVictim != nil && m_aAccidents[i].m_pVictim == ped)
+				return;
+		}
+
+		if (ped->m_pCurrentPhysSurface == nil) {
+			CVector point = ped->GetPosition();
+			point.z -= 2.0f;
+
+			CColPoint colPoint;
+			CEntity *pEntity; 
+
+			if (!CWorld::ProcessVerticalLine(point, -100.0f, colPoint, pEntity, true, false, false, false, false, false, nil)) {
+				CAccident *accident = GetNextFreeAccident();
+				if (accident != nil) {
+					accident->m_pVictim = ped;
+					ped->RegisterReference((CEntity**)&accident->m_pVictim);
+					accident->m_nMedicsPerformingCPR = 0;
+					accident->m_nMedicsAttending = 0;
+					ped->m_lastAccident = accident;
+					WorkToDoForMedics();
+				}
+			}
+		}
+	}
+}
+
+void
+CAccidentManager::Update()
+{
+#ifdef SQUEEZE_PERFORMANCE
+	// Handled after injury registered.
+	return;
+#endif
+	int32 e;
+	if (CEventList::GetEvent(EVENT_INJURED_PED, &e)) {
+		CPed *ped = CPools::GetPed(gaEvent[e].entityRef);
+		if (ped) {
+			ReportAccident(ped);
+			CEventList::ClearEvent(e);
+		}
+	}
+}
+
+CAccident*
+CAccidentManager::FindNearestAccident(CVector vecPos, float *pDistance)
+{
+	for (int i = 0; i < MAX_MEDICS_TO_ATTEND_ACCIDENT; i++){
+		int accidentId = -1;
+		float minDistance = 999999;
+		for (int j = 0; j < NUM_ACCIDENTS; j++){
+			CPed* pVictim = m_aAccidents[j].m_pVictim;
+			if (!pVictim)
+				continue;
+			if (pVictim->CharCreatedBy == MISSION_CHAR)
+				continue;
+			if (pVictim->m_fHealth != 0.0f)
+				continue;
+			if (m_aAccidents[j].m_nMedicsPerformingCPR != i)
+				continue;
+			float distance = (pVictim->GetPosition() - vecPos).Magnitude2D();
+			if (distance / 2 > pVictim->GetPosition().z - vecPos.z && distance < minDistance){
+				minDistance = distance;
+				accidentId = j;
+			}
+		}
+		*pDistance = minDistance;
+		if (accidentId != -1)
+			return &m_aAccidents[accidentId];
+	}
+	return nil;
+}
+
+uint16
+CAccidentManager::CountActiveAccidents()
+{
+	uint16 accidents = 0;
+	for (int i = 0; i < NUM_ACCIDENTS; i++) {
+		if (m_aAccidents[i].m_pVictim)
+			accidents++;
+	}
+	return accidents;
+}
+
+bool
+CAccidentManager::WorkToDoForMedics()
+{
+	for (int i = 0; i < NUM_ACCIDENTS; i++) {
+		if (m_aAccidents[i].m_pVictim != nil && m_aAccidents[i].m_nMedicsAttending < MAX_MEDICS_TO_ATTEND_ACCIDENT)
+			return true;
+	}
+	return false;
+}
+
+bool
+CAccidentManager::UnattendedAccidents()
+{
+	for (int i = 0; i < NUM_ACCIDENTS; i++) {
+		if (m_aAccidents[i].m_pVictim != nil && m_aAccidents[i].m_nMedicsAttending == 0)
+			return true;
+	}
+	return false;
+}
diff --git a/src/core/Accident.h b/src/core/Accident.h
new file mode 100644
index 0000000..568e114
--- /dev/null
+++ b/src/core/Accident.h
@@ -0,0 +1,31 @@
+#pragma once
+#include "config.h"
+
+class CPed;
+
+class CAccident
+{
+public:
+	CPed *m_pVictim;
+	uint32 m_nMedicsAttending;
+	uint32 m_nMedicsPerformingCPR;
+	CAccident() : m_pVictim(nil), m_nMedicsAttending(0), m_nMedicsPerformingCPR(0) {}
+};
+
+class CAccidentManager
+{
+	CAccident m_aAccidents[NUM_ACCIDENTS];
+	enum {
+		MAX_MEDICS_TO_ATTEND_ACCIDENT = 2
+	};
+public:
+	CAccident *GetNextFreeAccident();
+	void ReportAccident(CPed *ped);
+	void Update();
+	CAccident *FindNearestAccident(CVector vecPos, float *pDistance);
+	uint16 CountActiveAccidents();
+	bool UnattendedAccidents();
+	bool WorkToDoForMedics();
+};
+
+extern CAccidentManager gAccidentManager;
\ No newline at end of file
diff --git a/src/core/AnimViewer.cpp b/src/core/AnimViewer.cpp
new file mode 100644
index 0000000..562b9c1
--- /dev/null
+++ b/src/core/AnimViewer.cpp
@@ -0,0 +1,437 @@
+#include "common.h"
+
+#include "Font.h"
+#include "Pad.h"
+#include "Text.h"
+#include "main.h"
+#include "Timer.h"
+#include "DMAudio.h"
+#include "FileMgr.h"
+#include "Streaming.h"
+#include "TxdStore.h"
+#include "General.h"
+#include "Camera.h"
+#include "Vehicle.h"
+#include "Bike.h"
+#include "PlayerSkin.h"
+#include "PlayerInfo.h"
+#include "World.h"
+#include "Renderer.h"
+#include "AnimManager.h"
+#include "AnimBlendAssocGroup.h"
+#include "AnimViewer.h"
+#include "PlayerPed.h"
+#include "Pools.h"
+#include "References.h"
+#include "PathFind.h"
+#include "HandlingMgr.h"
+#include "TempColModels.h"
+#include "Particle.h"
+#include "CdStream.h"
+#include "Messages.h"
+#include "CarCtrl.h"
+#include "FileLoader.h"
+#include "ModelIndices.h"
+#include "Clock.h"
+#include "Timecycle.h"
+#include "RpAnimBlend.h"
+#include "AnimBlendAssociation.h"
+#include "Shadows.h"
+#include "Radar.h"
+#include "Hud.h"
+#include "debugmenu.h"
+
+int CAnimViewer::animTxdSlot = 0;
+CEntity *CAnimViewer::pTarget = nil;
+
+void
+CAnimViewer::Render(void) {
+	if (pTarget) {
+		if (pTarget) {
+#ifdef FIX_BUGS
+			if(pTarget->IsPed())
+				((CPed*)pTarget)->UpdateRpHAnim();
+#endif
+			pTarget->Render();
+			CRenderer::RenderOneNonRoad(pTarget);
+		}
+	}
+}
+
+void
+CAnimViewer::Initialise(void) {
+
+	// we need messages, messages needs hud, hud needs those
+	int hudSlot = CTxdStore::AddTxdSlot("hud");
+	CTxdStore::LoadTxd(hudSlot, "MODELS/HUD.TXD");
+	CHud::m_Wants_To_Draw_Hud = false;
+
+	animTxdSlot = CTxdStore::AddTxdSlot("generic");
+	CTxdStore::Create(animTxdSlot);
+	int particleSlot = CTxdStore::AddTxdSlot("particle");
+	CTxdStore::LoadTxd(particleSlot, "MODELS/PARTICLE.TXD");
+	CTxdStore::SetCurrentTxd(animTxdSlot);
+	CPools::Initialise();
+	CReferences::Init();
+	TheCamera.Init();
+	TheCamera.SetRwCamera(Scene.camera);
+	TheCamera.Cams[TheCamera.ActiveCam].Distance = 5.0f;
+	ThePaths.Init();
+	ThePaths.AllocatePathFindInfoMem(4500);
+	CCollision::Init();
+	CWorld::Initialise();
+	mod_HandlingManager.Initialise();
+	CTempColModels::Initialise();
+	CAnimManager::Initialise();
+	CModelInfo::Initialise();
+	CParticle::Initialise();
+	CCarCtrl::Init();
+	CPedStats::Initialise();
+	CMessages::Init();
+	CdStreamAddImage("MODELS\\GTA3.IMG");
+	CFileLoader::LoadLevel("DATA\\DEFAULT.DAT");
+	CFileLoader::LoadLevel("DATA\\ANIMVIEWER.DAT");
+	CStreaming::Init();
+	for(int i = 0; i < MODELINFOSIZE; i++)
+		if(CModelInfo::GetModelInfo(i))
+			CModelInfo::GetModelInfo(i)->ConvertAnimFileIndex();
+	CStreaming::LoadInitialPeds();
+	CStreaming::RequestSpecialModel(MI_PLAYER, "player", STREAMFLAGS_DONT_REMOVE);
+	CStreaming::LoadAllRequestedModels(false);
+	CRenderer::Init();
+	CVehicleModelInfo::LoadVehicleColours();
+#ifdef FIX_BUGS
+	CVehicleModelInfo::LoadEnvironmentMaps();
+#endif
+	CAnimManager::LoadAnimFiles();
+	CWorld::PlayerInFocus = 0;
+	CWeapon::InitialiseWeapons();
+	CPed::Initialise();
+	CTimer::Initialise();
+	CClock::Initialise(60000);
+	CTimeCycle::Initialise();
+	CCarCtrl::Init();
+	CPlayerPed *player = new CPlayerPed();
+	player->SetPosition(1000.0f, 1000.0f, 1000.0f);
+	CWorld::Players[0].m_pPed = player;
+	CDraw::SetFOV(120.0f);
+	CDraw::ms_fLODDistance = 500.0f;
+
+	int fd = CFileMgr::OpenFile("DATA\\SPECIAL.TXT", "r");
+	char animGroup[32], modelName[32];
+	if (fd) {
+		for (int lineId = 0; lineId < NUM_OF_SPECIAL_CHARS; lineId++) {
+			if (!CFileMgr::ReadLine(fd, gString, 255))
+				break;
+
+			sscanf(gString, "%s %s", modelName, animGroup);
+			int groupId;
+			for (groupId = 0; groupId < NUM_ANIM_ASSOC_GROUPS; groupId++) {
+				if (!strcmp(animGroup, CAnimManager::GetAnimGroupName((AssocGroupId)groupId)))
+					break;
+			}
+
+			if (groupId != NUM_ANIM_ASSOC_GROUPS)
+				((CPedModelInfo*)CModelInfo::GetModelInfo(MI_SPECIAL01 + lineId))->m_animGroup = groupId;
+
+			CStreaming::RequestSpecialChar(lineId, modelName, STREAMFLAGS_DONT_REMOVE);
+		}
+		CFileMgr::CloseFile(fd);
+	} else {
+		// TODO? maybe request some special models here so the thing doesn't crash
+	}
+
+	// From LCS. idk if needed
+	int vanBlock = CAnimManager::GetAnimationBlockIndex("van");
+	int bikesBlock = CAnimManager::GetAnimationBlockIndex("bikes");
+	int bikevBlock = CAnimManager::GetAnimationBlockIndex("bikev");
+	int bikehBlock = CAnimManager::GetAnimationBlockIndex("bikeh");
+	int bikedBlock = CAnimManager::GetAnimationBlockIndex("biked");
+	CStreaming::FlushRequestList();
+	CStreaming::RequestAnim(vanBlock, STREAMFLAGS_DEPENDENCY);
+	CStreaming::RequestAnim(bikesBlock, STREAMFLAGS_DEPENDENCY);
+	CStreaming::RequestAnim(bikevBlock, STREAMFLAGS_DEPENDENCY);
+	CStreaming::RequestAnim(bikehBlock, STREAMFLAGS_DEPENDENCY);
+	CStreaming::RequestAnim(bikedBlock, STREAMFLAGS_DEPENDENCY);
+	CStreaming::LoadAllRequestedModels(false);
+	CAnimManager::AddAnimBlockRef(vanBlock);
+	CAnimManager::AddAnimBlockRef(bikesBlock);
+	CAnimManager::AddAnimBlockRef(bikevBlock);
+	CAnimManager::AddAnimBlockRef(bikehBlock);
+	CAnimManager::AddAnimBlockRef(bikedBlock);
+}
+
+int
+LastPedModelId(int modelId)
+{
+	CBaseModelInfo *model;
+	for(;;){
+		assert(modelId < MODELINFOSIZE);
+		model = CModelInfo::GetModelInfo(modelId);
+		if (model && model->GetModelType() == MITYPE_PED)
+			break;
+		modelId--;
+	}
+	return modelId;
+}
+
+int
+FirstCarModelId(int modelId)
+{
+	CBaseModelInfo *model;
+	for(;;){
+		assert(modelId < MODELINFOSIZE);
+		model = CModelInfo::GetModelInfo(modelId);
+		if (model && model->GetModelType() == MITYPE_VEHICLE)
+			break;
+		modelId++;
+	}
+	return modelId;
+}
+
+
+int
+NextModelId(int modelId, int wantedChange)
+{
+	// Max. 2 trials wasn't here, it's me that added it.
+
+	int tryCount = 2;
+	int ogModelId = modelId;
+
+	while(tryCount != 0) {
+		modelId += wantedChange;
+		if (modelId < 0 || modelId >= MODELINFOSIZE) {
+			tryCount--;
+			wantedChange = -wantedChange;
+		} else if (modelId != 5 && modelId != 6 && modelId != 405) {
+			CBaseModelInfo *model = CModelInfo::GetModelInfo(modelId);
+			if (model)
+			{
+				//int type = model->m_type;
+				return modelId;
+			}
+		}
+	}
+	return ogModelId;
+}
+
+void
+PlayAnimation(RpClump *clump, AssocGroupId animGroup, AnimationId anim)
+{
+	CAnimBlendAssociation *currentAssoc = RpAnimBlendClumpGetAssociation(clump, anim);
+
+	if (currentAssoc && currentAssoc->IsPartial())
+		delete currentAssoc;
+
+	RpAnimBlendClumpSetBlendDeltas(clump, ASSOC_PARTIAL, -8.0f);
+
+	CAnimBlendAssociation *animAssoc = CAnimManager::BlendAnimation(clump, animGroup, anim, 8.0f);
+	animAssoc->flags |= ASSOC_DELETEFADEDOUT;
+	animAssoc->SetCurrentTime(0.0f);
+	animAssoc->SetRun();
+}
+
+void
+CAnimViewer::Update(void)
+{
+	static int modelId = 0;
+	static int animId = 0;
+	static bool reloadIFP = false;
+
+	AssocGroupId animGroup = ASSOCGRP_STD;
+	int nextModelId = modelId;
+	CBaseModelInfo *modelInfo = CModelInfo::GetModelInfo(modelId);
+
+	if (modelInfo->GetModelType() == MITYPE_PED) {
+		int animGroup = ((CPedModelInfo*)modelInfo)->m_animGroup;
+
+		if (animId > ANIM_STD_IDLE)
+			animGroup = ASSOCGRP_STD;
+
+		if (reloadIFP) {
+			if (pTarget) {
+				CWorld::Remove(pTarget);
+				if (pTarget)
+					delete pTarget;
+			}
+			pTarget = nil;
+			
+			// These calls were inside of LoadIFP function.
+			CAnimManager::Shutdown();
+			CAnimManager::Initialise();
+			CAnimManager::LoadAnimFiles();
+
+			reloadIFP = false;
+		}
+	} else {
+		animGroup = ASSOCGRP_STD;
+	}
+	CPad::UpdatePads();
+	CPad* pad = CPad::GetPad(0);
+#ifdef DEBUGMENU
+	DebugMenuProcess();
+#endif
+
+	CStreaming::UpdateForAnimViewer();
+	CStreaming::RequestModel(modelId, 0);
+	if (CStreaming::HasModelLoaded(modelId)) {
+
+		if (!pTarget) {
+
+			if (modelInfo->GetModelType() == MITYPE_VEHICLE) {
+
+				CVehicleModelInfo* veh = (CVehicleModelInfo*)modelInfo;
+				if (veh->m_vehicleType == VEHICLE_TYPE_CAR) {
+					pTarget = new CAutomobile(modelId, RANDOM_VEHICLE);
+				} else if (veh->m_vehicleType == VEHICLE_TYPE_BOAT) {
+					pTarget = new CBoat(modelId, RANDOM_VEHICLE);
+				} else if (veh->m_vehicleType == VEHICLE_TYPE_BIKE) {
+					pTarget = new CBike(modelId, RANDOM_VEHICLE);
+				} else {
+					pTarget = new CObject(modelId, true);
+					if (!modelInfo->GetColModel()) {
+						modelInfo->SetColModel(&CTempColModels::ms_colModelWheel1);
+					}
+				}
+				pTarget->SetStatus(STATUS_ABANDONED);
+			} else if (modelInfo->GetModelType() == MITYPE_PED) {
+				pTarget = new CPed(PEDTYPE_CIVMALE);
+				pTarget->SetModelIndex(modelId);
+			} else {
+				pTarget = new CObject(modelId, true);
+				if (!modelInfo->GetColModel())
+				{
+					modelInfo->SetColModel(&CTempColModels::ms_colModelWheel1);
+				}
+				pTarget->SetStatus(STATUS_ABANDONED);
+			}
+			pTarget->SetPosition(0.0f, 0.0f, 0.0f);
+			CWorld::Add(pTarget);
+			TheCamera.TakeControl(pTarget, CCam::MODE_MODELVIEW, JUMP_CUT, CAMCONTROL_SCRIPT);
+		}
+		if (pTarget->IsVehicle() || pTarget->IsPed() || pTarget->IsObject()) {
+			((CPhysical*)pTarget)->m_vecMoveSpeed = CVector(0.0f, 0.0f, 0.0f);
+		}
+#ifdef FIX_BUGS
+		// so we don't end up in the water
+		pTarget->GetMatrix().GetPosition().z = 10.0f;
+#else
+		pTarget->GetMatrix().GetPosition().z = 0.0f;
+#endif
+
+		if (modelInfo->GetModelType() == MITYPE_PED) {
+			((CPed*)pTarget)->bKindaStayInSamePlace = true;
+
+			// Triangle in mobile
+			if (pad->GetSquareJustDown()) {
+				reloadIFP = true;
+				AsciiToUnicode("IFP reloaded", gUString);
+				CMessages::AddMessage(gUString, 1000, 0);
+
+			} else if (pad->GetCrossJustDown()) {
+				PlayAnimation(pTarget->GetClump(), animGroup, (AnimationId)animId);
+				AsciiToUnicode("Animation restarted", gUString);
+				CMessages::AddMessage(gUString, 1000, 0);
+
+			} else if (pad->GetCircleJustDown()) {
+				PlayAnimation(pTarget->GetClump(), animGroup, ANIM_STD_IDLE);
+				AsciiToUnicode("Idle animation playing", gUString);
+				CMessages::AddMessage(gUString, 1000, 0);
+
+			} else if (pad->GetDPadUpJustDown()) {
+				animId--;
+				if (animId < 0) {
+					animId = ANIM_STD_NUM - 1;
+				}
+				PlayAnimation(pTarget->GetClump(), animGroup, (AnimationId)animId);
+
+				sprintf(gString, "Current anim: %d", animId);
+				AsciiToUnicode(gString, gUString);
+				CMessages::AddMessage(gUString, 1000, 0);
+
+			} else if (pad->GetDPadDownJustDown()) {
+				animId = (animId == (ANIM_STD_NUM - 1) ? 0 : animId + 1);
+				PlayAnimation(pTarget->GetClump(), animGroup, (AnimationId)animId);
+
+				sprintf(gString, "Current anim: %d", animId);
+				AsciiToUnicode(gString, gUString);
+				CMessages::AddMessage(gUString, 1000, 0);
+
+			} else if (pad->GetStartJustDown()) {
+
+			} else if (pad->GetLeftShoulder1JustDown()) {
+				nextModelId = FirstCarModelId(modelId);
+				AsciiToUnicode("Switched to vehicles", gUString);
+				CMessages::AddMessage(gUString, 1000, 0);
+				// Originally it was GetPad(1)->LeftShoulder2
+			} else if (pad->NewState.Triangle) {
+				((CPedModelInfo *)CModelInfo::GetModelInfo(pTarget->GetModelIndex()))->AnimatePedColModelSkinned(pTarget->GetClump());
+				AsciiToUnicode("Ped Col model will be animated as long as you hold the button", gUString);
+				CMessages::AddMessage(gUString, 100, 0);
+			}
+
+			// From LCS
+			if (CAnimManager::GetAnimAssocGroups()[animGroup].numAssociations <= animId)
+				animId = 0;
+
+		} else if (modelInfo->GetModelType() == MITYPE_VEHICLE) {
+
+			if (pad->GetLeftShoulder1JustDown()) {
+				nextModelId = LastPedModelId(modelId);
+				AsciiToUnicode("Switched to peds", gUString);
+				CMessages::AddMessage(gUString, 1000, 0);
+				// Start in mobile
+			} else if (pad->GetSquareJustDown()) {
+				CVehicleModelInfo::LoadVehicleColours();
+				AsciiToUnicode("Carcols.dat reloaded", gUString);
+				CMessages::AddMessage(gUString, 1000, 0);
+			}
+		}
+	}
+
+	if (pad->GetDPadLeftJustDown()) {
+		nextModelId = NextModelId(modelId, -1);
+
+		sprintf(gString, "Current model ID: %d", nextModelId);
+		AsciiToUnicode(gString, gUString);
+		CMessages::AddMessage(gUString, 1000, 0);
+
+	} else if (pad->GetDPadRightJustDown()) {
+		nextModelId = NextModelId(modelId, 1);
+
+		sprintf(gString, "Current model ID: %d", nextModelId);
+		AsciiToUnicode(gString, gUString);
+		CMessages::AddMessage(gUString, 1000, 0);
+	}
+	// There were extra codes here to let us change model id by 50, but xbox CPad struct is different, so I couldn't port.
+
+	if (nextModelId != modelId) {
+		modelId = nextModelId;
+		if (pTarget) {
+			CWorld::Remove(pTarget);
+			if (pTarget)
+				delete pTarget;
+		}
+		pTarget = nil;
+		return;
+	}
+
+	CTimeCycle::Update();
+	CWorld::Process();
+	if (pTarget)
+		TheCamera.Process();
+}
+
+void
+CAnimViewer::Shutdown(void)
+{
+	if (CWorld::Players[0].m_pPed)
+		delete CWorld::Players[0].m_pPed;
+
+	CWorld::ShutDown();
+	CModelInfo::ShutDown();
+	CAnimManager::Shutdown();
+	CTimer::Shutdown();
+	CStreaming::Shutdown();
+	CTxdStore::RemoveTxdSlot(animTxdSlot);
+}
diff --git a/src/core/AnimViewer.h b/src/core/AnimViewer.h
new file mode 100644
index 0000000..13dbb8f
--- /dev/null
+++ b/src/core/AnimViewer.h
@@ -0,0 +1,12 @@
+#pragma once
+
+class CAnimViewer {
+public:
+	static int animTxdSlot;
+	static CEntity *pTarget;
+	
+	static void Initialise();
+	static void Render();
+	static void Shutdown();
+	static void Update();
+};
\ No newline at end of file
diff --git a/src/core/Cam.cpp b/src/core/Cam.cpp
new file mode 100644
index 0000000..fdfe227
--- /dev/null
+++ b/src/core/Cam.cpp
@@ -0,0 +1,5422 @@
+#include "common.h"
+
+#include "main.h"
+#include "Draw.h"
+#include "World.h"
+#include "Vehicle.h"
+#include "Automobile.h"
+#include "Boat.h"
+#include "Bones.h"
+#include "Ped.h"
+#include "PlayerPed.h"
+#include "CopPed.h"
+#include "RpAnimBlend.h"
+#include "ControllerConfig.h"
+#include "Pad.h"
+#include "Frontend.h"
+#include "General.h"
+#include "Timecycle.h"
+#include "Renderer.h"
+#include "Shadows.h"
+#include "Hud.h"
+#include "ZoneCull.h"
+#include "SurfaceTable.h"
+#include "WaterLevel.h"
+#include "MBlur.h"
+#include "SceneEdit.h"
+#include "Debug.h"
+#include "Camera.h"
+#include "DMAudio.h"
+#include "Bike.h"
+#include "Pickups.h"
+
+bool PrintDebugCode = false;
+int16 DebugCamMode;
+
+extern float fRangePlayerRadius;
+extern float fCloseNearClipLimit;
+
+#ifdef FREE_CAM
+bool CCamera::bFreeCam = false;
+int nPreviousMode = -1;
+#endif
+
+void
+CCam::Init(void)
+{
+	Mode = MODE_FOLLOWPED;
+	Front = CVector(0.0f, 0.0f, -1.0f);
+	Up = CVector(0.0f, 0.0f, 1.0f);
+	Rotating = false;
+	m_iDoCollisionChecksOnFrameNum = 1;
+	m_iDoCollisionCheckEveryNumOfFrames = 9;
+	m_iFrameNumWereAt = 0;
+	m_bCollisionChecksOn = false;
+	m_fRealGroundDist = 0.0f;
+	BetaSpeed = 0.0f;
+	AlphaSpeed = 0.0f;
+	DistanceSpeed = 0.0f;
+	f_max_role_angle = DEGTORAD(5.0f);
+	Distance = 30.0f;
+	DistanceSpeed = 0.0f;
+	m_pLastCarEntered = nil;
+	m_pLastPedLookedAt = nil;
+	ResetStatics = true;
+	Beta = 0.0f;
+	m_fTilt = 0.0f;
+	m_fTiltSpeed = 0.0f;
+	m_bFixingBeta = false;
+	CA_MIN_DISTANCE = 0.0f;
+	CA_MAX_DISTANCE = 0.0f;
+	LookingBehind = false;
+	LookingLeft = false;
+	LookingRight = false;
+	m_fPlayerInFrontSyphonAngleOffSet = DEGTORAD(20.0f);
+	m_fSyphonModeTargetZOffSet = 0.5f;
+	m_fRadiusForDead = 1.5f;
+	DirectionWasLooking = LOOKING_FORWARD;
+	LookBehindCamWasInFront = false;
+	f_Roll = 0.0f;
+	f_rollSpeed = 0.0f;
+	m_fCloseInPedHeightOffset = 0.0f;
+	m_fCloseInPedHeightOffsetSpeed = 0.0f;
+	m_fCloseInCarHeightOffset = 0.0f;
+	m_fCloseInCarHeightOffsetSpeed = 0.0f;
+	m_fPedBetweenCameraHeightOffset = 0.0f;
+	m_fTargetBeta = 0.0f;
+	m_fBufferedTargetBeta = 0.0f;
+	m_fBufferedTargetOrientation = 0.0f;
+	m_fBufferedTargetOrientationSpeed = 0.0f;
+	m_fDimensionOfHighestNearCar = 0.0f;
+}
+
+float PLAYERPED_LEVEL_SMOOTHING_CONST_INV = 0.6f;
+float PLAYERPED_TREND_SMOOTHING_CONST_INV = 0.8f;
+
+void
+CCam::Process(void)
+{
+	CVector CameraTarget;
+	float TargetSpeedVar = 0.0f;
+	float TargetOrientation = 0.0f;
+
+	static CVector SmoothedPos(0.0f, 0.0f, 10000.0f);
+	static CVector SmoothedSpeed(0.0f, 0.0f, 0.0f);
+
+	if(CamTargetEntity == nil)
+		CamTargetEntity = TheCamera.pTargetEntity;
+
+	m_iFrameNumWereAt++;
+	if(m_iFrameNumWereAt > m_iDoCollisionCheckEveryNumOfFrames)
+		m_iFrameNumWereAt = 1;
+	m_bCollisionChecksOn = m_iFrameNumWereAt == m_iDoCollisionChecksOnFrameNum;
+
+	if(m_bCamLookingAtVector){
+		CameraTarget = m_cvecCamFixedModeVector;
+	}else if(CamTargetEntity->IsVehicle()){
+		CameraTarget = CamTargetEntity->GetPosition();
+
+		if(CamTargetEntity->GetForward().x == 0.0f && CamTargetEntity->GetForward().y == 0.0f)
+			TargetOrientation = 0.0f;
+		else
+			TargetOrientation = CGeneral::GetATanOfXY(CamTargetEntity->GetForward().x, CamTargetEntity->GetForward().y);
+
+		CVector Fwd(0.0f, 0.0f, 0.0f);
+		Fwd.x = CamTargetEntity->GetForward().x;
+		Fwd.y = CamTargetEntity->GetForward().y;
+		Fwd.Normalise();
+		float FwdLength = Fwd.Magnitude2D();
+		if(FwdLength != 0.0f){
+			Fwd.x /= FwdLength;
+			Fwd.y /= FwdLength;
+		}
+
+		float FwdSpeedX = ((CVehicle*)CamTargetEntity)->GetMoveSpeed().x * Fwd.x;
+		float FwdSpeedY = ((CVehicle*)CamTargetEntity)->GetMoveSpeed().y * Fwd.y;
+		if(FwdSpeedX + FwdSpeedY > 0.0f)
+			TargetSpeedVar = Min(Sqrt(SQR(FwdSpeedX) + SQR(FwdSpeedY))/0.9f, 1.0f);
+		else
+			TargetSpeedVar = -Min(Sqrt(SQR(FwdSpeedX) + SQR(FwdSpeedY))/1.8f, 0.5f);
+		SpeedVar = 0.895f*SpeedVar + 0.105*TargetSpeedVar;
+	}else{
+		if(CamTargetEntity == FindPlayerPed()){
+			// Some fancy smoothing of player position and speed
+			float LevelSmoothing = 1.0f - Pow(PLAYERPED_LEVEL_SMOOTHING_CONST_INV, CTimer::GetTimeStep());
+			float TrendSmoothing = 1.0f - Pow(PLAYERPED_TREND_SMOOTHING_CONST_INV, CTimer::GetTimeStep());
+
+			CVector NewSmoothedPos, NewSmoothedSpeed;
+			if((SmoothedPos - CamTargetEntity->GetPosition()).MagnitudeSqr() > SQR(3.0f) ||
+			   CTimer::GetTimeStep() < 0.2f || Using3rdPersonMouseCam()){
+				// Reset values
+				NewSmoothedPos = CamTargetEntity->GetPosition();
+				NewSmoothedSpeed = CVector(0.0f, 0.0f, 0.0f);
+			}else{
+				NewSmoothedPos = LevelSmoothing*CamTargetEntity->GetPosition() + (1.0f-LevelSmoothing)*(SmoothedPos + SmoothedSpeed*CTimer::GetTimeStep());
+				NewSmoothedSpeed = TrendSmoothing*(NewSmoothedPos-SmoothedPos)/CTimer::GetTimeStep() + (1.0f-TrendSmoothing)*SmoothedSpeed;
+			}
+			   
+			CameraTarget = NewSmoothedPos;
+			SmoothedPos = NewSmoothedPos;
+			SmoothedSpeed = NewSmoothedSpeed;
+		}else
+			CameraTarget = CamTargetEntity->GetPosition();
+
+		if(CamTargetEntity->GetForward().x == 0.0f && CamTargetEntity->GetForward().y == 0.0f)
+			TargetOrientation = 0.0f;
+		else
+			TargetOrientation = CGeneral::GetATanOfXY(CamTargetEntity->GetForward().x, CamTargetEntity->GetForward().y);
+		TargetSpeedVar = 0.0f;
+		SpeedVar = 0.0f;
+	}
+
+	switch(Mode){
+	case MODE_TOPDOWN:
+	case MODE_GTACLASSIC:
+	//	Process_TopDown(CameraTarget, TargetOrientation, SpeedVar, TargetSpeedVar);
+		break;
+	case MODE_BEHINDCAR:
+		Process_BehindCar(CameraTarget, TargetOrientation, SpeedVar, TargetSpeedVar);
+		break;
+	case MODE_FOLLOWPED:
+#ifdef PC_PLAYER_CONTROLS
+		if(CCamera::m_bUseMouse3rdPerson)
+			Process_FollowPedWithMouse(CameraTarget, TargetOrientation, SpeedVar, TargetSpeedVar);
+		else
+#endif
+#ifdef FREE_CAM
+			if(CCamera::bFreeCam)
+				Process_FollowPed_Rotation(CameraTarget, TargetOrientation, SpeedVar, TargetSpeedVar);
+			else
+#endif
+			Process_FollowPed(CameraTarget, TargetOrientation, SpeedVar, TargetSpeedVar);
+		break;
+//	case MODE_AIMING:
+	case MODE_DEBUG:
+		Process_Debug(CameraTarget, TargetOrientation, SpeedVar, TargetSpeedVar);
+		break;
+	case MODE_SNIPER:
+	case MODE_CAMERA:
+		Process_Sniper(CameraTarget, TargetOrientation, SpeedVar, TargetSpeedVar);
+		break;
+	case MODE_ROCKETLAUNCHER:
+		Process_Rocket(CameraTarget, TargetOrientation, SpeedVar, TargetSpeedVar);
+		break;
+	case MODE_MODELVIEW:
+		Process_ModelView(CameraTarget, TargetOrientation, SpeedVar, TargetSpeedVar);
+		break;
+//	case MODE_BILL:
+	case MODE_SYPHON:
+		Process_Syphon(CameraTarget, TargetOrientation, SpeedVar, TargetSpeedVar);
+		break;
+	case MODE_CIRCLE:
+//		Process_Circle(CameraTarget, TargetOrientation, SpeedVar, TargetSpeedVar);
+		break;
+//	case MODE_CHEESYZOOM:
+	case MODE_WHEELCAM:
+		Process_WheelCam(CameraTarget, TargetOrientation, SpeedVar, TargetSpeedVar);
+		break;
+	case MODE_FIXED:
+		Process_Fixed(CameraTarget, TargetOrientation, SpeedVar, TargetSpeedVar);
+		break;
+	case MODE_1STPERSON:
+		Process_1stPerson(CameraTarget, TargetOrientation, SpeedVar, TargetSpeedVar);
+		break;
+	case MODE_FLYBY:
+		Process_FlyBy(CameraTarget, TargetOrientation, SpeedVar, TargetSpeedVar);
+		break;
+	case MODE_CAM_ON_A_STRING:
+#ifdef FREE_CAM
+		if(CCamera::bFreeCam)
+			Process_FollowCar_SA(CameraTarget, TargetOrientation, SpeedVar, TargetSpeedVar);
+		else
+#endif
+			Process_Cam_On_A_String(CameraTarget, TargetOrientation, SpeedVar, TargetSpeedVar);
+		break;
+//	case MODE_REACTION:
+//	case MODE_FOLLOW_PED_WITH_BIND:
+//	case MODE_CHRIS:
+	case MODE_BEHINDBOAT:
+#ifdef FREE_CAM
+		if (CCamera::bFreeCam)
+			Process_FollowCar_SA(CameraTarget, TargetOrientation, SpeedVar, TargetSpeedVar);
+		else
+#endif
+			Process_BehindBoat(CameraTarget, TargetOrientation, SpeedVar, TargetSpeedVar);
+		break;
+	case MODE_PLAYER_FALLEN_WATER:
+		Process_Player_Fallen_Water(CameraTarget, TargetOrientation, SpeedVar, TargetSpeedVar);
+		break;
+//	case MODE_CAM_ON_TRAIN_ROOF:
+//	case MODE_CAM_RUNNING_SIDE_TRAIN:
+//	case MODE_BLOOD_ON_THE_TRACKS:
+//	case MODE_IM_THE_PASSENGER_WOOWOO:
+	case MODE_SYPHON_CRIM_IN_FRONT:
+		Process_Syphon_Crim_In_Front(CameraTarget, TargetOrientation, SpeedVar, TargetSpeedVar);
+		break;
+	case MODE_PED_DEAD_BABY:
+		ProcessPedsDeadBaby();
+		break;
+//	case MODE_PILLOWS_PAPS:
+//	case MODE_LOOK_AT_CARS:
+	case MODE_ARRESTCAM_ONE:
+		ProcessArrestCamOne();
+		break;
+	case MODE_ARRESTCAM_TWO:
+		ProcessArrestCamTwo();
+		break;
+	case MODE_M16_1STPERSON:
+	case MODE_HELICANNON_1STPERSON:
+		Process_M16_1stPerson(CameraTarget, TargetOrientation, SpeedVar, TargetSpeedVar);
+		break;
+	case MODE_SPECIAL_FIXED_FOR_SYPHON:
+		Process_SpecialFixedForSyphon(CameraTarget, TargetOrientation, SpeedVar, TargetSpeedVar);
+		break;
+	case MODE_FIGHT_CAM:
+		Process_Fight_Cam(CameraTarget, TargetOrientation, SpeedVar, TargetSpeedVar);
+		break;
+	case MODE_LIGHTHOUSE:
+		Process_LightHouse(CameraTarget, TargetOrientation, SpeedVar, TargetSpeedVar);
+		break;
+	case MODE_TOP_DOWN_PED:
+	//	Process_TopDownPed(CameraTarget, TargetOrientation, SpeedVar, TargetSpeedVar);
+		break;
+	case MODE_SNIPER_RUNABOUT:
+	case MODE_ROCKETLAUNCHER_RUNABOUT:
+	case MODE_1STPERSON_RUNABOUT:
+	case MODE_M16_1STPERSON_RUNABOUT:
+	case MODE_FIGHT_CAM_RUNABOUT:
+		Process_1rstPersonPedOnPC(CameraTarget, TargetOrientation, SpeedVar, TargetSpeedVar);
+		break;
+#ifdef GTA_SCENE_EDIT
+	case MODE_EDITOR:
+		Process_Editor(CameraTarget, TargetOrientation, SpeedVar, TargetSpeedVar);
+		break;
+#endif
+	default:
+		Source = CVector(0.0f, 0.0f, 0.0f);
+		Front = CVector(0.0f, 1.0f, 0.0f);
+		Up = CVector(0.0f, 0.0f, 1.0f);
+	}
+
+#ifdef FREE_CAM
+	nPreviousMode = Mode;
+#endif
+	CVector TargetToCam = Source - m_cvecTargetCoorsForFudgeInter;
+	float DistOnGround = TargetToCam.Magnitude2D();
+	m_fTrueBeta = CGeneral::GetATanOfXY(TargetToCam.x, TargetToCam.y);
+	m_fTrueAlpha = CGeneral::GetATanOfXY(DistOnGround, TargetToCam.z);
+	if(TheCamera.m_uiTransitionState == 0)
+		KeepTrackOfTheSpeed(Source, m_cvecTargetCoorsForFudgeInter, Up, m_fTrueAlpha, m_fTrueBeta, FOV);
+
+	// Look Behind, Left, Right
+	LookingBehind = false;
+	LookingLeft = false;
+	LookingRight = false;
+	SourceBeforeLookBehind = Source;
+	if(&TheCamera.Cams[TheCamera.ActiveCam] == this){
+		if((Mode == MODE_CAM_ON_A_STRING || Mode == MODE_1STPERSON || Mode == MODE_BEHINDBOAT || Mode == MODE_BEHINDCAR) &&
+		   CamTargetEntity->IsVehicle()){
+			bool bDisableLR = CamTargetEntity &&
+				(((CVehicle*)CamTargetEntity)->GetVehicleAppearance() == VEHICLE_APPEARANCE_HELI || CamTargetEntity->GetModelIndex() == MI_RCBARON);
+			if(CPad::GetPad(0)->GetLookBehindForCar()){
+				LookBehind();
+				if(DirectionWasLooking != LOOKING_BEHIND)
+					TheCamera.m_bJust_Switched = true;
+				DirectionWasLooking = LOOKING_BEHIND;
+			}else if(bDisableLR){
+				if(DirectionWasLooking != LOOKING_FORWARD)
+					TheCamera.m_bJust_Switched = true;
+				DirectionWasLooking = LOOKING_FORWARD;
+			}else if(CPad::GetPad(0)->GetLookLeft()){
+				LookLeft();
+				if(DirectionWasLooking != LOOKING_LEFT)
+					TheCamera.m_bJust_Switched = true;
+				DirectionWasLooking = LOOKING_LEFT;
+			}else if(CPad::GetPad(0)->GetLookRight()){
+				LookRight();
+				if(DirectionWasLooking != LOOKING_RIGHT)
+					TheCamera.m_bJust_Switched = true;
+				DirectionWasLooking = LOOKING_RIGHT;
+			}else{
+				if(DirectionWasLooking != LOOKING_FORWARD)
+					TheCamera.m_bJust_Switched = true;
+				DirectionWasLooking = LOOKING_FORWARD;
+			}
+		}
+		if(Mode == MODE_FOLLOWPED && CamTargetEntity->IsPed()){
+			if(CPad::GetPad(0)->GetLookBehindForPed()){
+				LookBehind();
+				if(DirectionWasLooking != LOOKING_BEHIND)
+					TheCamera.m_bJust_Switched = true;
+				DirectionWasLooking = LOOKING_BEHIND;
+			}else
+				DirectionWasLooking = LOOKING_FORWARD;
+		}
+	}
+
+	if(Mode == MODE_SNIPER || Mode == MODE_ROCKETLAUNCHER || Mode == MODE_M16_1STPERSON ||
+	   Mode == MODE_1STPERSON || Mode == MODE_HELICANNON_1STPERSON || Mode == MODE_CAMERA || GetWeaponFirstPersonOn())
+		ClipIfPedInFrontOfPlayer();
+}
+
+// MaxSpeed is a limit of how fast the value is allowed to change. 1.0 = to Target in up to 1ms
+// Acceleration is how fast the speed will change to MaxSpeed. 1.0 = to MaxSpeed in 1ms
+void
+WellBufferMe(float Target, float *CurrentValue, float *CurrentSpeed, float MaxSpeed, float Acceleration, bool IsAngle)
+{
+	float Delta = Target - *CurrentValue;
+
+	if(IsAngle){
+		while(Delta >= PI) Delta -= 2*PI;
+		while(Delta < -PI) Delta += 2*PI;
+	}
+
+	float TargetSpeed = Delta * MaxSpeed;
+	// Add or subtract absolute depending on sign, genius!
+//	if(TargetSpeed - *CurrentSpeed > 0.0f)
+//		*CurrentSpeed += Acceleration * Abs(TargetSpeed - *CurrentSpeed) * CTimer::GetTimeStep();
+//	else
+//		*CurrentSpeed -= Acceleration * Abs(TargetSpeed - *CurrentSpeed) * CTimer::GetTimeStep();
+	// this is simpler:
+	*CurrentSpeed += Acceleration * (TargetSpeed - *CurrentSpeed) * CTimer::GetTimeStep();
+
+	// Clamp speed if we overshot
+	if(TargetSpeed < 0.0f && *CurrentSpeed < TargetSpeed)
+		*CurrentSpeed = TargetSpeed;
+	else if(TargetSpeed > 0.0f && *CurrentSpeed > TargetSpeed)
+		*CurrentSpeed = TargetSpeed;
+
+	*CurrentValue += *CurrentSpeed * Min(10.0f, CTimer::GetTimeStep());
+}
+
+void
+MakeAngleLessThan180(float &Angle)
+{
+	while(Angle >= PI) Angle -= 2*PI;
+	while(Angle < -PI) Angle += 2*PI;
+}
+
+void
+CCam::ProcessSpecialHeightRoutines(void)
+{
+	int i;
+	bool StandingOnBoat = false;
+	static bool PreviouslyFailedRoadHeightCheck = false;
+	CVector CamToTarget, CamToPed;
+	float DistOnGround, BetaAngle;
+	CPed *Player;
+	float PedZDist;
+	CColPoint colPoint;
+
+	CamToTarget = TheCamera.pTargetEntity->GetPosition() - TheCamera.GetGameCamPosition();
+	DistOnGround = CamToTarget.Magnitude2D();
+	BetaAngle = CGeneral::GetATanOfXY(CamToTarget.x, CamToTarget.y);
+	m_bTheHeightFixerVehicleIsATrain = false;
+	// CGeneral::GetATanOfXY(TheCamera.GetForward().x, TheCamera.GetForward().y);
+	Player = CWorld::Players[CWorld::PlayerInFocus].m_pPed;
+
+	if(DistOnGround > 10.0f)
+		DistOnGround = 10.0f;
+
+	if(CamTargetEntity && CamTargetEntity->IsPed()){
+		if(FindPlayerPed()->m_pCurSurface && FindPlayerPed()->m_pCurSurface->IsVehicle() &&
+		   ((CVehicle*)FindPlayerPed()->m_pCurSurface)->IsBoat())
+			StandingOnBoat = true;
+
+		float FoundPedZ = -100.0f;
+
+		// Move up the camera if there is a ped close to it
+		if(Mode == MODE_FOLLOWPED || Mode == MODE_FIGHT_CAM || Mode == MODE_PILLOWS_PAPS){
+			// Find highest ped close to camera
+			for(i = 0; i < Player->m_numNearPeds; i++){
+				CPed *nearPed = Player->m_nearPeds[i];
+				if(nearPed && nearPed->GetPedState() != PED_DEAD){
+					CamToPed = nearPed->GetPosition() - TheCamera.GetGameCamPosition();
+					if(Abs(CamToPed.z) < 1.0f){
+						float DistSq = CamToPed.MagnitudeSqr();
+						if(DistSq < SQR(2.1f)){
+							if(nearPed->GetPosition().z > FoundPedZ)
+								FoundPedZ = nearPed->GetPosition().z;
+						}else{
+							float Dist = Sqrt(DistSq);
+							CamToPed /= Dist;
+							// strange calculation
+							CVector PlayerCamSpeed = DotProduct(Front, Player->m_vecMoveSpeed)*Front;
+							float SpeedDiff = DotProduct(PlayerCamSpeed - nearPed->m_vecMoveSpeed, CamToPed);
+							if(SpeedDiff > 0.01f &&
+							   (m_fPedBetweenCameraHeightOffset > 0.0f && (Dist-2.1f)/SpeedDiff < 75.0f ||
+							    m_fPedBetweenCameraHeightOffset <= 0.0f && (Dist-2.1f)/SpeedDiff < 75.0f * 0.1f))
+								if(nearPed->GetPosition().z > FoundPedZ)
+									FoundPedZ = nearPed->GetPosition().z;
+						}
+					}
+				}
+			}
+
+			if(FoundPedZ > -99.0f){
+				float Offset = 0.0f;
+				PedZDist = 0.0f;
+				if(FoundPedZ > Player->GetPosition().z)
+					PedZDist = FoundPedZ - Player->GetPosition().z;
+
+				if(Mode == MODE_FOLLOWPED){
+					if(TheCamera.PedZoomIndicator == CAM_ZOOM_1 &&
+					   ((CPed*)CamTargetEntity)->GetPedState() != PED_ENTER_CAR &&
+					   ((CPed*)CamTargetEntity)->GetPedState() != PED_CARJACK)
+						Offset = 0.45f + PedZDist;
+					// BUG: overrides this ^ case
+					if(TheCamera.PedZoomIndicator == CAM_ZOOM_2 || TheCamera.PedZoomIndicator == CAM_ZOOM_1)
+						Offset = 0.35f + PedZDist;
+					if(TheCamera.PedZoomIndicator == CAM_ZOOM_3)
+						Offset = 0.25f + PedZDist;
+					m_fPedBetweenCameraHeightOffset = Offset + 1.3f;
+				}else if(Mode == MODE_FIGHT_CAM)
+					m_fPedBetweenCameraHeightOffset = PedZDist + 1.3f + 0.5f;
+				else if(Mode == MODE_PILLOWS_PAPS)
+					m_fPedBetweenCameraHeightOffset = PedZDist + 1.3f + 0.45f;
+			}else{
+				m_fPedBetweenCameraHeightOffset = 0.0f;
+			}
+		}
+
+
+		// Move camera up for vehicles in the way
+		if(m_bCollisionChecksOn && (Mode == MODE_FOLLOWPED || Mode == MODE_FIGHT_CAM)){
+			bool FoundCar = false;
+			CEntity *vehicle = nil;
+			float TestDist = DistOnGround + 1.25f;
+			float HighestCar = 0.0f;
+			if(m_fDimensionOfHighestNearCar > 0.0f)
+				TestDist += 0.3f;
+			CVector TestBase = CamTargetEntity->GetPosition();
+			CVector TestPoint;
+			TestBase.z -= 0.15f;
+
+			TestPoint = TestBase - TestDist * CVector(Cos(BetaAngle), Sin(BetaAngle), 0.0f);
+			if(CWorld::ProcessLineOfSight(CamTargetEntity->GetPosition(), TestPoint, colPoint, vehicle, false, true, false, false, false, false) &&
+			   vehicle->IsVehicle()){
+				float height = vehicle->GetColModel()->boundingBox.GetSize().z;
+				FoundCar = true;
+				HighestCar = height;
+				if(((CVehicle*)vehicle)->IsTrain())
+					m_bTheHeightFixerVehicleIsATrain = true;
+			}
+
+			TestPoint = TestBase - TestDist * CVector(Cos(BetaAngle+DEGTORAD(28.0f)), Sin(BetaAngle+DEGTORAD(28.0f)), 0.0f);
+			if(CWorld::ProcessLineOfSight(CamTargetEntity->GetPosition(), TestPoint, colPoint, vehicle, false, true, false, false, false, false) &&
+			   vehicle->IsVehicle()){
+				float height = vehicle->GetColModel()->boundingBox.GetSize().z;
+				if(FoundCar){
+					HighestCar = Max(HighestCar, height);
+				}else{
+					FoundCar = true;
+					HighestCar = height;
+				}
+				if(((CVehicle*)vehicle)->IsTrain())
+					m_bTheHeightFixerVehicleIsATrain = true;
+			}
+
+			TestPoint = TestBase - TestDist * CVector(Cos(BetaAngle-DEGTORAD(28.0f)), Sin(BetaAngle-DEGTORAD(28.0f)), 0.0f);
+			if(CWorld::ProcessLineOfSight(CamTargetEntity->GetPosition(), TestPoint, colPoint, vehicle, false, true, false, false, false, false) &&
+			   vehicle->IsVehicle()){
+				float height = vehicle->GetColModel()->boundingBox.GetSize().z;
+				if(FoundCar){
+					HighestCar = Max(HighestCar, height);
+				}else{
+					FoundCar = true;
+					HighestCar = height;
+				}
+				if(((CVehicle*)vehicle)->IsTrain())
+					m_bTheHeightFixerVehicleIsATrain = true;
+			}
+
+			if(FoundCar){
+				m_fDimensionOfHighestNearCar = HighestCar + 0.1f;
+				if(Mode == MODE_FIGHT_CAM)
+					m_fDimensionOfHighestNearCar += 0.75f;
+			}else
+				m_fDimensionOfHighestNearCar = 0.0f;
+		}
+	}
+
+	if(StandingOnBoat){
+		m_fDimensionOfHighestNearCar = 1.0f;
+		m_fPedBetweenCameraHeightOffset = 0.0f;
+	}
+}
+
+void
+CCam::GetVectorsReadyForRW(void)
+{
+	CVector right;
+	Up = CVector(0.0f, 0.0f, 1.0f);
+	Front.Normalise();
+	if(Front.x == 0.0f && Front.y == 0.0f){
+		Front.x = 0.0001f;
+		Front.y = 0.0001f;
+	}
+	right = CrossProduct(Front, Up);
+	right.Normalise();
+	Up = CrossProduct(right, Front);
+}
+
+bool
+CCam::GetBoatLook_L_R_HeightOffset(float &Offset)
+{
+	if(CamTargetEntity == nil)
+		return false;
+	CVehicleModelInfo *mi = (CVehicleModelInfo*)CModelInfo::GetModelInfo(CamTargetEntity->GetModelIndex());
+	tBoatHandlingData *handling = mod_HandlingManager.GetBoatPointer(mi->m_handlingId);
+	if(handling){
+		Offset = handling->fLook_L_R_BehindCamHeight;
+		return true;
+	}
+	return false;	// can't happen, we always get a boat pointer back
+}
+
+void
+CCam::LookBehind(void)
+{
+	float Dist, DeltaBeta, TargetOrientation, Angle;
+	CVector TargetCoors, TargetFwd, TestCoors;
+
+	TargetCoors = CamTargetEntity->GetPosition();
+	Front = CamTargetEntity->GetPosition() - Source;
+
+	if((Mode == MODE_CAM_ON_A_STRING || Mode == MODE_BEHINDBOAT || Mode == MODE_BEHINDCAR) && CamTargetEntity->IsVehicle()){
+		LookingBehind = true;
+		Dist = Mode == MODE_CAM_ON_A_STRING ? CA_MAX_DISTANCE : 15.5f;
+		TargetFwd = CamTargetEntity->GetForward();
+		TargetFwd.Normalise();
+		TargetOrientation = CGeneral::GetATanOfXY(TargetFwd.x, TargetFwd.y);
+		DeltaBeta = TargetOrientation - Beta;
+		while(DeltaBeta >= PI) DeltaBeta -= 2*PI;
+		while(DeltaBeta < -PI) DeltaBeta += 2*PI;
+		if(DirectionWasLooking != LOOKING_BEHIND)
+			LookBehindCamWasInFront = DeltaBeta <= -HALFPI || DeltaBeta >= HALFPI;
+		if(LookBehindCamWasInFront)
+			TargetOrientation += PI;
+		Source.x = Dist*Cos(TargetOrientation) + TargetCoors.x;
+		Source.y = Dist*Sin(TargetOrientation) + TargetCoors.y;
+		CVector OrigSource = Source;
+		TheCamera.AvoidTheGeometry(OrigSource, TargetCoors, Source, FOV);
+		Front = CamTargetEntity->GetPosition() - Source;
+		GetVectorsReadyForRW();
+	}
+	if(Mode == MODE_1STPERSON && CamTargetEntity->IsVehicle()){
+		LookingBehind = true;
+		RwCameraSetNearClipPlane(Scene.camera, 0.25f);
+		Front = CamTargetEntity->GetForward();
+		Front.Normalise();
+		if(((CVehicle*)CamTargetEntity)->IsBoat())
+			Source.z -= 0.5f;
+		if(((CVehicle*)CamTargetEntity)->GetVehicleAppearance() == VEHICLE_APPEARANCE_BIKE){
+			float FrontDist = 1.1f;
+			if(((CVehicle*)CamTargetEntity)->pDriver){
+				CVector ExtraFwd(0.0f, 0.0f, 0.0f);
+				((CVehicle*)CamTargetEntity)->pDriver->m_pedIK.GetComponentPosition(ExtraFwd, PED_HEAD);
+				ExtraFwd += ((CVehicle*)CamTargetEntity)->m_vecMoveSpeed*CTimer::GetTimeStep() - CamTargetEntity->GetPosition();
+				FrontDist += 0.2f + Max(DotProduct(ExtraFwd, CamTargetEntity->GetForward()), 0.0f);
+			}
+			Source += FrontDist*Front;
+			Front = -Front;
+		}else if(((CVehicle*)CamTargetEntity)->GetVehicleAppearance() == VEHICLE_APPEARANCE_HELI){
+			Front = -1.0f*CamTargetEntity->GetUp();
+			Up = CamTargetEntity->GetForward();
+			Source += 0.25f*Front;
+		}else{
+			Source += 0.25f*Front;
+			Front = -Front;
+		}
+	}
+	if(CamTargetEntity->IsPed()){
+		Angle = CGeneral::GetATanOfXY(Source.x - TargetCoors.x, Source.y - TargetCoors.y) + PI;
+		Source.x = 4.5f*Cos(Angle) + TargetCoors.x;
+		Source.y = 4.5f*Sin(Angle) + TargetCoors.y;
+		Source.z = 1.15f + TargetCoors.z;
+		CVector OrigSource = Source;
+		TheCamera.AvoidTheGeometry(OrigSource, TargetCoors, Source, FOV);
+		Front = TargetCoors - Source;
+		GetVectorsReadyForRW();
+	}
+}
+
+float BOAT_1STPERSON_L_OFFSETX = 0.7f;
+float BOAT_1STPERSON_R_OFFSETX = 0.3f;
+float BOAT_1STPERSON_LR_OFFSETZ = 0.2f;
+
+void
+CCam::LookLeft(void)
+{
+	float Dist, TargetOrientation;
+	CVector TargetCoors, TargetFwd;
+
+	if((Mode == MODE_CAM_ON_A_STRING || Mode == MODE_BEHINDBOAT || Mode == MODE_BEHINDCAR) && CamTargetEntity->IsVehicle()){
+		LookingLeft = true;
+		TargetCoors = CamTargetEntity->GetPosition();
+		Front = CamTargetEntity->GetPosition() - Source;
+		if(Mode == MODE_CAM_ON_A_STRING)
+			Dist = CA_MAX_DISTANCE;
+		else if(Mode == MODE_BEHINDBOAT){
+			Dist = 9.0f;
+			float Offset = 0.0f;
+			if(GetBoatLook_L_R_HeightOffset(Offset) && !CCullZones::Cam1stPersonForPlayer())
+				Source.z = TargetCoors.z + Offset;
+		}else
+			Dist = 9.0f;
+		TargetFwd = CamTargetEntity->GetForward();
+		TargetFwd.Normalise();
+		TargetOrientation = CGeneral::GetATanOfXY(TargetFwd.x, TargetFwd.y);
+		Source.x = Dist*Cos(TargetOrientation - HALFPI) + TargetCoors.x;
+		Source.y = Dist*Sin(TargetOrientation - HALFPI) + TargetCoors.y;
+
+		CColModel *colModel = CamTargetEntity->GetColModel();
+		CVector OrigSource = Source;
+		TheCamera.AvoidTheGeometry(OrigSource, TargetCoors, Source, FOV);
+
+		CVector TopRight = CamTargetEntity->GetPosition() +
+			CamTargetEntity->GetRight()*colModel->boundingBox.max.x +
+			CamTargetEntity->GetUp()*colModel->boundingBox.max.z;
+		float Height = Min(Max(m_cvecTargetCoorsForFudgeInter.z, TopRight.z)+0.1f, OrigSource.z);
+		Source.z = Max(Height, Source.z);
+
+		Front = CamTargetEntity->GetPosition() - Source;
+		Front.z += 1.1f;
+		if(Mode == MODE_BEHINDBOAT)
+			Front.z += 1.2f;
+		GetVectorsReadyForRW();
+	}
+	if(Mode == MODE_1STPERSON && CamTargetEntity->IsVehicle()){
+		LookingLeft = true;
+		RwCameraSetNearClipPlane(Scene.camera, 0.25f);
+		if(((CVehicle*)CamTargetEntity)->IsBoat()){
+			if(((CVehicle*)CamTargetEntity)->pDriver){
+				CVector neck(0.0f, 0.0f, 0.0f);
+				CPed *driver = ((CVehicle*)CamTargetEntity)->pDriver;
+				driver->SetPedPositionInCar();
+				driver->GetMatrix().UpdateRW();
+				driver->UpdateRwFrame();
+				driver->UpdateRpHAnim();
+				driver->m_pedIK.GetComponentPosition(neck, PED_NECK);
+				Source = neck +
+					BOAT_1STPERSON_L_OFFSETX*CamTargetEntity->GetRight() +
+					BOAT_1STPERSON_LR_OFFSETZ*CamTargetEntity->GetUp();
+			}else
+				Source.z -= 0.5f;
+		}
+
+		Up = CamTargetEntity->GetUp();
+		Up.Normalise();
+		Front = CamTargetEntity->GetForward();
+		Front.Normalise();
+		Front = -CrossProduct(Front, Up);
+		Front.Normalise();
+		if(((CVehicle*)CamTargetEntity)->GetVehicleAppearance() == VEHICLE_APPEARANCE_BIKE)
+			Source -= 1.45f*Front;
+	}
+}
+
+void
+CCam::LookRight(void)
+{
+	float Dist, TargetOrientation;
+	CVector TargetCoors, TargetFwd;
+	CColPoint colPoint;
+
+	if((Mode == MODE_CAM_ON_A_STRING || Mode == MODE_BEHINDBOAT) && CamTargetEntity->IsVehicle()){
+		LookingRight = true;
+		TargetCoors = CamTargetEntity->GetPosition();
+		Front = CamTargetEntity->GetPosition() - Source;
+		if(Mode == MODE_CAM_ON_A_STRING)
+			Dist = CA_MAX_DISTANCE;
+		else if(Mode == MODE_BEHINDBOAT){
+			Dist = 9.0f;
+			float Offset = 0.0f;
+			if(GetBoatLook_L_R_HeightOffset(Offset) && !CCullZones::Cam1stPersonForPlayer())
+				Source.z = TargetCoors.z + Offset;
+		}else
+			Dist = 9.0f;
+		TargetFwd = CamTargetEntity->GetForward();
+		TargetFwd.Normalise();
+		TargetOrientation = CGeneral::GetATanOfXY(TargetFwd.x, TargetFwd.y);
+		Source.x = Dist*Cos(TargetOrientation + HALFPI) + TargetCoors.x;
+		Source.y = Dist*Sin(TargetOrientation + HALFPI) + TargetCoors.y;
+
+		CColModel *colModel = CamTargetEntity->GetColModel();
+		CVector OrigSource = Source;
+		TheCamera.AvoidTheGeometry(OrigSource, TargetCoors, Source, FOV);
+
+		CVector TopLeft = CamTargetEntity->GetPosition() +
+			CamTargetEntity->GetRight()*colModel->boundingBox.min.x +
+			CamTargetEntity->GetUp()*colModel->boundingBox.max.z;
+		float Height = Min(Max(m_cvecTargetCoorsForFudgeInter.z, TopLeft.z)+0.1f, OrigSource.z);
+		Source.z = Max(Height, Source.z);
+
+		Front = CamTargetEntity->GetPosition() - Source;
+		Front.z += 1.1f;
+		if(Mode == MODE_BEHINDBOAT)
+			Front.z += 1.2f;
+		GetVectorsReadyForRW();
+	}
+	if(Mode == MODE_1STPERSON && CamTargetEntity->IsVehicle()){
+		LookingRight = true;
+		RwCameraSetNearClipPlane(Scene.camera, 0.25f);
+		if(((CVehicle*)CamTargetEntity)->IsBoat()){
+			if(((CVehicle*)CamTargetEntity)->pDriver){
+				CVector neck(0.0f, 0.0f, 0.0f);
+				CPed *driver = ((CVehicle*)CamTargetEntity)->pDriver;
+				driver->SetPedPositionInCar();
+				driver->GetMatrix().UpdateRW();
+				driver->UpdateRwFrame();
+				driver->UpdateRpHAnim();
+				driver->m_pedIK.GetComponentPosition(neck, PED_NECK);
+				Source = neck +
+					BOAT_1STPERSON_R_OFFSETX*CamTargetEntity->GetRight() +
+					BOAT_1STPERSON_LR_OFFSETZ*CamTargetEntity->GetUp();
+			}else
+				Source.z -= 0.5f;
+		}
+
+		Up = CamTargetEntity->GetUp();
+		Up.Normalise();
+		Front = CamTargetEntity->GetForward();
+		Front.Normalise();
+		Front = CrossProduct(Front, Up);
+		Front.Normalise();
+		if(((CVehicle*)CamTargetEntity)->GetVehicleAppearance() == VEHICLE_APPEARANCE_BIKE)
+			Source -= 1.45f*Front;
+	}
+}
+
+void
+CCam::ClipIfPedInFrontOfPlayer(void)
+{
+	float FwdAngle, PedAngle, DeltaAngle, fDist, Near;
+	CVector vDist;
+	CPed *Player;
+	bool found = false;
+	int ped = 0;
+
+	// unused: TheCamera.pTargetEntity->GetPosition() - TheCamera.GetGameCamPosition();
+
+	FwdAngle = CGeneral::GetATanOfXY(TheCamera.GetForward().x, TheCamera.GetForward().y);
+	Player = CWorld::Players[CWorld::PlayerInFocus].m_pPed;
+	while(ped < Player->m_numNearPeds && !found)
+		if(Player->m_nearPeds[ped] && Player->m_nearPeds[ped]->GetPedState() != PED_DEAD)
+			found = true;
+		else
+			ped++;
+	if(found){
+		vDist = Player->m_nearPeds[ped]->GetPosition() - TheCamera.GetGameCamPosition();
+		PedAngle = CGeneral::GetATanOfXY(vDist.x, vDist.y);
+		DeltaAngle = FwdAngle - PedAngle;
+		while(DeltaAngle >= PI) DeltaAngle -= 2*PI;
+		while(DeltaAngle < -PI) DeltaAngle += 2*PI;
+		if(Abs(DeltaAngle) < HALFPI){
+			fDist = vDist.Magnitude2D();
+			if(fDist < 1.25f){
+				Near = DEFAULT_NEAR - (1.25f - fDist);
+				if(Near < 0.05f)
+					Near = 0.05f;
+				RwCameraSetNearClipPlane(Scene.camera, Near);
+			}
+		}
+	}
+}
+
+void
+CCam::KeepTrackOfTheSpeed(const CVector &source, const CVector &target, const CVector &up, const float &alpha, const float &beta, const float &fov)
+{
+	static CVector PreviousSource = source;
+	static CVector PreviousTarget = target;
+	static CVector PreviousUp = up;
+	static float PreviousBeta = beta;
+	static float PreviousAlpha = alpha;
+	static float PreviousFov = fov;
+
+	if(TheCamera.m_bJust_Switched){
+		PreviousSource = source;
+		PreviousTarget = target;
+		PreviousUp = up;
+	}
+
+	m_cvecSourceSpeedOverOneFrame = source - PreviousSource;
+	m_cvecTargetSpeedOverOneFrame = target - PreviousTarget;
+	m_cvecUpOverOneFrame = up - PreviousUp;
+	m_fFovSpeedOverOneFrame = fov - PreviousFov;
+	m_fBetaSpeedOverOneFrame = beta - PreviousBeta;
+	MakeAngleLessThan180(m_fBetaSpeedOverOneFrame);
+	m_fAlphaSpeedOverOneFrame = alpha - PreviousAlpha;
+	MakeAngleLessThan180(m_fAlphaSpeedOverOneFrame);
+
+	PreviousSource = source;
+	PreviousTarget = target;
+	PreviousUp = up;
+	PreviousBeta = beta;
+	PreviousAlpha = alpha;
+	PreviousFov = fov;
+}
+
+bool
+CCam::Using3rdPersonMouseCam(void) 
+{
+	return CCamera::m_bUseMouse3rdPerson && Mode == MODE_FOLLOWPED;
+}
+
+bool
+CCam::GetWeaponFirstPersonOn(void)
+{
+	return CamTargetEntity && CamTargetEntity->IsPed() && ((CPed*)CamTargetEntity)->GetWeapon()->m_bAddRotOffset;
+}
+
+bool
+CCam::IsTargetInWater(const CVector &CamCoors)
+{
+	if(CamTargetEntity){
+		float WaterZ = -6000.0f;
+		CWaterLevel::GetWaterLevel(CamTargetEntity->GetPosition(), &WaterZ, false);
+		if(CamTargetEntity->IsPed()){
+			if(((CPed*)CamTargetEntity)->bIsDrowning ||
+			   ((CPed*)CamTargetEntity)->bIsInWater && CamTargetEntity->GetPosition().z < WaterZ)
+				return true;
+		}else{
+			assert(CamTargetEntity->IsVehicle());
+			if(((CVehicle*)CamTargetEntity)->bIsDrowning ||
+			   ((CVehicle*)CamTargetEntity)->bIsInWater && CamTargetEntity->GetPosition().z < WaterZ)
+				return true;
+		}
+	}
+	m_vecLastAboveWaterCamPosition = Source;
+	return false;
+}
+
+void
+CCam::PrintMode(void)
+{
+	// Doesn't do anything
+	char buf[256];
+
+	if(PrintDebugCode){
+		sprintf(buf, "                                                   ");
+		sprintf(buf, "                                                   ");
+		sprintf(buf, "                                                   ");
+
+		static Const char *modes[] = { "None",
+			"Top Down", "GTA Classic", "Behind Car", "Follow Ped",
+			"Aiming", "Debug", "Sniper", "Rocket", "Model Viewer", "Bill",
+			"Syphon", "Circle", "Cheesy Zoom", "Wheel", "Fixed",
+			"1st Person", "Fly by", "on a String", "Reaction",
+			"Follow Ped with Bind", "Chris", "Behind Boat",
+			"Player fallen in Water", "Train Roof", "Train Side",
+			"Blood on the tracks", "Passenger", "Syphon Crim in Front",
+			"Dead Baby", "Pillow Paps", "Look at Cars", "Arrest One",
+			"Arrest Two", "M16", "Special fixed for Syphon", "Fight",
+			"Top Down Ped", "Lighthouse",
+			"Sniper run about", "Rocket run about",
+			"1st Person run about", "M16 run about", "Fight run about",
+			"Editor", "Helicannon", "Camera"
+		};
+		sprintf(buf, "Cam: %s", modes[TheCamera.Cams[TheCamera.ActiveCam].Mode]);
+		CDebug::PrintAt(buf, 2, 5);
+	}
+
+	if(DebugCamMode != MODE_NONE){
+		switch(Mode){
+		case MODE_FOLLOWPED:
+			sprintf(buf, "Debug:- Cam Choice1. No Locking, used as game default");
+			break;
+		case MODE_REACTION:
+			sprintf(buf, "Debug:- Cam Choice2. Reaction Cam On A String ");
+			sprintf(buf, "        Uses Locking Button LeftShoulder 1. ");	// lie
+			break;
+		case MODE_FOLLOW_PED_WITH_BIND:
+			sprintf(buf, "Debug:- Cam Choice3. Game ReactionCam with Locking ");
+			sprintf(buf, "        Uses Locking Button LeftShoulder 1. ");
+			break;
+		case MODE_CHRIS:
+			sprintf(buf, "Debug:- Cam Choice4. Chris's idea.  ");
+			sprintf(buf, "        Uses Locking Button LeftShoulder 1. ");
+			sprintf(buf, "        Also control the camera using the right analogue stick.");
+			break;
+		}
+	}
+}
+
+// This code is really bad. wtf R*?
+CVector
+CCam::DoAverageOnVector(const CVector &vec)
+{
+	int i;
+	CVector Average = CVector(0.0f, 0.0f, 0.0f);
+
+	if(ResetStatics){
+		m_iRunningVectorArrayPos = 0;
+		m_iRunningVectorCounter = 1;
+	}
+
+	// TODO: make this work with NUMBER_OF_VECTORS_FOR_AVERAGE != 2
+	if(m_iRunningVectorCounter == 3){
+		m_arrPreviousVectors[0] = m_arrPreviousVectors[1];
+		m_arrPreviousVectors[1] = vec;
+	}else
+		m_arrPreviousVectors[m_iRunningVectorArrayPos] = vec;
+
+	for(i = 0; i <= m_iRunningVectorArrayPos; i++)
+		Average += m_arrPreviousVectors[i];
+	Average /= i;
+
+	m_iRunningVectorArrayPos++;
+	m_iRunningVectorCounter++;
+	if(m_iRunningVectorArrayPos >= NUMBER_OF_VECTORS_FOR_AVERAGE)
+		m_iRunningVectorArrayPos = NUMBER_OF_VECTORS_FOR_AVERAGE-1;
+	if(m_iRunningVectorCounter > NUMBER_OF_VECTORS_FOR_AVERAGE+1)
+		m_iRunningVectorCounter = NUMBER_OF_VECTORS_FOR_AVERAGE+1;
+
+	return Average;
+}
+
+float DefaultAcceleration = 0.045f;
+float DefaultMaxStep = 0.15f;
+float fDefaultSpeedStep = 0.025f;
+float fDefaultSpeedMultiplier = 0.09f;
+float fDefaultSpeedLimit = 0.15f;
+float fDefaultSpeedStep4Avoid = 0.02f;
+float fDefaultSpeedMultiplier4Avoid = 0.05f;
+float fDefaultSpeedLimit4Avoid = 0.25f;
+float fAvoidGeomThreshhold = 1.5f;
+float fMiniGunBetaOffset = 0.3f;
+
+void
+CCam::Process_FollowPed(const CVector &CameraTarget, float TargetOrientation, float, float)
+{
+	if(!CamTargetEntity->IsPed())
+		return;
+
+	CVector TargetCoors, Dist, IdealSource;
+	float Length = 0.0f;
+	static bool PickedASide;
+	static float FixedTargetOrientation = 0.0f;
+	float AngleToGoTo = 0.0f;
+	bool StandingInTrain = false;
+	float ZoomGroundTarget = 0.0f;
+	float ZoomZTarget = 0.0f;
+	static int TimeIndicatedWantedToGoDown = 0;
+	static bool StartedCountingForGoDown = false;
+	static float ZoomGround = 0.0f;
+	static float ZoomGroundSpeed = 0.0f;
+	static float ZoomZ = 0.0f;
+	static float ZoomZSpeed = 0.0f;
+	float DeltaBeta;
+
+	m_bFixingBeta = false;
+	bBelowMinDist = false;
+	bBehindPlayerDesired = false;
+
+	FOV = DefaultFOV;
+
+	if(ResetStatics){
+		Rotating = false;
+		m_bCollisionChecksOn = true;
+		FixedTargetOrientation = 0.0f;
+		PickedASide = false;
+		StartedCountingForGoDown = false;
+		AngleToGoTo = 0.0f;
+		ZoomGround = 0.0f;
+		ZoomGroundSpeed = 0.0f;
+		ZoomZ = 0.0f;
+		ZoomZSpeed = 0.0f;
+		Distance = 500.0f;
+	}
+
+
+	TargetCoors = CameraTarget;
+
+	// Take speed of thing we're standing on into account
+	CVector GroundMovement(0.0f, 0.0f, 0.0f);
+	CPhysical *ground = (CPhysical*)((CPed*)CamTargetEntity)->m_pCurSurface;
+	if(ground && (ground->IsVehicle() || ground->IsObject()))
+		GroundMovement += ground->GetSpeed(CamTargetEntity->GetPosition() - ground->GetPosition()) * CTimer::GetTimeStep();
+
+	Source += GroundMovement;
+	IdealSource = Source;
+	TargetCoors.z += m_fSyphonModeTargetZOffSet;
+
+	TargetCoors.z = DoAverageOnVector(TargetCoors).z;
+
+	Dist.x = IdealSource.x - TargetCoors.x;
+	Dist.y = IdealSource.y - TargetCoors.y;
+	Length = Dist.Magnitude2D();
+
+	// Cam on a string. With a fixed distance. Zoom in/out is done later.
+	if(Length != 0.0f){
+		IdealSource = TargetCoors + CVector(Dist.x, Dist.y, 0.0f)/Length * m_fMinRealGroundDist;
+		IdealSource.z += GroundMovement.z;
+	}else
+		IdealSource = TargetCoors + CVector(1.0f, 1.0f, 0.0f);
+
+	if(TheCamera.m_bUseTransitionBeta && ResetStatics){
+		CVector VecDistance;
+		IdealSource.x = TargetCoors.x + m_fMinRealGroundDist*Cos(m_fTransitionBeta);
+		IdealSource.y = TargetCoors.y + m_fMinRealGroundDist*Sin(m_fTransitionBeta);
+		Beta = CGeneral::GetATanOfXY(IdealSource.x - TargetCoors.x, IdealSource.y - TargetCoors.y);
+	}else
+		Beta = CGeneral::GetATanOfXY(Source.x - TargetCoors.x, Source.y - TargetCoors.y);
+
+	if(TheCamera.m_bCamDirectlyBehind){
+		 m_bCollisionChecksOn = true;
+		 Beta = TargetOrientation + PI;
+	}
+
+	if(FindPlayerVehicle())
+		if(FindPlayerVehicle()->m_vehType == VEHICLE_TYPE_TRAIN)
+			StandingInTrain = true;
+
+	if(TheCamera.m_bCamDirectlyInFront){
+		 m_bCollisionChecksOn = true;
+		 Beta = TargetOrientation;
+	}
+
+	while(Beta >= PI) Beta -= 2.0f * PI;
+	while(Beta < -PI) Beta += 2.0f * PI;
+
+	if(TheCamera.PedZoomIndicator == CAM_ZOOM_1 &&
+	   ((CPed*)CamTargetEntity)->GetPedState() != PED_ENTER_CAR &&
+	   ((CPed*)CamTargetEntity)->GetPedState() != PED_CARJACK){
+		ZoomGroundTarget = m_fTargetZoomGroundOne;
+		ZoomZTarget = m_fTargetZoomOneZExtra;
+	}else if(TheCamera.PedZoomIndicator == CAM_ZOOM_2 || TheCamera.PedZoomIndicator == CAM_ZOOM_1){
+		ZoomGroundTarget = m_fTargetZoomGroundTwo;
+		ZoomZTarget = m_fTargetZoomTwoZExtra;
+	}else if(TheCamera.PedZoomIndicator == CAM_ZOOM_3){
+		ZoomGroundTarget = m_fTargetZoomGroundThree;
+		ZoomZTarget = m_fTargetZoomThreeZExtra;
+	}
+	if(m_fCloseInPedHeightOffset >  0.00001f){
+		ZoomGroundTarget = m_fTargetCloseInDist;
+		ZoomZTarget = m_fTargetZoomZCloseIn;
+	}
+	if(ResetStatics){
+		ZoomGround = ZoomGroundTarget;
+		ZoomZ = ZoomZTarget;
+	}
+
+	float SpeedStep = fDefaultSpeedStep;
+	float SpeedMultiplier = fDefaultSpeedMultiplier;
+	float SpeedLimit = fDefaultSpeedLimit;
+	bool Shooting = false;
+	CPed *ped = (CPed*)CamTargetEntity;
+	if(ped->GetWeapon()->m_eWeaponType != WEAPONTYPE_UNARMED)
+		if(CPad::GetPad(0)->GetWeapon())
+			Shooting = true;
+	if(ped->GetWeapon()->m_eWeaponType == WEAPONTYPE_DETONATOR ||
+	   ped->GetWeapon()->m_eWeaponType == WEAPONTYPE_BASEBALLBAT)
+		Shooting = false;
+
+
+	// Figure out if and where we want to rotate
+
+	if(CPad::GetPad(0)->ForceCameraBehindPlayer() && !CPickups::PlayerOnWeaponPickup || Shooting){
+
+		// Center cam behind player
+
+		if(PickedASide){
+			if(AngleToGoTo == 0.0f){
+				FixedTargetOrientation = TargetOrientation + PI;
+				if(Shooting && ped->GetWeapon()->m_eWeaponType == WEAPONTYPE_MINIGUN)
+					FixedTargetOrientation -= fMiniGunBetaOffset;
+			}
+			Rotating = true;
+		}else{
+			FixedTargetOrientation = TargetOrientation + PI;
+			Rotating = true;
+			PickedASide = true;
+			if(Shooting && ped->GetWeapon()->m_eWeaponType == WEAPONTYPE_MINIGUN)
+				FixedTargetOrientation -= fMiniGunBetaOffset;
+		}
+	}else if(Abs(TheCamera.m_fAvoidTheGeometryProbsTimer) > fAvoidGeomThreshhold && !Rotating ){
+
+		if(TheCamera.m_fAvoidTheGeometryProbsTimer < 0.0f)
+			FixedTargetOrientation = TargetOrientation;
+		else
+			FixedTargetOrientation = TargetOrientation + PI;
+		float dist = (Source - TargetCoors).Magnitude();
+		float mult = dist > 0.1f ? 1.0f/dist : 10.0f;
+		SpeedStep = mult * fDefaultSpeedStep4Avoid;
+		SpeedMultiplier = mult * fDefaultSpeedMultiplier4Avoid;
+		SpeedLimit = mult * fDefaultSpeedLimit4Avoid;
+	}
+
+	int MoveState = ((CPed*)CamTargetEntity)->m_nMoveState;
+	if(MoveState != PEDMOVE_NONE && MoveState != PEDMOVE_STILL &&
+	   !(CPad::GetPad(0)->ForceCameraBehindPlayer() && !CPickups::PlayerOnWeaponPickup) && !Shooting){
+		Rotating = false;
+		if(TheCamera.m_fAvoidTheGeometryProbsTimer <= fAvoidGeomThreshhold)
+			BetaSpeed = 0.0f;
+	}
+
+	// Now do the Beta rotation
+
+	float RotDistance = m_fMinRealGroundDist;
+
+	if(Rotating || TheCamera.m_fAvoidTheGeometryProbsTimer > fAvoidGeomThreshhold){
+		m_bFixingBeta = true;
+
+		while(FixedTargetOrientation >= PI) FixedTargetOrientation -= 2*PI;
+		while(FixedTargetOrientation < -PI) FixedTargetOrientation += 2*PI;
+
+		while(Beta >= PI) Beta -= 2*PI;
+		while(Beta < -PI) Beta += 2*PI;
+
+
+		// This is inlined WellBufferMe - unfortunately modified so we can't just call it
+		{
+		DeltaBeta = FixedTargetOrientation - Beta;
+		while(DeltaBeta >= PI) DeltaBeta -= 2*PI;
+		while(DeltaBeta < -PI) DeltaBeta += 2*PI;
+
+		// this is the added bit
+		if(!Rotating){
+			if(TheCamera.m_nAvoidTheGeometryProbsDirn == -1 && DeltaBeta > 0.0f ||
+			   TheCamera.m_nAvoidTheGeometryProbsDirn == 1 && DeltaBeta < 0.0f)
+				DeltaBeta *= -1.0f;
+		}
+
+		float ReqSpeed = DeltaBeta * SpeedMultiplier;
+		// this is also added
+		ReqSpeed = clamp(ReqSpeed, -SpeedLimit, SpeedLimit);
+
+		// Add or subtract absolute depending on sign, genius!
+		if(ReqSpeed - BetaSpeed > 0.0f)
+			BetaSpeed += SpeedStep * Abs(ReqSpeed - BetaSpeed) * CTimer::GetTimeStep();
+		else
+			BetaSpeed -= SpeedStep * Abs(ReqSpeed - BetaSpeed) * CTimer::GetTimeStep();
+		// this would be simpler:
+		// BetaSpeed += SpeedStep * (ReqSpeed - BetaSpeed) * CTimer::ms_fTimeStep;
+
+		if(ReqSpeed < 0.0f && BetaSpeed < ReqSpeed)
+			BetaSpeed = ReqSpeed;
+		else if(ReqSpeed > 0.0f && BetaSpeed > ReqSpeed)
+			BetaSpeed = ReqSpeed;
+
+		Beta += BetaSpeed * Min(10.0f, CTimer::GetTimeStep());
+		}
+
+		if(ResetStatics){
+			Beta = FixedTargetOrientation;
+			BetaSpeed = 0.0f;
+		}
+
+		Source.x = TargetCoors.x + RotDistance * Cos(Beta);
+		Source.y = TargetCoors.y + RotDistance * Sin(Beta);
+
+		// Check if we can stop rotating
+		DeltaBeta = FixedTargetOrientation - Beta;
+		while(DeltaBeta >= PI) DeltaBeta -= 2*PI;
+		while(DeltaBeta < -PI) DeltaBeta += 2*PI;
+		if(Abs(DeltaBeta) < DEGTORAD(1.0f) && !bBehindPlayerDesired){
+			// Stop rotation
+			PickedASide = false;
+			Rotating = false;
+			BetaSpeed = 0.0f;
+		}
+	}
+
+
+	if(TheCamera.m_bCamDirectlyBehind || TheCamera.m_bCamDirectlyInFront ||
+	   StandingInTrain || Rotating ||
+	   TheCamera.m_bUseTransitionBeta && ResetStatics ||
+	   Abs(TheCamera.m_fAvoidTheGeometryProbsTimer) > fAvoidGeomThreshhold){
+		if(TheCamera.m_bUseTransitionBeta){
+			Beta = m_fTransitionBeta;
+			Source.x = TargetCoors.x + RotDistance * Cos(m_fTransitionBeta);
+			Source.y = TargetCoors.y + RotDistance * Sin(m_fTransitionBeta);
+		}
+		if(TheCamera.m_bCamDirectlyBehind){
+			Beta = TargetOrientation + PI;
+			Source.x = TargetCoors.x + RotDistance * Cos(Beta);
+			Source.y = TargetCoors.y + RotDistance * Sin(Beta);
+		}
+		if(TheCamera.m_bCamDirectlyInFront){
+			Beta = TargetOrientation;
+			Source.x = TargetCoors.x + RotDistance * Cos(Beta);
+			Source.y = TargetCoors.y + RotDistance * Sin(Beta);
+		}
+		if(StandingInTrain){
+			Beta = TargetOrientation + PI;
+			Source.x = TargetCoors.x + RotDistance * Cos(Beta);
+			Source.y = TargetCoors.y + RotDistance * Sin(Beta);
+			m_fDimensionOfHighestNearCar = 0.0f;
+			m_fCamBufferedHeight = 0.0f;
+			m_fCamBufferedHeightSpeed = 0.0f;
+		}
+		if(StandingInTrain){
+			Beta = TargetOrientation + PI;
+			Source.x = TargetCoors.x + RotDistance * Cos(Beta);
+			Source.y = TargetCoors.y + RotDistance * Sin(Beta);
+			m_fDimensionOfHighestNearCar = 0.0f;
+			m_fCamBufferedHeight = 0.0f;
+			m_fCamBufferedHeightSpeed = 0.0f;
+		}
+
+		// Beta and Source already set in the rotation code
+	}else{
+		Source = IdealSource;
+		BetaSpeed = 0.0f;
+	}
+	Source.z = IdealSource.z;
+
+	// Zoom out camera
+	Front = TargetCoors - Source;
+	Front.Normalise();
+	WellBufferMe(ZoomGroundTarget, &ZoomGround, &ZoomGroundSpeed, 0.2f, 0.07f, false);
+	WellBufferMe(ZoomZTarget, &ZoomZ, &ZoomZSpeed, 0.2f, 0.07f, false);
+	Source.x -= Front.x*ZoomGround;
+	Source.y -= Front.y*ZoomGround;
+	Source.z += ZoomZ;
+
+
+	// Process height offset to avoid peds and cars
+
+	float TargetZOffSet = Max(m_fDimensionOfHighestNearCar, m_fPedBetweenCameraHeightOffset);
+	float TargetHeight = CameraTarget.z + TargetZOffSet - Source.z;
+
+	if(TargetHeight > m_fCamBufferedHeight){
+		// Have to go up
+		if(TargetZOffSet == m_fPedBetweenCameraHeightOffset && TargetZOffSet > m_fCamBufferedHeight)
+			WellBufferMe(TargetHeight, &m_fCamBufferedHeight, &m_fCamBufferedHeightSpeed, 0.2f, 0.04f, false);
+		else
+			WellBufferMe(TargetHeight, &m_fCamBufferedHeight, &m_fCamBufferedHeightSpeed, 0.2f, 0.025f, false);
+		StartedCountingForGoDown = false;
+	}else{
+		// Have to go down
+		if(StartedCountingForGoDown){
+			if(CTimer::GetTimeInMilliseconds() != TimeIndicatedWantedToGoDown){
+				if(TargetHeight > 0.0f)
+					WellBufferMe(TargetHeight, &m_fCamBufferedHeight, &m_fCamBufferedHeightSpeed, 0.2f, 0.01f, false);
+				else
+					WellBufferMe(0.0f, &m_fCamBufferedHeight, &m_fCamBufferedHeightSpeed, 0.2f, 0.01f, false);
+			}
+		}else{
+			StartedCountingForGoDown = true;
+			TimeIndicatedWantedToGoDown = CTimer::GetTimeInMilliseconds();
+		}
+	}
+
+	Source.z += m_fCamBufferedHeight;
+	TargetCoors.z += Min(1.0f, m_fCamBufferedHeight/2.0f);
+	m_cvecTargetCoorsForFudgeInter = TargetCoors;
+
+	CVector OrigSource = Source;
+	TheCamera.AvoidTheGeometry(OrigSource, TargetCoors, Source, FOV);
+	float TargetDist = (TargetCoors - Source).Magnitude();
+	if(TargetDist < Distance)
+		Distance = TargetDist;
+	else{
+		float f = Pow(0.97f, CTimer::GetTimeStep());
+		Distance = (1.0f - f)*TargetDist + f*Distance;
+		if(TargetDist > 0.05f)
+			Source = TargetCoors + (Source-TargetCoors)*Distance/TargetDist;
+		float clip = Distance-fRangePlayerRadius;
+		if(clip < RwCameraGetNearClipPlane(Scene.camera))
+			RwCameraSetNearClipPlane(Scene.camera, Max(clip, fCloseNearClipLimit));
+	}
+
+	Front = TargetCoors - Source;
+	m_fRealGroundDist = Front.Magnitude2D();
+	m_fMinDistAwayFromCamWhenInterPolating = m_fRealGroundDist;	
+	Front.Normalise();
+	GetVectorsReadyForRW();
+	TheCamera.m_bCamDirectlyBehind = false;
+	TheCamera.m_bCamDirectlyInFront = false;
+
+	ResetStatics = false;
+}
+
+float fBaseDist = 1.7f;
+float fAngleDist = 2.0f;
+float fFalloff = 3.0f;
+float fStickSens = 0.01f;
+float fTweakFOV = 1.1f;
+float fTranslateCamUp = 0.8f;
+int16 nFadeControlThreshhold = 45;
+float fDefaultAlphaOrient = -0.22f;
+float fMouseAvoidGeomReturnRate = 0.92f;
+
+void
+CCam::Process_FollowPedWithMouse(const CVector &CameraTarget, float TargetOrientation, float, float)
+{
+	FOV = DefaultFOV;
+
+	if(!CamTargetEntity->IsPed())
+		return;
+
+	CVector TargetCoors;
+	float CamDist;
+	CColPoint colPoint;
+	CEntity *entity;
+
+	if(ResetStatics){
+		Rotating = false;
+		m_bCollisionChecksOn = true;
+		CPad::GetPad(0)->ClearMouseHistory();
+		ResetStatics = false;
+	}
+
+	bool OnTrain = FindPlayerVehicle() && FindPlayerVehicle()->IsTrain();
+
+	TargetCoors = CameraTarget;
+	TargetCoors.z += fTranslateCamUp;
+
+	float AlphaOffset, BetaOffset;
+	if(CPad::GetPad(0)->IsPlayerControlsDisabledBy(PLAYERCONTROL_PLAYERINFO)){
+		CVector ToCam = Source - TargetCoors;
+		ToCam.Normalise();
+		if(ToCam.z < -0.9f)
+			BetaOffset = TargetOrientation + PI;
+		else
+			BetaOffset = Atan2(ToCam.y, ToCam.x);
+		BetaOffset -= Beta;
+		AlphaOffset = 0.0f;
+	}else{
+		// 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();
+		}
+		if(UseMouse){
+			BetaOffset = LookLeftRight * TheCamera.m_fMouseAccelHorzntl * FOV/80.0f;
+			AlphaOffset = LookUpDown * TheCamera.m_fMouseAccelVertical * FOV/80.0f;
+		}else{
+			BetaOffset = LookLeftRight * fStickSens * (1.0f/14.0f) * FOV/80.0f * CTimer::GetTimeStep();
+			AlphaOffset = LookUpDown * fStickSens * (0.6f/14.0f) * FOV/80.0f * CTimer::GetTimeStep();
+		}
+	}
+
+	if(TheCamera.GetFading() && TheCamera.GetFadingDirection() == FADE_IN && nFadeControlThreshhold < CDraw::FadeValue ||
+	   CDraw::FadeValue > 200 ||
+	   CPad::GetPad(0)->IsPlayerControlsDisabledBy(PLAYERCONTROL_PLAYERINFO)){
+		if(Alpha < fDefaultAlphaOrient-0.05f)
+			AlphaOffset = 0.05f;
+		else if(Alpha < fDefaultAlphaOrient)
+			AlphaOffset = fDefaultAlphaOrient - Alpha;
+		else if(Alpha > fDefaultAlphaOrient+0.05f)
+			AlphaOffset = -0.05f;
+		else if(Alpha > fDefaultAlphaOrient)
+			AlphaOffset = fDefaultAlphaOrient - Alpha;
+		else
+			AlphaOffset = 0.0f;
+	}
+
+	Alpha += AlphaOffset;
+	Beta += BetaOffset;
+	while(Beta >= PI) Beta -= 2*PI;
+	while(Beta < -PI) Beta += 2*PI;
+	if(Alpha > DEGTORAD(45.0f)) Alpha = DEGTORAD(45.0f);
+	else if(Alpha < -DEGTORAD(89.5f)) Alpha = -DEGTORAD(89.5f);
+
+	// SA code
+#ifdef FREE_CAM
+	if((CCamera::bFreeCam && Alpha > 0.0f) || (!CCamera::bFreeCam && Alpha > fBaseDist))
+#else
+	if(Alpha > fBaseDist)	// comparing an angle against a distance?
+#endif
+		CamDist = fBaseDist + Cos(Min(Alpha*fFalloff, HALFPI))*fAngleDist;
+	else
+		CamDist = fBaseDist + Cos(Alpha)*fAngleDist;
+
+	if(TheCamera.m_bUseTransitionBeta)
+		Beta = m_fTransitionBeta;
+
+	if(TheCamera.m_bCamDirectlyBehind)
+		Beta = TheCamera.m_PedOrientForBehindOrInFront + PI;
+	if(TheCamera.m_bCamDirectlyInFront)
+		Beta = TheCamera.m_PedOrientForBehindOrInFront;
+	if(OnTrain)
+		Beta = TargetOrientation;
+
+	Front.x = Cos(Alpha) * -Cos(Beta);
+	Front.y = Cos(Alpha) * -Sin(Beta);
+	Front.z = Sin(Alpha);
+	Source = TargetCoors - Front*CamDist;
+	m_cvecTargetCoorsForFudgeInter = TargetCoors;
+
+	// 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 > DEFAULT_NEAR + 0.1f){
+			// 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 < DEFAULT_NEAR + 0.3f)
+					RwCameraSetNearClipPlane(Scene.camera, Max(PedColDist-0.3f, 0.05f));
+			}else{
+				RwCameraSetNearClipPlane(Scene.camera, Min(ColCamDist-0.35f, DEFAULT_NEAR));
+			}
+		}else{
+			Source = colPoint.point;
+			if(PedColDist < DEFAULT_NEAR + 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::CalculateAspectRatio() * 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;
+
+		Near = RwCameraGetNearClipPlane(Scene.camera);
+#ifndef FIX_BUGS
+		// this is wrong...DEGTORAD missing
+		radius = Tan(FOV / 2.0f) * CDraw::CalculateAspectRatio() * fTweakFOV * Near;
+#else
+		radius = ViewPlaneWidth*Near;
+#endif
+		// Keep testing
+		entity = CWorld::TestSphereAgainstWorld(Source + Front*Near, radius, nil, true, true, false, true, false, false);
+
+		i++;
+		if(i > 5)
+			entity = nil;
+	}
+
+	float TargetDist = (TargetCoors - Source).Magnitude();
+	if(TargetDist < Distance)
+		Distance = TargetDist;
+	else{
+		float f = Pow(fMouseAvoidGeomReturnRate, CTimer::GetTimeStep());
+		Distance = (1.0f - f)*TargetDist + f*Distance;
+		if(TargetDist > 0.05f)
+			Source = TargetCoors + (Source-TargetCoors)*Distance/TargetDist;
+		float clip = Distance-fRangePlayerRadius;
+		if(clip < RwCameraGetNearClipPlane(Scene.camera))
+			RwCameraSetNearClipPlane(Scene.camera, Max(clip, fCloseNearClipLimit));
+	}
+
+	TheCamera.m_bCamDirectlyInFront = false;
+	TheCamera.m_bCamDirectlyBehind = false;
+
+	GetVectorsReadyForRW();
+
+	if(((CPed*)CamTargetEntity)->CanStrafeOrMouseControl() && CDraw::FadeValue < 250 &&
+	   (TheCamera.GetFadingDirection() != FADE_OUT || CDraw::FadeValue <= 100) &&
+	   !CPad::GetPad(0)->IsPlayerControlsDisabledBy(PLAYERCONTROL_PLAYERINFO)){
+		float Heading = Front.Heading();
+		((CPed*)TheCamera.pTargetEntity)->m_fRotationCur = Heading;
+		((CPed*)TheCamera.pTargetEntity)->m_fRotationDest = Heading;
+		TheCamera.pTargetEntity->SetHeading(Heading);
+		TheCamera.pTargetEntity->GetMatrix().UpdateRW();
+	}
+}
+
+float fBillsBetaOffset;	// made up name, actually in CCam
+
+void
+CCam::Process_BehindCar(const CVector &CameraTarget, float TargetOrientation, float, float)
+{
+	FOV = DefaultFOV;
+
+	if(!CamTargetEntity->IsVehicle())
+		return;
+
+	CVector TargetCoors = CameraTarget;
+	TargetCoors.z -= 0.2f;
+	CA_MAX_DISTANCE = 9.95f;
+	CA_MIN_DISTANCE = 8.5f;
+
+	CVector Dist = Source - TargetCoors;
+	float Length = Dist.Magnitude2D();
+	m_fDistanceBeforeChanges = Length;
+	if(Length < 0.002f)
+		Length = 0.002f;
+	Beta = CGeneral::GetATanOfXY(TargetCoors.x - Source.x, TargetCoors.y - Source.y);
+#ifdef TOGGLEABLE_BETA_FEATURES
+	// This is completely made up but Bill's cam manipulates an angle before calling this
+	// and otherwise calculating Beta doesn't make much sense.
+	Beta += fBillsBetaOffset;
+	fBillsBetaOffset = 0.0f;
+	Dist.x = -Length*Cos(Beta);
+	Dist.y = -Length*Sin(Beta);
+	Source = TargetCoors + Dist;
+#endif
+	if(Length > CA_MAX_DISTANCE){
+		Source.x = TargetCoors.x + Dist.x/Length * CA_MAX_DISTANCE;
+		Source.y = TargetCoors.y + Dist.y/Length * CA_MAX_DISTANCE;
+	}else if(Length < CA_MIN_DISTANCE){
+		Source.x = TargetCoors.x + Dist.x/Length * CA_MIN_DISTANCE;
+		Source.y = TargetCoors.y + Dist.y/Length * CA_MIN_DISTANCE;
+	}
+	TargetCoors.z += 0.8f;
+
+	Alpha = DEGTORAD(25.0f);
+	Source.z = TargetCoors.z + CA_MAX_DISTANCE*Sin(Alpha);
+
+	RotCamIfInFrontCar(TargetCoors, TargetOrientation);
+	m_cvecTargetCoorsForFudgeInter = TargetCoors;
+	CVector OrigSource = Source;
+	TheCamera.AvoidTheGeometry(OrigSource, m_cvecTargetCoorsForFudgeInter, Source, FOV);
+
+	Front = TargetCoors - Source;
+	ResetStatics = false;
+	GetVectorsReadyForRW();
+}
+
+float ZmOneAlphaOffset[] = { -0.01f, 0.1f, 0.125f, -0.1f, -0.06f };
+float ZmTwoAlphaOffset[] = { 0.045f, 0.12f, 0.045f, 0.045f, -0.035f };
+float ZmThreeAlphaOffset[] = { 0.005f, 0.005f, 0.15f, 0.005f, 0.12f };
+float INIT_RC_HELI_HORI_EXTRA = 6.0f;
+float INIT_RC_PLANE_HORI_EXTRA = 9.5f;
+float INIT_RC_HELI_ALPHA_EXTRA = 0.2f;
+float INIT_RC_PLANE_ALPHA_EXTRA = 0.295f;
+
+void
+CCam::WorkOutCamHeight(const CVector &TargetCoors, float TargetOrientation, float TargetHeight)
+{
+	if(!CamTargetEntity->IsVehicle())
+		return;
+
+	static float AlphaOffset = 0.0;
+	static float AlphaOffsetSpeed = 0.0;
+	static float AlphaDec = 0.0f;
+
+	bool isHeli = false;
+	bool isBike = false;
+	int appearance = ((CVehicle*)CamTargetEntity)->GetVehicleAppearance();
+	if(appearance == VEHICLE_APPEARANCE_BIKE)
+		isBike = true;
+	if(appearance == VEHICLE_APPEARANCE_HELI)
+		isHeli = true;
+	int index = 0;
+	TheCamera.GetArrPosForVehicleType(appearance, index);
+
+	float ExtraOffset = 0.0f;
+	int id = CamTargetEntity->GetModelIndex();
+	if(id == MI_RCRAIDER || id == MI_RCGOBLIN)
+		ExtraOffset = INIT_RC_HELI_ALPHA_EXTRA;
+	else if(id == MI_RCBARON)
+		ExtraOffset = INIT_RC_PLANE_ALPHA_EXTRA;
+
+	if(ResetStatics){
+		AlphaOffset = 0.0f;
+		AlphaOffsetSpeed = 0.0f;
+		AlphaDec = 0.0f;
+
+		if(TheCamera.CarZoomIndicator == CAM_ZOOM_1)
+			AlphaOffset = ZmOneAlphaOffset[index] + ExtraOffset;
+		else if(TheCamera.CarZoomIndicator == CAM_ZOOM_2)
+			AlphaOffset = ZmTwoAlphaOffset[index] + ExtraOffset;
+		else if(TheCamera.CarZoomIndicator == CAM_ZOOM_3)
+			AlphaOffset = ZmThreeAlphaOffset[index] + ExtraOffset;
+	}
+
+	if(TheCamera.CarZoomIndicator == CAM_ZOOM_1)
+		WellBufferMe(ZmOneAlphaOffset[index] + ExtraOffset, &AlphaOffset, &AlphaOffsetSpeed, 0.17f, 0.08f, false);
+	else if(TheCamera.CarZoomIndicator == CAM_ZOOM_2)
+		WellBufferMe(ZmTwoAlphaOffset[index] + ExtraOffset, &AlphaOffset, &AlphaOffsetSpeed, 0.17f, 0.08f, false);
+	else if(TheCamera.CarZoomIndicator == CAM_ZOOM_3)
+		WellBufferMe(ZmThreeAlphaOffset[index] + ExtraOffset, &AlphaOffset, &AlphaOffsetSpeed, 0.17f, 0.08f, false);
+
+	float Length = (Source - TargetCoors).Magnitude2D();
+
+	CVector Forward = CamTargetEntity->GetForward();
+	float CarAlpha = CGeneral::GetATanOfXY(Forward.Magnitude2D(), Forward.z);
+	// this shouldn't be necessary....
+	while(CarAlpha >= PI) CarAlpha -= 2*PI;
+	while(CarAlpha < -PI) CarAlpha += 2*PI;
+
+	while(Beta >= PI) Beta -= 2*PI;
+	while(Beta < -PI) Beta += 2*PI;
+
+	float DeltaBeta = Beta - TargetOrientation;
+	while(DeltaBeta >= PI) DeltaBeta -= 2*PI;
+	while(DeltaBeta < -PI) DeltaBeta += 2*PI;
+
+	float BehindCarNess = Cos(DeltaBeta);	// 1 if behind car, 0 if side, -1 if in front
+	CarAlpha = -CarAlpha * BehindCarNess;
+
+	float fwdSpeed = DotProduct(((CPhysical*)CamTargetEntity)->m_vecMoveSpeed, CamTargetEntity->GetForward())*180.0f;
+	if(CamTargetEntity->GetModelIndex() == MI_FIRETRUCK && CPad::GetPad(0)->GetCarGunFired()){
+		CarAlpha = DEGTORAD(10.0f);
+	}else if(isHeli){
+		CarAlpha = 0.0f;
+		float heliFwdZ = CamTargetEntity->GetForward().z;
+		float heliFwdXY = CamTargetEntity->GetForward().Magnitude2D();
+		float alphaAmount = Min(Abs(fwdSpeed/90.0f), 1.0f);
+		if(heliFwdXY != 0.0f || heliFwdZ != 0.0f)
+			CarAlpha = CGeneral::GetATanOfXY(heliFwdXY, Abs(heliFwdZ)) * alphaAmount;
+
+		CColPoint point;
+		CEntity *entity = nil;
+		CVector Test = Source;
+		Test.z = TargetCoors.z + 0.2f + Length*Sin(CarAlpha+AlphaOffset) + m_fCloseInCarHeightOffset;
+		if(CWorld::ProcessVerticalLine(Test, CamTargetEntity->GetPosition().z, point, entity, true, false, false, false, false, false, nil)){
+			float sin = (point.point.z - TargetCoors.z - 0.2f - m_fCloseInCarHeightOffset)/Length;
+			CarAlpha = Asin(clamp(sin, -1.0f, 1.0f)) - AlphaOffset;
+			if(CarAlpha < 0.0f)
+				AlphaOffset += CarAlpha;
+		} 
+	}
+
+	CarAlpha = CGeneral::LimitRadianAngle(CarAlpha);
+	if(CarAlpha < 0.0f) CarAlpha = 0.0f;
+	if(CarAlpha > DEGTORAD(89.0f)) CarAlpha = DEGTORAD(89.0f);
+
+	if(ResetStatics)
+		Alpha = CarAlpha;
+
+	float TargetAlpha = Alpha;
+	float DeltaAlpha = CarAlpha - TargetAlpha;
+	while(DeltaAlpha >= PI) DeltaAlpha -= 2*PI;
+	while(DeltaAlpha < -PI) DeltaAlpha += 2*PI;
+	if(Abs(DeltaAlpha) > 0.0f && !TheCamera.m_bVehicleSuspenHigh)
+		TargetAlpha = CarAlpha;
+
+	if(isBike)
+		WellBufferMe(TargetAlpha, &Alpha, &AlphaSpeed, 0.09f, 0.04f, true);
+	else if(isHeli)
+		WellBufferMe(TargetAlpha, &Alpha, &AlphaSpeed, 0.09f, 0.04f, true);
+	else
+		WellBufferMe(TargetAlpha, &Alpha, &AlphaSpeed, 0.15f, 0.07f, true);
+
+	Source.z = TargetCoors.z + Sin(Alpha + AlphaOffset)*Length + m_fCloseInCarHeightOffset;
+	AlphaOffset -= AlphaDec;
+}
+
+// Rotate cam behind the car when the car is moving forward
+bool
+CCam::RotCamIfInFrontCar(CVector &TargetCoors, float TargetOrientation)
+{
+	float BetaMaxSpeed = 0.15f;
+	float BetaAcceleration = 0.007f;
+	bool MovingForward = false;
+	float MaxDiffBeta = DEGTORAD(160.0f);
+	CPhysical *phys = (CPhysical*)CamTargetEntity;
+
+	float ForwardSpeed = DotProduct(phys->GetForward(), phys->GetSpeed(CVector(0.0f, 0.0f, 0.0f)));
+	if(ForwardSpeed > 0.02f)
+		MovingForward = true;
+
+	if(phys->IsVehicle() && (phys->GetModelIndex() == MI_SPARROW || phys->GetModelIndex() == MI_HUNTER)){
+		MaxDiffBeta = DEGTORAD(160.0f);
+		BetaMaxSpeed = 0.1f;
+		BetaAcceleration = 0.003f;
+		CVector speed = phys->GetSpeed(CVector(0.0f, 0.0f, 0.0f));
+		speed.z = 0.0f;
+		if(50.0f*speed.Magnitude() > 3.13f)
+			TargetOrientation = CGeneral::GetATanOfXY(speed.x, speed.y);
+	}
+
+	float Dist = (Source - TargetCoors).Magnitude2D();
+
+	float DeltaBeta = TargetOrientation - Beta;
+	while(DeltaBeta >= PI) DeltaBeta -= 2*PI;
+	while(DeltaBeta < -PI) DeltaBeta += 2*PI;
+
+	if(Abs(DeltaBeta) > PI-MaxDiffBeta && MovingForward && TheCamera.m_uiTransitionState == 0)
+		m_bFixingBeta = true;
+
+	CPad *pad = CPad::GetPad(0);
+	if(!(pad->GetLookBehindForCar() || pad->GetLookBehindForPed() || pad->GetLookLeft() || pad->GetLookRight()))
+		if(DirectionWasLooking != LOOKING_FORWARD)
+			TheCamera.m_bCamDirectlyBehind = true;
+
+	if(!m_bFixingBeta && !TheCamera.m_bUseTransitionBeta && !TheCamera.m_bCamDirectlyBehind && !TheCamera.m_bCamDirectlyInFront)
+		return false;
+
+	bool SetBeta = false;
+	if(TheCamera.m_bCamDirectlyBehind || TheCamera.m_bCamDirectlyInFront || TheCamera.m_bUseTransitionBeta)
+		if(&TheCamera.Cams[TheCamera.ActiveCam] == this)
+			SetBeta = true;
+
+	if(m_bFixingBeta || SetBeta){
+		WellBufferMe(TargetOrientation, &Beta, &BetaSpeed, BetaMaxSpeed, BetaAcceleration, true);
+
+		if(TheCamera.m_bCamDirectlyBehind && &TheCamera.Cams[TheCamera.ActiveCam] == this)
+			Beta = TargetOrientation;
+		if(TheCamera.m_bCamDirectlyInFront && &TheCamera.Cams[TheCamera.ActiveCam] == this)
+			Beta = TargetOrientation + PI;
+		if(TheCamera.m_bUseTransitionBeta && &TheCamera.Cams[TheCamera.ActiveCam] == this)
+			Beta = m_fTransitionBeta;
+
+		Source.x = TargetCoors.x - Cos(Beta)*Dist;
+		Source.y = TargetCoors.y - Sin(Beta)*Dist;
+
+		// Check if we're done
+		DeltaBeta = TargetOrientation - Beta;
+		while(DeltaBeta >= PI) DeltaBeta -= 2*PI;
+		while(DeltaBeta < -PI) DeltaBeta += 2*PI;
+		if(Abs(DeltaBeta) < DEGTORAD(2.0f))
+			m_bFixingBeta = false;
+	}
+	TheCamera.m_bCamDirectlyBehind = false;
+	TheCamera.m_bCamDirectlyInFront = false;
+	return true;
+}
+
+float FIRETRUCK_TRACKING_MULT = 0.1f;
+float fTestShiftHeliCamTarget = 0.6f;
+float TiltTopSpeed[] = { 0.035f, 0.035f, 0.001f, 0.005f, 0.035f };
+float TiltSpeedStep[] = { 0.016f, 0.016f, 0.0002f, 0.0014f, 0.016f };
+float TiltOverShoot[] = { 1.05f, 1.05f, 0.0f, 0.0f, 1.0f };
+
+void
+CCam::Process_Cam_On_A_String(const CVector &CameraTarget, float TargetOrientation, float, float)
+{
+	if(!CamTargetEntity->IsVehicle())
+		return;
+
+	// unused
+	// ((CVehicle*)CamTargetEntity)->GetVehicleAppearance();
+
+	FOV = DefaultFOV;
+
+	if(ResetStatics){
+		AlphaSpeed = 0.0f;
+		m_fTilt = 0.0f;
+		m_fTiltSpeed = 0.0;
+	}
+
+	CBaseModelInfo *mi = CModelInfo::GetModelInfo(CamTargetEntity->GetModelIndex());
+	CVector Dimensions = mi->GetColModel()->boundingBox.max - mi->GetColModel()->boundingBox.min;
+	CVector TargetCoors = CameraTarget;
+	float BaseDist = Dimensions.Magnitude();
+
+	if(((CVehicle*)CamTargetEntity)->IsBike())
+		BaseDist *= 1.45f;
+	if(((CVehicle*)CamTargetEntity)->GetVehicleAppearance() == VEHICLE_APPEARANCE_HELI &&
+	   CamTargetEntity->GetStatus() != STATUS_PLAYER_REMOTE)
+		TargetCoors += fTestShiftHeliCamTarget * CamTargetEntity->GetUp() * Dimensions.z;
+	else
+		TargetCoors.z += 0.8f*Dimensions.z;
+
+	Beta = CGeneral::GetATanOfXY(TargetCoors.x - Source.x, TargetCoors.y - Source.y);
+	Alpha = CGeneral::LimitRadianAngle(Alpha);
+	Beta = CGeneral::LimitRadianAngle(Beta);
+
+	if(CamTargetEntity->GetModelIndex() == MI_FIRETRUCK && CPad::GetPad(0)->GetCarGunFired() &&
+	   ((CVehicle*)CamTargetEntity)->m_vecMoveSpeed.Magnitude2D() < 0.01f){
+		float TargetBeta = CamTargetEntity->GetForward().Heading() - ((CAutomobile*)CamTargetEntity)->m_fCarGunLR + HALFPI;
+		TargetBeta = CGeneral::LimitRadianAngle(TargetBeta);
+		float DeltaBeta = TargetBeta - Beta;
+		if(DeltaBeta > PI) DeltaBeta -= TWOPI;
+		else if(DeltaBeta < -PI) DeltaBeta += TWOPI;
+		float dist = (TargetCoors - Source).Magnitude();
+		dist = FIRETRUCK_TRACKING_MULT*dist*clamp(DeltaBeta, -0.8f, 0.8f);
+		Source += dist*CrossProduct(Front, CVector(0.0f, 0.0f, 1.0f));
+	}
+
+	m_fDistanceBeforeChanges = (Source - TargetCoors).Magnitude2D();
+
+	Cam_On_A_String_Unobscured(TargetCoors, BaseDist);
+	WorkOutCamHeight(TargetCoors, TargetOrientation, Dimensions.z);
+	RotCamIfInFrontCar(TargetCoors, TargetOrientation);
+	FixCamWhenObscuredByVehicle(TargetCoors);
+
+	m_cvecTargetCoorsForFudgeInter = TargetCoors;
+	CVector OrigSource = Source;
+	if(CWorld::GetIsLineOfSightClear(CamTargetEntity->GetPosition(), m_cvecTargetCoorsForFudgeInter, true, false, false, true, false, false, true))
+		TheCamera.AvoidTheGeometry(OrigSource, m_cvecTargetCoorsForFudgeInter, Source, FOV);
+	else
+		TheCamera.AvoidTheGeometry(OrigSource, CamTargetEntity->GetPosition(), Source, FOV);
+
+	Front = TargetCoors - Source;
+	Front.Normalise();
+
+	int appearance = ((CVehicle*)CamTargetEntity)->GetVehicleAppearance();
+	int index = 0;
+	TheCamera.GetArrPosForVehicleType(appearance, index);
+
+	if(appearance == VEHICLE_APPEARANCE_HELI){
+		float TargetTilt = DotProduct(Front, ((CVehicle*)CamTargetEntity)->GetSpeed(CVector(0.0f, 0.0f, 0.0f)));
+		CVector UpTarget = CamTargetEntity->GetUp();
+		UpTarget.Normalise();
+		int dir = TargetTilt < 0.0f ? -1 : 1;
+		if(m_fTilt != 0.0f)
+			TargetTilt += TiltOverShoot[index]*TargetTilt/m_fTilt * dir;
+		WellBufferMe(TargetTilt, &m_fTilt, &m_fTiltSpeed, TiltTopSpeed[index], TiltSpeedStep[index], false);
+
+		Up = CVector(0.0f, 0.0f, 1.0f) - (CVector(0.0f, 0.0f, 1.0f) - UpTarget)*m_fTilt;
+		Up.Normalise();
+		Front.Normalise();
+		CVector Left = CrossProduct(Up, Front);
+		Up = CrossProduct(Front, Left);
+		Up.Normalise();
+	}else{
+		float TargetRoll;
+		if(CPad::GetPad(0)->GetDPadLeft() || CPad::GetPad(0)->GetDPadRight()){
+			float fwdSpeed = 180.0f*DotProduct(((CVehicle*)CamTargetEntity)->m_vecMoveSpeed, CamTargetEntity->GetForward());
+			if(fwdSpeed > 210.0f) fwdSpeed = 210.0f;
+			if(CPad::GetPad(0)->GetDPadLeft())
+				TargetRoll = DEGTORAD(10.0f)*TiltOverShoot[index] + f_max_role_angle;
+			else
+				TargetRoll = -(DEGTORAD(10.0f)*TiltOverShoot[index] + f_max_role_angle);
+			CVector FwdTarget = CamTargetEntity->GetForward();
+			FwdTarget.Normalise();
+			float AngleDiff = DotProduct(FwdTarget, Front);
+			AngleDiff = Acos(Min(Abs(AngleDiff), 1.0f));
+			TargetRoll *= fwdSpeed/210.0f * Sin(AngleDiff);
+		}else{
+			float fwdSpeed = 180.0f*DotProduct(((CVehicle*)CamTargetEntity)->m_vecMoveSpeed, CamTargetEntity->GetForward());
+			if(fwdSpeed > 210.0f) fwdSpeed = 210.0f;
+			TargetRoll = CPad::GetPad(0)->GetLeftStickX()/128.0f * fwdSpeed/210.0f;
+			CVector FwdTarget = CamTargetEntity->GetForward();
+			FwdTarget.Normalise();
+			float AngleDiff = DotProduct(FwdTarget, Front);
+			AngleDiff = Acos(Min(Abs(AngleDiff), 1.0f));
+			TargetRoll *= (DEGTORAD(10.0f)*TiltOverShoot[index] + f_max_role_angle) * Sin(AngleDiff);
+		}
+
+		WellBufferMe(TargetRoll, &f_Roll, &f_rollSpeed, 0.15f, 0.07f, false);
+		Up = CVector(Cos(f_Roll + HALFPI), 0.0f, Sin(f_Roll + HALFPI));
+		Up.Normalise();
+		Front.Normalise();
+		CVector Left = CrossProduct(Up, Front);
+		Left.Normalise();
+		Up = CrossProduct(Front, Left);
+		Up.Normalise();
+	}
+
+	ResetStatics = false;
+}
+
+// Basic Cam on a string algorithm
+void
+CCam::Cam_On_A_String_Unobscured(const CVector &TargetCoors, float BaseDist)
+{
+	int id = CamTargetEntity->GetModelIndex();
+	float ExtraDist = 0.0f;
+	if(id == MI_RCRAIDER || id == MI_RCGOBLIN)
+		ExtraDist = INIT_RC_HELI_HORI_EXTRA;
+	else if(id == MI_RCBARON)
+		ExtraDist = INIT_RC_PLANE_HORI_EXTRA;
+
+	CA_MAX_DISTANCE = BaseDist + 0.1f + TheCamera.CarZoomValueSmooth + ExtraDist;
+	CA_MIN_DISTANCE = Min(BaseDist*0.6f, 3.5f);
+	if(CA_MIN_DISTANCE > CA_MAX_DISTANCE)
+		CA_MIN_DISTANCE = CA_MAX_DISTANCE - 0.05f;
+
+	CVector Dist = Source - TargetCoors;
+
+	if(ResetStatics)
+		Source = TargetCoors + Dist*(CA_MAX_DISTANCE + 1.0f);
+
+	Dist = Source - TargetCoors;
+
+	float Length = Dist.Magnitude2D();
+	if(Length < 0.001f){
+		// This probably shouldn't happen. reset view
+		CVector Forward = CamTargetEntity->GetForward();
+		Forward.z = 0.0f;
+		Forward.Normalise();
+		Source = TargetCoors - Forward*CA_MAX_DISTANCE;
+		Dist = Source - TargetCoors;
+		Length = Dist.Magnitude2D();
+	}
+
+	if(Length > CA_MAX_DISTANCE){
+		Source.x = TargetCoors.x + Dist.x/Length * CA_MAX_DISTANCE;
+		Source.y = TargetCoors.y + Dist.y/Length * CA_MAX_DISTANCE;
+	}else if(Length < CA_MIN_DISTANCE){
+		Source.x = TargetCoors.x + Dist.x/Length * CA_MIN_DISTANCE;
+		Source.y = TargetCoors.y + Dist.y/Length * CA_MIN_DISTANCE;
+	}
+}
+
+void
+CCam::FixCamWhenObscuredByVehicle(const CVector &TargetCoors)
+{
+	// BUG? is this never reset
+	static float HeightFixerCarsObscuring = 0.0f;
+	static float HeightFixerCarsObscuringSpeed = 0.0f;
+	CColPoint colPoint;
+	CEntity *entity = nil;
+
+	float HeightTarget = 0.0f;
+	if(CWorld::ProcessLineOfSight(TargetCoors, Source, colPoint, entity, false, true, false, false, false, false, false)){
+		CBaseModelInfo *mi = CModelInfo::GetModelInfo(entity->GetModelIndex());
+		HeightTarget = mi->GetColModel()->boundingBox.max.z + 1.0f + TargetCoors.z - Source.z;
+		if(HeightTarget < 0.0f)
+			HeightTarget = 0.0f;
+	}
+	WellBufferMe(HeightTarget, &HeightFixerCarsObscuring, &HeightFixerCarsObscuringSpeed, 0.2f, 0.025f, false);
+	Source.z += HeightFixerCarsObscuring;
+}
+
+void
+CCam::Process_TopDown(const CVector &CameraTarget, float TargetOrientation, float SpeedVar, float TargetSpeedVar)
+{
+	FOV = DefaultFOV;
+
+	if(!CamTargetEntity->IsVehicle())
+		return;
+
+	float Dist;
+	float HeightTarget = 0.0f;
+	static float AdjustHeightTargetMoveBuffer = 0.0f;
+	static float AdjustHeightTargetMoveSpeed = 0.0f;
+	static float NearClipDistance = 1.5f;
+	const float FarClipDistance = 200.0f;
+	CVector TargetFront, Target;
+	CVector TestSource, TestTarget;
+	CColPoint colPoint;
+	CEntity *entity;
+
+	TargetFront = CameraTarget;
+	TargetFront.x += 18.0f*CamTargetEntity->GetForward().x*SpeedVar;
+	TargetFront.y += 18.0f*CamTargetEntity->GetForward().y*SpeedVar;
+
+	if(ResetStatics){
+		AdjustHeightTargetMoveBuffer = 0.0f;
+		AdjustHeightTargetMoveSpeed = 0.0f;
+	}
+
+	float f = Pow(0.8f, 4.0f);
+	Target = f*CameraTarget + (1.0f-f)*TargetFront;
+	if(Mode == MODE_GTACLASSIC)
+		SpeedVar = TargetSpeedVar;
+	Source = Target + CVector(0.0f, 0.0f, (40.0f*SpeedVar + 30.0f)*0.8f);
+	// What is this? looks horrible
+	if(Mode == MODE_GTACLASSIC)
+		Source.x += (uint8)(100.0f*CameraTarget.x)/500.0f;
+
+	TestSource = Source;
+	TestTarget = TestSource;
+	TestTarget.z = Target.z;
+	if(CWorld::ProcessLineOfSight(TestTarget, TestSource, colPoint, entity, true, false, false, false, false, false, false)){
+		if(Source.z < colPoint.point.z+3.0f)
+			HeightTarget = colPoint.point.z+3.0f - Source.z;
+	}else{
+		TestSource = Source;
+		TestTarget = TestSource;
+		TestTarget.z += 10.0f;
+		if(CWorld::ProcessLineOfSight(TestTarget, TestSource, colPoint, entity, true, false, false, false, false, false, false))
+			if(Source.z < colPoint.point.z+3.0f)
+				HeightTarget = colPoint.point.z+3.0f - Source.z;
+	}
+	WellBufferMe(HeightTarget, &AdjustHeightTargetMoveBuffer, &AdjustHeightTargetMoveSpeed, 0.2f, 0.02f, false);
+	Source.z += AdjustHeightTargetMoveBuffer;
+
+	if(RwCameraGetFarClipPlane(Scene.camera) > FarClipDistance)
+		RwCameraSetFarClipPlane(Scene.camera, FarClipDistance);
+	RwCameraSetNearClipPlane(Scene.camera, NearClipDistance);
+
+	Front = CVector(-0.01f, -0.01f, -1.0f);	// look down
+	Front.Normalise();
+	Dist = (Source - CameraTarget).Magnitude();
+	m_cvecTargetCoorsForFudgeInter = Dist*Front + Source;
+	Up = CVector(0.0f, 1.0f, 0.0f);
+
+	ResetStatics = false;
+}
+
+void
+CCam::AvoidWallsTopDownPed(const CVector &TargetCoors, const CVector &Offset, float *Adjuster, float *AdjusterSpeed, float yDistLimit)
+{
+	float Target = 0.0f;
+	float MaxSpeed = 0.13f;
+	float Acceleration = 0.015f;
+	float SpeedMult;
+	float dy;
+	CVector TestPoint2;
+	CVector TestPoint1;
+	CColPoint colPoint;
+	CEntity *entity;
+
+	TestPoint2 = TargetCoors + Offset;
+	TestPoint1 = TargetCoors;
+	TestPoint1.z = TestPoint2.z;
+	if(CWorld::ProcessLineOfSight(TestPoint1, TestPoint2, colPoint, entity, true, false, false, false, false, false, false)){
+		// What is this even?
+		dy = TestPoint1.y - colPoint.point.y;
+		if(dy > yDistLimit)
+			dy = yDistLimit;
+		SpeedMult = yDistLimit - Abs(dy/yDistLimit);
+
+		Target = 2.5f;
+		MaxSpeed += SpeedMult*0.3f;
+		Acceleration += SpeedMult*0.03f;
+	}
+	WellBufferMe(Target, Adjuster, AdjusterSpeed, MaxSpeed, Acceleration, false);
+}
+
+void
+CCam::Process_TopDownPed(const CVector &CameraTarget, float TargetOrientation, float, float)
+{
+	if(!CamTargetEntity->IsPed())
+		return;
+
+	float Dist;
+	float HeightTarget;
+	static int NumPedPosCountsSoFar = 0;
+	static float PedAverageSpeed = 0.0f;
+	static float AdjustHeightTargetMoveBuffer = 0.0f;
+	static float AdjustHeightTargetMoveSpeed = 0.0f;
+	static float PedSpeedSoFar = 0.0f;
+	static float FarClipDistance = 200.0f;
+	static float NearClipDistance = 1.5f;
+	static float TargetAdjusterForSouth = 0.0f;
+	static float TargetAdjusterSpeedForSouth = 0.0f;
+	static float TargetAdjusterForNorth = 0.0f;
+	static float TargetAdjusterSpeedForNorth = 0.0f;
+	static float TargetAdjusterForEast = 0.0f;
+	static float TargetAdjusterSpeedForEast = 0.0f;
+	static float TargetAdjusterForWest = 0.0f;
+	static float TargetAdjusterSpeedForWest = 0.0f;
+	static CVector PreviousPlayerMoveSpeedVec;
+	CVector TargetCoors, PlayerMoveSpeed;
+	CVector TestSource, TestTarget;
+	CColPoint colPoint;
+	CEntity *entity;
+
+	FOV = DefaultFOV;
+	TargetCoors = CameraTarget;
+	PlayerMoveSpeed = ((CPed*)CamTargetEntity)->GetMoveSpeed();
+
+	if(ResetStatics){
+		PreviousPlayerMoveSpeedVec = PlayerMoveSpeed;
+		AdjustHeightTargetMoveBuffer = 0.0f;
+		AdjustHeightTargetMoveSpeed = 0.0f;
+		NumPedPosCountsSoFar = 0;
+		PedSpeedSoFar = 0.0f;
+		PedAverageSpeed = 0.0f;
+		TargetAdjusterForWest = 0.0f;
+		TargetAdjusterSpeedForWest = 0.0f;
+		TargetAdjusterForEast = 0.0f;
+		TargetAdjusterSpeedForEast = 0.0f;
+		TargetAdjusterForNorth = 0.0f;
+		TargetAdjusterSpeedForNorth = 0.0f;
+		TargetAdjusterForSouth = 0.0f;
+		TargetAdjusterSpeedForSouth = 0.0f;
+	}
+
+	if(RwCameraGetFarClipPlane(Scene.camera) > FarClipDistance)
+		RwCameraSetFarClipPlane(Scene.camera, FarClipDistance);
+	RwCameraSetNearClipPlane(Scene.camera, NearClipDistance);
+
+	// Average ped speed
+	NumPedPosCountsSoFar++;
+	PedSpeedSoFar += PlayerMoveSpeed.Magnitude();
+	if(NumPedPosCountsSoFar == 5){
+		PedAverageSpeed = 0.4f*PedAverageSpeed + 0.6*(PedSpeedSoFar/5.0f);
+		NumPedPosCountsSoFar = 0;
+		PedSpeedSoFar = 0.0f;
+	}
+	PreviousPlayerMoveSpeedVec = PlayerMoveSpeed;
+
+	// Zoom out depending on speed
+	if(PedAverageSpeed > 0.01f && PedAverageSpeed <= 0.04f)
+		HeightTarget = 2.5f;
+	else if(PedAverageSpeed > 0.04f && PedAverageSpeed <= 0.145f)
+		HeightTarget = 4.5f;
+	else if(PedAverageSpeed > 0.145f)
+		HeightTarget = 7.0f;
+	else
+		HeightTarget = 0.0f;
+
+	// Zoom out if locked on target is far away
+	if(FindPlayerPed()->m_pPointGunAt){
+		Dist = (FindPlayerPed()->m_pPointGunAt->GetPosition() - CameraTarget).Magnitude2D();
+		if(Dist > 6.0f)
+			HeightTarget = Max(HeightTarget, Dist/22.0f*37.0f);
+	}
+
+	Source = TargetCoors + CVector(0.0f, -1.0f, 9.0f);
+
+	// Collision checks
+	entity = nil;
+	TestSource = TargetCoors + CVector(0.0f, -1.0f, 9.0f);
+	TestTarget = TestSource;
+	TestTarget.z = TargetCoors.z;
+	if(CWorld::ProcessLineOfSight(TestTarget, TestSource, colPoint, entity, true, false, false, false, false, false, false)){
+		if(TargetCoors.z+9.0f+HeightTarget < colPoint.point.z+3.0f)
+			HeightTarget = colPoint.point.z+3.0f - (TargetCoors.z+9.0f);
+	}else{
+		TestSource = TargetCoors + CVector(0.0f, -1.0f, 9.0f);
+		TestTarget = TestSource;
+		TestSource.z += HeightTarget;
+		TestTarget.z = TestSource.z + 10.0f;
+		if(CWorld::ProcessLineOfSight(TestTarget, TestSource, colPoint, entity, true, false, false, false, false, false, false)){
+			if(TargetCoors.z+9.0f+HeightTarget < colPoint.point.z+3.0f)
+				HeightTarget = colPoint.point.z+3.0f - (TargetCoors.z+9.0f);
+		}
+	}
+
+	WellBufferMe(HeightTarget, &AdjustHeightTargetMoveBuffer, &AdjustHeightTargetMoveSpeed, 0.3f, 0.03f, false);
+	Source.z += AdjustHeightTargetMoveBuffer;
+
+	// Wall checks
+	AvoidWallsTopDownPed(TargetCoors, CVector(0.0f, -3.0f, 3.0f), &TargetAdjusterForSouth, &TargetAdjusterSpeedForSouth, 1.0f);
+	Source.y += TargetAdjusterForSouth;
+	AvoidWallsTopDownPed(TargetCoors, CVector(0.0f, 3.0f, 3.0f), &TargetAdjusterForNorth, &TargetAdjusterSpeedForNorth, 1.0f);
+	Source.y -= TargetAdjusterForNorth;
+	// BUG: east and west flipped
+	AvoidWallsTopDownPed(TargetCoors, CVector(3.0f, 0.0f, 3.0f), &TargetAdjusterForWest, &TargetAdjusterSpeedForWest, 1.0f);
+	Source.x -= TargetAdjusterForWest;
+	AvoidWallsTopDownPed(TargetCoors, CVector(-3.0f, 0.0f, 3.0f), &TargetAdjusterForEast, &TargetAdjusterSpeedForEast, 1.0f);
+	Source.x += TargetAdjusterForEast;
+
+	TargetCoors.y = Source.y + 1.0f;
+	TargetCoors.y += TargetAdjusterForSouth;
+	TargetCoors.x += TargetAdjusterForEast;
+	TargetCoors.x -= TargetAdjusterForWest;
+
+	Front = TargetCoors - Source;
+	Front.Normalise();
+#ifdef FIX_BUGS
+	if(Front.x == 0.0f && Front.y == 0.0f)
+		Front.y = 0.0001f;
+#else
+	// someone used = instead of == in the above check by accident
+	Front.x = 0.0f;
+#endif
+	m_cvecTargetCoorsForFudgeInter = TargetCoors;
+	Up = CrossProduct(Front, CVector(-1.0f, 0.0f, 0.0f));
+	Up.Normalise();
+
+	ResetStatics = false;
+}
+
+void
+CCam::Process_Rocket(const CVector &CameraTarget, float, float, float)
+{
+	if(!CamTargetEntity->IsPed())
+		return;
+
+	float BackOffset = 0.19f;
+	static bool FailedTestTwelveFramesAgo = false;
+	RwV3d HeadPos;
+	CVector TargetCoors;
+
+	FOV = DefaultFOV;
+	TargetCoors = CameraTarget;
+
+	if(ResetStatics){
+		Beta = ((CPed*)CamTargetEntity)->m_fRotationCur + HALFPI;
+		Alpha = 0.0f;
+		m_fInitialPlayerOrientation = ((CPed*)CamTargetEntity)->m_fRotationCur + HALFPI;
+		FailedTestTwelveFramesAgo = false;
+		// static DPadVertical unused
+		// static DPadHorizontal unused
+		m_bCollisionChecksOn = true;
+		ResetStatics = false;
+	}
+
+	if(((CPed*)CamTargetEntity)->bIsDucking)
+		BackOffset = 0.8f;
+	CamTargetEntity->GetMatrix().UpdateRW();
+	CamTargetEntity->UpdateRwFrame();
+	CamTargetEntity->UpdateRpHAnim();
+	((CPed*)CamTargetEntity)->m_pedIK.GetComponentPosition(HeadPos, PED_HEAD);
+	Source = HeadPos;
+	Source.z += 0.1f;
+	Source.x -= BackOffset*Cos(m_fInitialPlayerOrientation);
+	Source.y -= BackOffset*Sin(m_fInitialPlayerOrientation);
+
+	// 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){
+		UseMouse = true;
+		LookLeftRight = -3.0f*MouseX;
+		LookUpDown = 4.0f*MouseY;
+	}else{
+		LookLeftRight = -CPad::GetPad(0)->SniperModeLookLeftRight();
+		LookUpDown = CPad::GetPad(0)->SniperModeLookUpDown();
+	}
+	if(UseMouse){
+		Beta += TheCamera.m_fMouseAccelHorzntl * LookLeftRight * FOV/80.0f;
+		Alpha += TheCamera.m_fMouseAccelVertical * LookUpDown * FOV/80.0f;
+	}else{
+		float xdir = LookLeftRight < 0.0f ? -1.0f : 1.0f;
+		float ydir = LookUpDown < 0.0f ? -1.0f : 1.0f;
+		Beta += SQR(LookLeftRight/100.0f)*xdir*0.8f/14.0f * FOV/80.0f * CTimer::GetTimeStep();
+		Alpha += SQR(LookUpDown/150.0f)*ydir*1.0f/14.0f * FOV/80.0f * CTimer::GetTimeStep();
+	}
+	while(Beta >= PI) Beta -= 2*PI;
+	while(Beta < -PI) Beta += 2*PI;
+	if(Alpha > DEGTORAD(60.0f)) Alpha = DEGTORAD(60.0f);
+	else if(Alpha < -DEGTORAD(89.5f)) Alpha = -DEGTORAD(89.5f);
+
+	TargetCoors.x = 3.0f * Cos(Alpha) * Cos(Beta) + Source.x;
+	TargetCoors.y = 3.0f * Cos(Alpha) * Sin(Beta) + Source.y;
+	TargetCoors.z = 3.0f * Sin(Alpha) + Source.z;
+	Front = TargetCoors - Source;
+	Front.Normalise();
+	Source += Front*0.4f;
+
+	if(m_bCollisionChecksOn){
+		if(!CWorld::GetIsLineOfSightClear(TargetCoors, Source, true, true, false, true, false, true, true)){
+			RwCameraSetNearClipPlane(Scene.camera, 0.4f);
+			FailedTestTwelveFramesAgo = true;
+		}else{
+			CVector TestPoint;
+			TestPoint.x = 3.0f * Cos(Alpha - DEGTORAD(20.0f)) * Cos(Beta + DEGTORAD(35.0f)) + Source.x;
+			TestPoint.y = 3.0f * Cos(Alpha - DEGTORAD(20.0f)) * Sin(Beta + DEGTORAD(35.0f)) + Source.y;
+			TestPoint.z = 3.0f * Sin(Alpha - DEGTORAD(20.0f)) + Source.z;
+			if(!CWorld::GetIsLineOfSightClear(TestPoint, Source, true, true, false, true, false, true, true)){
+				RwCameraSetNearClipPlane(Scene.camera, 0.4f);
+				FailedTestTwelveFramesAgo = true;
+			}else{
+				TestPoint.x = 3.0f * Cos(Alpha - DEGTORAD(20.0f)) * Cos(Beta - DEGTORAD(35.0f)) + Source.x;
+				TestPoint.y = 3.0f * Cos(Alpha - DEGTORAD(20.0f)) * Sin(Beta - DEGTORAD(35.0f)) + Source.y;
+				TestPoint.z = 3.0f * Sin(Alpha - DEGTORAD(20.0f)) + Source.z;
+				if(!CWorld::GetIsLineOfSightClear(TestPoint, Source, true, true, false, true, false, true, true)){
+					RwCameraSetNearClipPlane(Scene.camera, 0.4f);
+					FailedTestTwelveFramesAgo = true;
+				}else
+					FailedTestTwelveFramesAgo = false;
+			}
+		}
+	}
+
+	if(FailedTestTwelveFramesAgo)
+		RwCameraSetNearClipPlane(Scene.camera, 0.4f);
+	Source -= Front*0.4f;
+
+	GetVectorsReadyForRW();
+	float Rotation = CGeneral::GetATanOfXY(Front.x, Front.y) - HALFPI;
+	((CPed*)TheCamera.pTargetEntity)->m_fRotationCur = Rotation;
+	((CPed*)TheCamera.pTargetEntity)->m_fRotationDest = Rotation;
+}
+
+float fDuckingBackOffset = 0.5f;
+float fDuckingRightOffset = 0.18f;
+
+void
+CCam::Process_M16_1stPerson(const CVector &CameraTarget, float, float, float)
+{
+	if(!CamTargetEntity->IsPed())
+		return;
+
+	float BackOffset = 0.3f;
+	static bool FailedTestTwelveFramesAgo = false;
+	RwV3d HeadPos;
+	CVector TargetCoors;
+
+	bool isAttached = ((CPed*)CamTargetEntity)->IsPlayer() && ((CPed*)CamTargetEntity)->m_attachedTo;
+
+	FOV = DefaultFOV;
+	TargetCoors = CameraTarget;
+
+	if(ResetStatics){
+		if(isAttached)
+			Beta = 0.0f;
+		else
+			Beta = ((CPed*)CamTargetEntity)->m_fRotationCur + HALFPI;
+		Alpha = 0.0f;
+		m_fInitialPlayerOrientation = ((CPed*)CamTargetEntity)->m_fRotationCur + HALFPI;
+		FailedTestTwelveFramesAgo = false;
+		// static DPadVertical unused
+		// static DPadHorizontal unused
+		m_bCollisionChecksOn = true;
+		ResetStatics = false;
+	}
+
+	// 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){
+		UseMouse = true;
+		LookLeftRight = -3.0f*MouseX;
+		LookUpDown = 4.0f*MouseY;
+	}else{
+		LookLeftRight = -CPad::GetPad(0)->SniperModeLookLeftRight();
+		LookUpDown = CPad::GetPad(0)->SniperModeLookUpDown();
+	}
+	if(UseMouse){
+		Beta += TheCamera.m_fMouseAccelHorzntl * LookLeftRight * FOV/80.0f;
+		Alpha += TheCamera.m_fMouseAccelVertical * LookUpDown * FOV/80.0f;
+	}else if(Mode == MODE_HELICANNON_1STPERSON){
+		LookLeftRight /= 128.0f;
+		LookUpDown /= 128.0f;
+		Beta += LookLeftRight*Abs(LookLeftRight)*0.56f/14.0f * FOV/80.0f * CTimer::GetTimeStep();
+		Alpha += LookUpDown*Abs(LookUpDown)*0.48f/14.0f * FOV/80.0f * CTimer::GetTimeStep();
+	}else{
+		float xdir = LookLeftRight < 0.0f ? -1.0f : 1.0f;
+		float ydir = LookUpDown < 0.0f ? -1.0f : 1.0f;
+		Beta += SQR(LookLeftRight/100.0f)*xdir*0.8f/14.0f * FOV/80.0f * CTimer::GetTimeStep();
+		Alpha += SQR(LookUpDown/150.0f)*ydir*1.0f/14.0f * FOV/80.0f * CTimer::GetTimeStep();
+	}
+	if (!isAttached) {
+		while(Beta >= TWOPI) Beta -= TWOPI;
+		while(Beta < 0) Beta += TWOPI;
+	}
+	if(Alpha > DEGTORAD(60.0f)) Alpha = DEGTORAD(60.0f);
+	else if(Alpha < -DEGTORAD(89.5f)) Alpha = -DEGTORAD(89.5f);
+
+	if(((CPed*)CamTargetEntity)->bIsDucking)
+		BackOffset = 0.8f;
+	if(isAttached){
+		CMatrix mat, rot;
+		CPed *TargetPed = (CPed*)CamTargetEntity;
+		TargetPed->PositionAttachedPed();
+		CamTargetEntity->GetMatrix().UpdateRW();
+		CamTargetEntity->UpdateRwFrame();
+		CamTargetEntity->UpdateRpHAnim();
+
+		HeadPos.x = 0.0f;
+		HeadPos.y = 0.0f;
+		HeadPos.z = 0.0f;
+		TargetPed->m_pedIK.GetComponentPosition(HeadPos, PED_HEAD);
+		Source = HeadPos;
+		Source += 0.1f*CamTargetEntity->GetUp();
+		Source -= BackOffset*CamTargetEntity->GetForward();
+
+		if(TargetPed->m_attachRotStep < PI){
+			if(Beta > TargetPed->m_attachRotStep){
+				Beta = TargetPed->m_attachRotStep;
+				CAutomobile *heli = (CAutomobile*)TargetPed->m_attachedTo;
+				if(heli->IsVehicle() && heli->IsCar() && heli->IsRealHeli() && heli->m_fHeliOrientation > 0.0f){
+					float heliOrient = heli->m_fHeliOrientation + CTimer::GetTimeStep()*0.01f;
+					if(heliOrient < 0.0f) heliOrient += TWOPI;
+					else if(heliOrient > TWOPI) heliOrient -= TWOPI;
+					heli->SetHeliOrientation(heliOrient);
+				}
+			}else if(Beta < -TargetPed->m_attachRotStep){
+				Beta = -TargetPed->m_attachRotStep;
+				CAutomobile *heli = (CAutomobile*)TargetPed->m_attachedTo;
+				if(heli->IsVehicle() && heli->IsCar() && heli->IsRealHeli() && heli->m_fHeliOrientation > 0.0f){
+					float heliOrient = heli->m_fHeliOrientation - CTimer::GetTimeStep()*0.01f;
+					if(heliOrient < 0.0f) heliOrient += TWOPI;
+					else if(heliOrient > TWOPI) heliOrient -= TWOPI;
+					heli->SetHeliOrientation(heliOrient);
+				}
+			}
+		}else{
+			while(Beta < -PI) Beta += TWOPI;
+			while(Beta >= PI) Beta -= TWOPI;
+		}
+
+		mat = TargetPed->m_attachedTo->GetMatrix();
+		rot.SetRotateX(Alpha);
+		switch(TargetPed->m_attachType){
+		case 0: rot.RotateZ(Beta); break;
+		case 1: rot.RotateZ(Beta + HALFPI); break;
+		case 2: rot.RotateZ(Beta + PI); break;
+		case 3: rot.RotateZ(Beta - HALFPI); break;
+		}
+		mat = mat * rot;
+		Front = mat.GetForward();
+		Up = mat.GetUp();
+		TargetCoors = Source + 3.0f*Front;
+		RwCameraSetNearClipPlane(Scene.camera, 0.4f);
+
+		float Rotation = CGeneral::GetATanOfXY(Front.x, Front.y) - HALFPI;
+		((CPed*)TheCamera.pTargetEntity)->m_fRotationCur = Rotation;
+		((CPed*)TheCamera.pTargetEntity)->m_fRotationDest = Rotation;
+	}else{
+		CamTargetEntity->GetMatrix().UpdateRW();
+		CamTargetEntity->UpdateRwFrame();
+		CamTargetEntity->UpdateRpHAnim();
+		HeadPos.x = 0.0f;
+		HeadPos.y = 0.0f;
+		HeadPos.z = 0.0f;
+		((CPed*)CamTargetEntity)->m_pedIK.GetComponentPosition(HeadPos, PED_HEAD);
+		Source = HeadPos;
+		Source.z += 0.1f;
+		if(((CPed*)CamTargetEntity)->bIsDucking){
+			Source.x -= fDuckingBackOffset*CamTargetEntity->GetForward().x;
+			Source.y -= fDuckingBackOffset*CamTargetEntity->GetForward().y;
+			Source.x -= fDuckingRightOffset*CamTargetEntity->GetRight().x;
+			Source.y -= fDuckingRightOffset*CamTargetEntity->GetRight().y;
+		}else{
+			Source.x -= BackOffset*CamTargetEntity->GetForward().x;
+			Source.y -= BackOffset*CamTargetEntity->GetForward().y;
+		}
+
+		TargetCoors.x = 3.0f * Cos(Alpha) * Cos(Beta) + Source.x;
+		TargetCoors.y = 3.0f * Cos(Alpha) * Sin(Beta) + Source.y;
+		TargetCoors.z = 3.0f * Sin(Alpha) + Source.z;
+		Front = TargetCoors - Source;
+		Front.Normalise();
+		Source += Front*0.4f;
+
+		if(m_bCollisionChecksOn){
+			if(!CWorld::GetIsLineOfSightClear(TargetCoors, Source, true, true, false, true, false, true, true)){
+				RwCameraSetNearClipPlane(Scene.camera, 0.4f);
+				FailedTestTwelveFramesAgo = true;
+			}else{
+				CVector TestPoint;
+				TestPoint.x = 3.0f * Cos(Alpha - DEGTORAD(20.0f)) * Cos(Beta + DEGTORAD(35.0f)) + Source.x;
+				TestPoint.y = 3.0f * Cos(Alpha - DEGTORAD(20.0f)) * Sin(Beta + DEGTORAD(35.0f)) + Source.y;
+				TestPoint.z = 3.0f * Sin(Alpha - DEGTORAD(20.0f)) + Source.z;
+				if(!CWorld::GetIsLineOfSightClear(TestPoint, Source, true, true, false, true, false, true, true)){
+					RwCameraSetNearClipPlane(Scene.camera, 0.4f);
+					FailedTestTwelveFramesAgo = true;
+				}else{
+					TestPoint.x = 3.0f * Cos(Alpha - DEGTORAD(20.0f)) * Cos(Beta - DEGTORAD(35.0f)) + Source.x;
+					TestPoint.y = 3.0f * Cos(Alpha - DEGTORAD(20.0f)) * Sin(Beta - DEGTORAD(35.0f)) + Source.y;
+					TestPoint.z = 3.0f * Sin(Alpha - DEGTORAD(20.0f)) + Source.z;
+					if(!CWorld::GetIsLineOfSightClear(TestPoint, Source, true, true, false, true, false, true, true)){
+						RwCameraSetNearClipPlane(Scene.camera, 0.4f);
+						FailedTestTwelveFramesAgo = true;
+					}else
+						FailedTestTwelveFramesAgo = false;
+				}
+			}
+		}
+
+		if(FailedTestTwelveFramesAgo)
+			RwCameraSetNearClipPlane(Scene.camera, 0.4f);
+		Source -= Front*0.4f;
+
+		GetVectorsReadyForRW();
+		float Rotation = CGeneral::GetATanOfXY(Front.x, Front.y) - HALFPI;
+		((CPed*)TheCamera.pTargetEntity)->m_fRotationCur = Rotation;
+		((CPed*)TheCamera.pTargetEntity)->m_fRotationDest = Rotation;
+	}
+}
+
+float fBike1stPersonOffsetZ = 0.15f;
+
+void
+CCam::Process_1stPerson(const CVector &CameraTarget, float TargetOrientation, float SpeedVar, float TargetSpeedVar)
+{
+	float BackOffset = 0.3f;
+	static float DontLookThroughWorldFixer = 0.0f;
+	CVector TargetCoors;
+
+	FOV = DefaultFOV;
+	TargetCoors = CameraTarget;
+	if(CamTargetEntity->m_rwObject == nil)
+		return;
+
+	if(ResetStatics){
+		Beta = TargetOrientation;
+		Alpha = 0.0f;
+		m_fInitialPlayerOrientation = TargetOrientation;
+		if(CamTargetEntity->IsPed()){
+			Beta = ((CPed*)CamTargetEntity)->m_fRotationCur + HALFPI;
+			Alpha = 0.0f;
+			m_fInitialPlayerOrientation = ((CPed*)CamTargetEntity)->m_fRotationCur + HALFPI;
+		}
+		TheCamera.m_fAvoidTheGeometryProbsTimer = 0.0f;
+		DontLookThroughWorldFixer = 0.0f;
+	}
+
+	if(CamTargetEntity->IsPed()){
+		static bool FailedTestTwelveFramesAgo = false;
+		RwV3d HeadPos;
+
+		TargetCoors = CameraTarget;
+
+		if(ResetStatics){
+			Beta = ((CPed*)CamTargetEntity)->m_fRotationCur + HALFPI;
+			Alpha = 0.0f;
+			m_fInitialPlayerOrientation = ((CPed*)CamTargetEntity)->m_fRotationCur + HALFPI;
+			FailedTestTwelveFramesAgo = false;
+			// static DPadVertical unused
+			// static DPadHorizontal unused
+			m_bCollisionChecksOn = true;
+			ResetStatics = false;
+		}
+
+		CamTargetEntity->GetMatrix().UpdateRW();
+		CamTargetEntity->UpdateRwFrame();
+		CamTargetEntity->UpdateRpHAnim();
+
+		((CPed*)CamTargetEntity)->m_pedIK.GetComponentPosition(HeadPos, PED_HEAD);
+		Source = HeadPos;
+		Source.z += 0.1f;
+		if(((CPed*)CamTargetEntity)->bIsDucking){
+			Source.x -= fDuckingBackOffset*CamTargetEntity->GetForward().x;
+			Source.y -= fDuckingBackOffset*CamTargetEntity->GetForward().y;
+			Source.x -= fDuckingRightOffset*CamTargetEntity->GetRight().x;
+			Source.y -= fDuckingRightOffset*CamTargetEntity->GetRight().y;
+		}else{
+			Source.x -= BackOffset*CamTargetEntity->GetForward().x;
+			Source.y -= BackOffset*CamTargetEntity->GetForward().y;
+		}
+
+		float LookLeftRight, LookUpDown;
+		LookLeftRight = -CPad::GetPad(0)->LookAroundLeftRight();
+		LookUpDown = CPad::GetPad(0)->LookAroundUpDown();
+		float xdir = LookLeftRight < 0.0f ? -1.0f : 1.0f;
+		float ydir = LookUpDown < 0.0f ? -1.0f : 1.0f;
+		Beta += SQR(LookLeftRight/100.0f)*xdir*0.8f/14.0f * FOV/80.0f * CTimer::GetTimeStep();
+		Alpha += SQR(LookUpDown/150.0f)*ydir*1.0f/14.0f * FOV/80.0f * CTimer::GetTimeStep();
+		while(Beta >= PI) Beta -= 2*PI;
+		while(Beta < -PI) Beta += 2*PI;
+		if(Alpha > DEGTORAD(60.0f)) Alpha = DEGTORAD(60.0f);
+		else if(Alpha < -DEGTORAD(89.5f)) Alpha = -DEGTORAD(89.5f);
+
+		TargetCoors.x = 3.0f * Cos(Alpha) * Cos(Beta) + Source.x;
+		TargetCoors.y = 3.0f * Cos(Alpha) * Sin(Beta) + Source.y;
+		TargetCoors.z = 3.0f * Sin(Alpha) + Source.z;
+		Front = TargetCoors - Source;
+		Front.Normalise();
+		Source += Front*0.4f;
+
+		if(m_bCollisionChecksOn){
+			if(!CWorld::GetIsLineOfSightClear(TargetCoors, Source, true, true, false, true, false, true, true)){
+				RwCameraSetNearClipPlane(Scene.camera, 0.4f);
+				FailedTestTwelveFramesAgo = true;
+			}else{
+				CVector TestPoint;
+				TestPoint.x = 3.0f * Cos(Alpha - DEGTORAD(20.0f)) * Cos(Beta + DEGTORAD(35.0f)) + Source.x;
+				TestPoint.y = 3.0f * Cos(Alpha - DEGTORAD(20.0f)) * Sin(Beta + DEGTORAD(35.0f)) + Source.y;
+				TestPoint.z = 3.0f * Sin(Alpha - DEGTORAD(20.0f)) + Source.z;
+				if(!CWorld::GetIsLineOfSightClear(TestPoint, Source, true, true, false, true, false, true, true)){
+					RwCameraSetNearClipPlane(Scene.camera, 0.4f);
+					FailedTestTwelveFramesAgo = true;
+				}else{
+					TestPoint.x = 3.0f * Cos(Alpha - DEGTORAD(20.0f)) * Cos(Beta - DEGTORAD(35.0f)) + Source.x;
+					TestPoint.y = 3.0f * Cos(Alpha - DEGTORAD(20.0f)) * Sin(Beta - DEGTORAD(35.0f)) + Source.y;
+					TestPoint.z = 3.0f * Sin(Alpha - DEGTORAD(20.0f)) + Source.z;
+					if(!CWorld::GetIsLineOfSightClear(TestPoint, Source, true, true, false, true, false, true, true)){
+						RwCameraSetNearClipPlane(Scene.camera, 0.4f);
+						FailedTestTwelveFramesAgo = true;
+					}else
+						FailedTestTwelveFramesAgo = false;
+				}
+			}
+		}
+
+		if(FailedTestTwelveFramesAgo)
+			RwCameraSetNearClipPlane(Scene.camera, 0.4f);
+		Source -= Front*0.4f;
+
+		GetVectorsReadyForRW();
+		float Rotation = CGeneral::GetATanOfXY(Front.x, Front.y) - HALFPI;
+		((CPed*)TheCamera.pTargetEntity)->m_fRotationCur = Rotation;
+		((CPed*)TheCamera.pTargetEntity)->m_fRotationDest = Rotation;
+	}else{
+		assert(CamTargetEntity->IsVehicle());
+
+		if(((CVehicle*)CamTargetEntity)->IsBike() &&
+		   (((CBike*)CamTargetEntity)->bWheelieCam || TheCamera.m_fAvoidTheGeometryProbsTimer > 0.0f)){
+			if(CPad::GetPad(0)->GetLeftShoulder2() || CPad::GetPad(0)->GetRightShoulder2()){
+				TheCamera.m_fAvoidTheGeometryProbsTimer = 0.0f;
+				((CBike*)CamTargetEntity)->bWheelieCam = false;
+			}else if(Process_WheelCam(CameraTarget, TargetOrientation, SpeedVar, TargetSpeedVar)){
+				if(((CBike*)CamTargetEntity)->bWheelieCam)
+					TheCamera.m_fAvoidTheGeometryProbsTimer = 50.0f;
+				else{
+					TheCamera.m_fAvoidTheGeometryProbsTimer -= CTimer::GetTimeStep();
+					((CBike*)CamTargetEntity)->bWheelieCam = true;
+				}
+				return;
+			}else{
+				TheCamera.m_fAvoidTheGeometryProbsTimer = 0.0f;
+				((CBike*)CamTargetEntity)->bWheelieCam = false;
+			}
+		}
+
+		CMatrix *matrix = &CamTargetEntity->GetMatrix();
+		if(((CVehicle*)CamTargetEntity)->IsBike()){
+			((CBike*)CamTargetEntity)->CalculateLeanMatrix();
+			matrix = &((CBike*)CamTargetEntity)->m_leanMatrix;
+		}
+
+		CVehicleModelInfo *mi = (CVehicleModelInfo*)CModelInfo::GetModelInfo(CamTargetEntity->GetModelIndex());
+		CVector CamPos = mi->GetFrontSeatPosn();
+		CamPos.x = 0.0f;
+		CamPos.y += 0.08f;
+		CamPos.z += 0.62f;
+		FOV = 60.0f;
+		Source = Multiply3x3(*matrix, CamPos);
+		Source += CamTargetEntity->GetPosition();
+		if(((CVehicle*)CamTargetEntity)->IsBoat())
+			Source.z += 0.5f;
+		else if(((CVehicle*)CamTargetEntity)->IsBike() && ((CVehicle*)CamTargetEntity)->pDriver){
+			CVector Neck(0.0f, 0.0f, 0.0f);
+			((CVehicle*)CamTargetEntity)->pDriver->m_pedIK.GetComponentPosition(Neck, PED_NECK);
+			Neck += ((CVehicle*)CamTargetEntity)->m_vecMoveSpeed * CTimer::GetTimeStep();
+			Source.z = Neck.z + fBike1stPersonOffsetZ;
+		}
+
+		if(((CVehicle*)CamTargetEntity)->IsUpsideDown()){
+			if(DontLookThroughWorldFixer < 0.5f)
+				DontLookThroughWorldFixer += 0.03f;
+			else
+				DontLookThroughWorldFixer = 0.5f;
+		}else{
+			if(DontLookThroughWorldFixer < 0.0f)
+#ifdef FIX_BUGS
+				DontLookThroughWorldFixer += 0.03f;
+#else
+				DontLookThroughWorldFixer -= 0.03f;
+#endif
+			else
+				DontLookThroughWorldFixer = 0.0f;
+		}
+		Source.z += DontLookThroughWorldFixer;
+		Front = matrix->GetForward();
+		Front.Normalise();
+		Up = matrix->GetUp();
+		Up.Normalise();
+		CVector Right = CrossProduct(Front, Up);
+		Right.Normalise();
+		Up = CrossProduct(Right, Front);
+		Up.Normalise();
+	}
+
+	ResetStatics = false;
+}
+
+static CVector vecHeadCamOffset(0.06f, 0.05f, 0.0f);
+
+void
+CCam::Process_1rstPersonPedOnPC(const CVector&, float TargetOrientation, float, float)
+{
+	// static int DontLookThroughWorldFixer = 0;	// unused
+	static CVector InitialHeadPos;
+
+	if(Mode != MODE_SNIPER_RUNABOUT)
+		FOV = DefaultFOV;
+	TheCamera.m_1rstPersonRunCloseToAWall = false;
+	if(CamTargetEntity->m_rwObject == nil)
+		return;
+
+	if(CamTargetEntity->IsPed()){
+		// static bool FailedTestTwelveFramesAgo = false;	// unused
+		CVector HeadPos = vecHeadCamOffset;
+		CVector TargetCoors;
+
+		((CPed*)CamTargetEntity)->TransformToNode(HeadPos, PED_HEAD);
+		RpHAnimHierarchy *hier = GetAnimHierarchyFromSkinClump(CamTargetEntity->GetClump());
+		int32 idx = RpHAnimIDGetIndex(hier, ConvertPedNode2BoneTag(PED_HEAD));
+		RwMatrix *mats = RpHAnimHierarchyGetMatrixArray(hier);
+		RwV3dTransformPoints(&HeadPos, &HeadPos, 1, &mats[idx]);
+		RwV3d scl = { 0.0f, 0.0f, 0.0f };
+		RwMatrixScale(&mats[idx], &scl, rwCOMBINEPRECONCAT);
+
+		if(ResetStatics){
+			Beta = TargetOrientation;
+			Alpha = 0.0f;
+			m_fInitialPlayerOrientation = TargetOrientation;
+			if(CamTargetEntity->IsPed()){	// useless check
+				Beta = ((CPed*)CamTargetEntity)->m_fRotationCur + HALFPI;
+				Alpha = 0.0f;
+				m_fInitialPlayerOrientation = ((CPed*)CamTargetEntity)->m_fRotationCur + HALFPI;
+				// FailedTestTwelveFramesAgo = false;
+				m_bCollisionChecksOn = true;
+			}
+			// DontLookThroughWorldFixer = false;
+			m_vecBufferedPlayerBodyOffset = HeadPos;
+			InitialHeadPos = HeadPos;
+		}
+
+		m_vecBufferedPlayerBodyOffset.y = HeadPos.y;
+
+		if(TheCamera.m_bHeadBob){
+			m_vecBufferedPlayerBodyOffset.x =
+				TheCamera.m_fGaitSwayBuffer * m_vecBufferedPlayerBodyOffset.x +
+				(1.0f-TheCamera.m_fGaitSwayBuffer) * HeadPos.x;
+			m_vecBufferedPlayerBodyOffset.z =
+				TheCamera.m_fGaitSwayBuffer * m_vecBufferedPlayerBodyOffset.z +
+				(1.0f-TheCamera.m_fGaitSwayBuffer) * HeadPos.z;
+			HeadPos = (CamTargetEntity->GetMatrix() * m_vecBufferedPlayerBodyOffset);
+		}else{
+			float HeadDelta = (HeadPos - InitialHeadPos).Magnitude2D();
+			CVector Fwd = CamTargetEntity->GetForward();
+			Fwd.z = 0.0f;
+			Fwd.Normalise();
+			HeadPos = HeadDelta*1.23f*Fwd + CamTargetEntity->GetPosition();
+			HeadPos.z += 0.59f;
+		}
+		Source = HeadPos;
+
+		// unused:
+		// ((CPed*)CamTargetEntity)->m_pedIK.GetComponentPosition(MidPos, PED_MID);
+		// Source - MidPos;
+
+		// 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){
+			UseMouse = true;
+			LookLeftRight = -3.0f*MouseX;
+			LookUpDown = 4.0f*MouseY;
+		}else{
+			LookLeftRight = -CPad::GetPad(0)->LookAroundLeftRight();
+			LookUpDown = CPad::GetPad(0)->LookAroundUpDown();
+		}
+		if(UseMouse){
+			Beta += TheCamera.m_fMouseAccelHorzntl * LookLeftRight * FOV/80.0f;
+			Alpha += TheCamera.m_fMouseAccelVertical * LookUpDown * FOV/80.0f;
+		}else{
+			float xdir = LookLeftRight < 0.0f ? -1.0f : 1.0f;
+			float ydir = LookUpDown < 0.0f ? -1.0f : 1.0f;
+			Beta += SQR(LookLeftRight/100.0f)*xdir*0.8f/14.0f * FOV/80.0f * CTimer::GetTimeStep();
+			Alpha += SQR(LookUpDown/150.0f)*ydir*1.0f/14.0f * FOV/80.0f * CTimer::GetTimeStep();
+		}
+		while(Beta >= PI) Beta -= 2*PI;
+		while(Beta < -PI) Beta += 2*PI;
+		if(Alpha > DEGTORAD(60.0f)) Alpha = DEGTORAD(60.0f);
+		else if(Alpha < -DEGTORAD(89.5f)) Alpha = -DEGTORAD(89.5f);
+
+		if(((CPed*)CamTargetEntity)->IsPlayer() && ((CPed*)CamTargetEntity)->m_attachedTo){
+			CPed *pedTarget = ((CPed*)CamTargetEntity);
+			float NewBeta;
+			switch(pedTarget->m_attachType){
+			case 0:
+				NewBeta = pedTarget->GetForward().Heading() + HALFPI;
+				break;
+			case 1:
+				NewBeta = pedTarget->GetForward().Heading() + PI;
+				break;
+			case 2:
+				NewBeta = pedTarget->GetForward().Heading() - HALFPI;
+				break;
+			case 3:
+				NewBeta = pedTarget->GetForward().Heading();
+				break;
+			}
+
+			float BetaOffset = Beta - NewBeta;
+			if(BetaOffset > PI) BetaOffset -= TWOPI;
+			else if(BetaOffset < PI) BetaOffset += TWOPI;
+
+			BetaOffset = clamp(BetaOffset, -pedTarget->m_attachRotStep, pedTarget->m_attachRotStep);
+			Beta = NewBeta + BetaOffset;
+		}
+
+		TargetCoors.x = 3.0f * Cos(Alpha) * Cos(Beta) + Source.x;
+		TargetCoors.y = 3.0f * Cos(Alpha) * Sin(Beta) + Source.y;
+		TargetCoors.z = 3.0f * Sin(Alpha) + Source.z;
+		Front = TargetCoors - Source;
+		Front.Normalise();
+		Source += Front*0.4f;
+
+		TheCamera.m_AlphaForPlayerAnim1rstPerson = Alpha;
+
+		GetVectorsReadyForRW();
+
+		float Heading = Front.Heading();
+		((CPed*)TheCamera.pTargetEntity)->m_fRotationCur = Heading;
+		((CPed*)TheCamera.pTargetEntity)->m_fRotationDest = Heading;
+		TheCamera.pTargetEntity->SetHeading(Heading);
+		TheCamera.pTargetEntity->GetMatrix().UpdateRW();
+
+		if(Mode == MODE_SNIPER_RUNABOUT){
+			// no mouse wheel FOV buffering here like in normal sniper mode
+			if(CPad::GetPad(0)->SniperZoomIn() || CPad::GetPad(0)->SniperZoomOut()){
+				if(CPad::GetPad(0)->SniperZoomOut())
+					FOV *= (255.0f*CTimer::GetTimeStep() + 10000.0f) / 10000.0f;
+				else
+					FOV /= (255.0f*CTimer::GetTimeStep() + 10000.0f) / 10000.0f;
+			}
+
+			TheCamera.SetMotionBlur(180, 255, 180, 120, MOTION_BLUR_SNIPER);
+
+			if(FOV > DefaultFOV)
+				FOV = DefaultFOV;
+			if(FOV < 15.0f)
+				FOV = 15.0f;
+		}
+	}
+
+	ResetStatics = false;
+	RwCameraSetNearClipPlane(Scene.camera, 0.05f);
+}
+
+float fCameraNearClipMult = 0.15f;
+
+void
+CCam::Process_Sniper(const CVector &CameraTarget, float TargetOrientation, float, float)
+{
+	if(!CamTargetEntity->IsPed())
+		return;
+
+	float BackOffset = 0.19f;
+	static bool FailedTestTwelveFramesAgo = false;
+	RwV3d HeadPos;
+	CVector TargetCoors;
+	TargetCoors = CameraTarget;
+
+	static float TargetFOV = 0.0f;
+
+	if(ResetStatics){
+		Beta = ((CPed*)CamTargetEntity)->m_fRotationCur + HALFPI;
+		Alpha = 0.0f;
+		m_fInitialPlayerOrientation = ((CPed*)CamTargetEntity)->m_fRotationCur + HALFPI;
+		FailedTestTwelveFramesAgo = false;
+		// static DPadVertical unused
+		// static DPadHorizontal unused
+		m_bCollisionChecksOn = true;
+		FOVSpeed = 0.0f;
+		TargetFOV = FOV;
+		ResetStatics = false;
+	}
+
+	if(((CPed*)CamTargetEntity)->bIsDucking)
+		BackOffset = 0.8f;
+	CamTargetEntity->GetMatrix().UpdateRW();
+	CamTargetEntity->UpdateRwFrame();
+	CamTargetEntity->UpdateRpHAnim();
+	((CPed*)CamTargetEntity)->m_pedIK.GetComponentPosition(HeadPos, PED_HEAD);
+	Source = HeadPos;
+	Source.z += 0.1f;
+	if(((CPed*)CamTargetEntity)->bIsDucking){
+		Source.x -= fDuckingBackOffset*CamTargetEntity->GetForward().x;
+		Source.y -= fDuckingBackOffset*CamTargetEntity->GetForward().y;
+		Source.x -= fDuckingRightOffset*CamTargetEntity->GetRight().x;
+		Source.y -= fDuckingRightOffset*CamTargetEntity->GetRight().y;
+	}else{
+		Source.x -= BackOffset*CamTargetEntity->GetForward().x;
+		Source.y -= BackOffset*CamTargetEntity->GetForward().y;
+	}
+
+	// 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){
+		UseMouse = true;
+		LookLeftRight = -3.0f*MouseX;
+		LookUpDown = 4.0f*MouseY;
+	}else{
+		LookLeftRight = -CPad::GetPad(0)->SniperModeLookLeftRight();
+		LookUpDown = CPad::GetPad(0)->SniperModeLookUpDown();
+	}
+	if(UseMouse){
+		Beta += TheCamera.m_fMouseAccelHorzntl * LookLeftRight * FOV/80.0f;
+		Alpha += TheCamera.m_fMouseAccelVertical * LookUpDown * FOV/80.0f;
+	}else{
+		float xdir = LookLeftRight < 0.0f ? -1.0f : 1.0f;
+		float ydir = LookUpDown < 0.0f ? -1.0f : 1.0f;
+		Beta += SQR(LookLeftRight/100.0f)*xdir*0.8f/14.0f * FOV/80.0f * CTimer::GetTimeStep();
+		Alpha += SQR(LookUpDown/150.0f)*ydir*1.0f/14.0f * FOV/80.0f * CTimer::GetTimeStep();
+	}
+	while(Beta >= PI) Beta -= 2*PI;
+	while(Beta < -PI) Beta += 2*PI;
+	if(Alpha > DEGTORAD(60.0f)) Alpha = DEGTORAD(60.0f);
+	else if(Alpha < -DEGTORAD(89.5f)) Alpha = -DEGTORAD(89.5f);
+
+	TargetCoors.x = 3.0f * Cos(Alpha) * Cos(Beta) + Source.x;
+	TargetCoors.y = 3.0f * Cos(Alpha) * Sin(Beta) + Source.y;
+	TargetCoors.z = 3.0f * Sin(Alpha) + Source.z;
+
+	UseMouse = false;
+	int ZoomInButton = ControlsManager.GetMouseButtonAssociatedWithAction(PED_SNIPER_ZOOM_IN);
+	int ZoomOutButton = ControlsManager.GetMouseButtonAssociatedWithAction(PED_SNIPER_ZOOM_OUT);
+	if(ZoomInButton == rsMOUSEWHEELUPBUTTON || ZoomInButton == rsMOUSEWHEELDOWNBUTTON || ZoomOutButton == rsMOUSEWHEELUPBUTTON || ZoomOutButton == rsMOUSEWHEELDOWNBUTTON){
+		if(CPad::GetPad(0)->GetMouseWheelUp() || CPad::GetPad(0)->GetMouseWheelDown()){
+			if(CPad::GetPad(0)->SniperZoomIn()){
+				TargetFOV = FOV - 10.0f;
+				UseMouse = true;
+			}
+			if(CPad::GetPad(0)->SniperZoomOut()){
+				TargetFOV = FOV + 10.0f;
+				UseMouse = true;
+			}
+		}
+	}
+	if((CPad::GetPad(0)->SniperZoomIn() || CPad::GetPad(0)->SniperZoomOut()) && !UseMouse){
+		if(CPad::GetPad(0)->SniperZoomOut()){
+			FOV *= (255.0f*CTimer::GetTimeStep() + 10000.0f) / 10000.0f;
+			TargetFOV = FOV;
+			FOVSpeed = 0.0f;
+		}else{
+			FOV /= (255.0f*CTimer::GetTimeStep() + 10000.0f) / 10000.0f;
+			TargetFOV = FOV;
+			FOVSpeed = 0.0f;
+		}
+	}else{
+		if(Abs(TargetFOV - FOV) > 0.5f)
+			WellBufferMe(TargetFOV, &FOV, &FOVSpeed, 0.5f, 0.25f, false);
+		else
+			FOVSpeed = 0.0f;
+	}
+
+	TheCamera.SetMotionBlur(180, 255, 180, 120, MOTION_BLUR_SNIPER);
+
+	if(FOV > DefaultFOV)
+		FOV = DefaultFOV;
+	if(Mode == MODE_CAMERA){
+		if(FOV < 3.0f)
+			FOV = 3.0f;
+	}else{
+		if(FOV < 15.0f)
+			FOV = 15.0f;
+	}
+
+	Front = TargetCoors - Source;
+	Front.Normalise();
+	Source += Front*0.4f;
+
+	if(m_bCollisionChecksOn){
+		if(!CWorld::GetIsLineOfSightClear(TargetCoors, Source, true, true, false, true, false, true, true)){
+			RwCameraSetNearClipPlane(Scene.camera, 0.4f);
+			FailedTestTwelveFramesAgo = true;
+		}else{
+			CVector TestPoint;
+			TestPoint.x = 3.0f * Cos(Alpha - DEGTORAD(20.0f)) * Cos(Beta + DEGTORAD(35.0f)) + Source.x;
+			TestPoint.y = 3.0f * Cos(Alpha - DEGTORAD(20.0f)) * Sin(Beta + DEGTORAD(35.0f)) + Source.y;
+			TestPoint.z = 3.0f * Sin(Alpha - DEGTORAD(20.0f)) + Source.z;
+			if(!CWorld::GetIsLineOfSightClear(TestPoint, Source, true, true, false, true, false, true, true)){
+				RwCameraSetNearClipPlane(Scene.camera, 0.4f);
+				FailedTestTwelveFramesAgo = true;
+			}else{
+				TestPoint.x = 3.0f * Cos(Alpha - DEGTORAD(20.0f)) * Cos(Beta - DEGTORAD(35.0f)) + Source.x;
+				TestPoint.y = 3.0f * Cos(Alpha - DEGTORAD(20.0f)) * Sin(Beta - DEGTORAD(35.0f)) + Source.y;
+				TestPoint.z = 3.0f * Sin(Alpha - DEGTORAD(20.0f)) + Source.z;
+				if(!CWorld::GetIsLineOfSightClear(TestPoint, Source, true, true, false, true, false, true, true)){
+					RwCameraSetNearClipPlane(Scene.camera, 0.4f);
+					FailedTestTwelveFramesAgo = true;
+				}else
+					FailedTestTwelveFramesAgo = false;
+			}
+		}
+	}
+
+	if(FailedTestTwelveFramesAgo)
+		RwCameraSetNearClipPlane(Scene.camera, 0.4f);
+	else if(Mode == MODE_CAMERA)
+		RwCameraSetNearClipPlane(Scene.camera, ((15.0f - Min(FOV, 15.0f))*fCameraNearClipMult + 1.0f)*DEFAULT_NEAR);
+	Source -= Front*0.4f;
+
+	GetVectorsReadyForRW();
+	float Rotation = CGeneral::GetATanOfXY(Front.x, Front.y) - HALFPI;
+	((CPed*)TheCamera.pTargetEntity)->m_fRotationCur = Rotation;
+	((CPed*)TheCamera.pTargetEntity)->m_fRotationDest = Rotation;
+}
+
+float INIT_SYPHON_GROUND_DIST = 2.419f;
+float INIT_SYPHON_ALPHA_OFFSET = -DEGTORAD(3.0f);
+float INIT_SYPHON_DEGREE_OFFSET = -DEGTORAD(30.0f);
+float FrontOffsetSyphon = -DEGTORAD(25.5f);	// unused
+float INIT_SYPHON_Z_OFFSET = -0.5f;
+
+void
+CCam::Process_Syphon(const CVector &CameraTarget, float, float, float)
+{
+	FOV = DefaultFOV;
+
+	if(!CamTargetEntity->IsPed())
+		return;
+
+	static bool CameraObscured = false;
+	// unused FailedClippingTestPrevously
+	static float BetaOffset = INIT_SYPHON_DEGREE_OFFSET;
+	// unused AngleToGoTo
+	// unused AngleToGoToSpeed
+	// unused DistBetweenPedAndPlayerPreviouslyOn
+	static float HeightDown = INIT_SYPHON_Z_OFFSET;
+	static float AlphaOffset = INIT_SYPHON_ALPHA_OFFSET;
+	static bool NegateBetaOffset = true;
+	CVector TargetCoors;
+	float fAimingDist;
+	float TargetAlpha;
+
+	bool StandingOnMovingThing = false;
+	TargetCoors = CameraTarget;
+	AlphaOffset = INIT_SYPHON_ALPHA_OFFSET;
+	float GroundDist = INIT_SYPHON_GROUND_DIST;
+
+	while(Beta >= PI) Beta -= 2*PI;
+	while(Beta < -PI) Beta += 2*PI;
+
+	float NewBeta = CGeneral::GetATanOfXY(TheCamera.m_cvecAimingTargetCoors.x - TargetCoors.x, TheCamera.m_cvecAimingTargetCoors.y - TargetCoors.y) + PI;
+	if(ResetStatics){
+		BetaOffset = INIT_SYPHON_DEGREE_OFFSET;
+		Beta = CGeneral::GetATanOfXY(Source.x - TargetCoors.x, Source.y - TargetCoors.y);
+		// some unuseds
+		ResetStatics = false;
+	}
+	if(NegateBetaOffset)
+		BetaOffset = -INIT_SYPHON_DEGREE_OFFSET;
+	Beta = NewBeta + BetaOffset;
+	Source = TargetCoors;
+	Source.x += GroundDist*Cos(Beta);
+	Source.y += GroundDist*Sin(Beta);
+	CPhysical *ground = (CPhysical*)((CPed*)CamTargetEntity)->m_pCurSurface;
+	if(ground && (ground->IsVehicle() || ground->IsObject()))
+		StandingOnMovingThing = true;
+	TargetCoors.z += m_fSyphonModeTargetZOffSet;
+
+	bool PlayerTooClose = false;
+	fAimingDist = (TheCamera.m_cvecAimingTargetCoors - TargetCoors).Magnitude2D();
+	if(fAimingDist < 6.5f){
+		fAimingDist = 6.5f;
+		PlayerTooClose = true;
+	}
+	TargetAlpha = CGeneral::GetATanOfXY(fAimingDist, TheCamera.m_cvecAimingTargetCoors.z - TargetCoors.z);
+	if(ResetStatics)	// BUG: can never happen
+		Alpha = -TargetAlpha;
+	while(TargetAlpha >= PI) TargetAlpha -= 2*PI;
+	while(TargetAlpha < -PI) TargetAlpha += 2*PI;
+	while(Alpha >= PI) Alpha -= 2*PI;
+	while(Alpha < -PI) Alpha += 2*PI;
+
+	// inlined
+	if(StandingOnMovingThing)
+		WellBufferMe(-TargetAlpha, &Alpha, &AlphaSpeed, 0.07f/2.0f, 0.015f/2.0f, true);
+	else
+		WellBufferMe(-TargetAlpha, &Alpha, &AlphaSpeed, 0.07f, 0.015f, true);
+
+	Source.z += GroundDist*Sin(Alpha+AlphaOffset) + GroundDist*0.2f;
+	if(Source.z < TargetCoors.z + HeightDown)
+		Source.z = TargetCoors.z + HeightDown;
+
+	if(!PlayerTooClose){
+		CColPoint point;
+		CEntity *entity = nil;
+		CWorld::pIgnoreEntity = CamTargetEntity;
+		if(CWorld::ProcessLineOfSight(TheCamera.m_cvecAimingTargetCoors, Source, point, entity, true, false, false, true, false, false, true)){
+			CVector TestFront = TheCamera.m_cvecAimingTargetCoors - Source;
+			TestFront.Normalise();
+			CVector CamToPlayer = CameraTarget - Source;
+			CVector CamToCol = point.point - Source;
+			if(DotProduct(TestFront, CamToCol) > DotProduct(TestFront, CamToPlayer)){
+				// collision is beyond player
+				float ColDist = (TheCamera.m_cvecAimingTargetCoors - point.point).Magnitude();
+				CVector PlayerToTarget = TheCamera.m_cvecAimingTargetCoors - CameraTarget;
+				float PlayerToTargetDist = PlayerToTarget.Magnitude();
+				PlayerToTarget.Normalise();
+				CVector Center = TheCamera.m_cvecAimingTargetCoors - ColDist*PlayerToTarget;
+				float Radius = (point.point - Center).Magnitude();
+				if(CWorld::TestSphereAgainstWorld(Center, Radius, nil, true, false, false, true, false, true)){
+					CVector LineToCol = gaTempSphereColPoints[0].point - Center;
+					LineToCol -= DotProduct(LineToCol, PlayerToTarget)*PlayerToTarget;
+					// unused
+					CVector LineToPrevCol = point.point - Center;
+					LineToPrevCol -= DotProduct(LineToPrevCol, PlayerToTarget)*PlayerToTarget;
+					float LineDist = LineToCol.Magnitude();
+					float NewBetaOffset = 0.0f;
+					if(LineDist > 0.0f && ColDist > 0.1f){
+						// scale offset at center to offset at player
+						float DistOffset = LineDist/ColDist * PlayerToTargetDist;
+						// turn into an angle
+						NewBetaOffset = 0.9f*Asin(Min(DistOffset/GroundDist, 1.0f));
+					}
+					if(NewBetaOffset < BetaOffset){
+						float Ratio = NewBetaOffset / BetaOffset;
+						BetaOffset = NewBetaOffset;
+						Beta = NewBeta + NewBetaOffset;
+						GroundDist *= Max(Ratio, 0.5f);
+						Source.x = TargetCoors.x +  GroundDist*Cos(Beta);
+						Source.y = TargetCoors.y +  GroundDist*Sin(Beta);
+						Source.z += (1.0f-Ratio)*0.5f;
+					}
+				}
+			}
+		}
+		CWorld::pIgnoreEntity = nil;
+	}
+
+	Front = TheCamera.m_cvecAimingTargetCoors - Source;
+	float TargetDistGround = Front.Magnitude2D();
+	Front.Normalise();
+	m_cvecTargetCoorsForFudgeInter = Source + TargetDistGround*Front;
+	m_cvecTargetCoorsForFudgeInter.z = TargetCoors.z;
+
+	CVector OrigSource = Source;
+	TheCamera.AvoidTheGeometry(OrigSource, CameraTarget + CVector(0.0f, 0.0f, 0.75f), Source, FOV);
+	Source.z = OrigSource.z;
+
+	GetVectorsReadyForRW();
+}
+
+void
+CCam::Process_Syphon_Crim_In_Front(const CVector &CameraTarget, float, float, float)
+{
+	FOV = DefaultFOV;
+
+	if(!CamTargetEntity->IsPed())
+		return;
+
+	CVector TargetCoors = CameraTarget;
+	CVector vDist;
+	float fDist, TargetDist;
+	float zOffset;
+	float AimingAngle;
+
+	TargetDist = TheCamera.m_fPedZoomValueSmooth * 0.5f + 4.0f;
+	vDist = Source - TargetCoors;
+	fDist = vDist.Magnitude2D();
+	zOffset = TargetDist - 2.65f;
+	if(zOffset < 0.0f)
+		zOffset = 0.0f;
+	if(zOffset == 0.0f)
+		Source = TargetCoors + CVector(1.0f, 1.0f, zOffset);
+	else
+		Source = TargetCoors + CVector(vDist.x/fDist*TargetDist, vDist.y/fDist*TargetDist, zOffset);
+
+	AimingAngle = CGeneral::GetATanOfXY(TheCamera.m_cvecAimingTargetCoors.x - TargetCoors.x, TheCamera.m_cvecAimingTargetCoors.y - TargetCoors.y);
+	while(AimingAngle >= PI) AimingAngle -= 2*PI;
+	while(AimingAngle < -PI) AimingAngle += 2*PI;
+
+	if(ResetStatics){
+		if(AimingAngle > 0.0f)
+			m_fPlayerInFrontSyphonAngleOffSet = -m_fPlayerInFrontSyphonAngleOffSet;
+		ResetStatics = false;
+	}
+
+	if(TheCamera.PlayerWeaponMode.Mode == MODE_SYPHON)
+		Beta = AimingAngle + m_fPlayerInFrontSyphonAngleOffSet;
+
+	Source.x = TargetCoors.x;
+	Source.y = TargetCoors.y;
+	Source.x += Cos(Beta) * TargetDist;
+	Source.y += Sin(Beta) * TargetDist;
+
+	TargetCoors = CameraTarget;
+	TargetCoors.z += m_fSyphonModeTargetZOffSet;
+	m_cvecTargetCoorsForFudgeInter = TargetCoors;
+
+	CVector OrigSource = Source;
+	TheCamera.AvoidTheGeometry(OrigSource, TargetCoors, Source, FOV);
+
+	Front = TargetCoors - Source;
+	GetVectorsReadyForRW();
+}
+
+float MAX_HEIGHT_UP = 15.0f;
+float WATER_Z_ADDITION = 2.75f;
+float WATER_Z_ADDITION_MIN = 1.5f;
+float SMALLBOAT_CLOSE_ALPHA_MINUS = 0.2f;
+float afBoatBetaDiffMult[3] = { 0.15f, 0.07f, 0.01f };
+float afBoatBetaSpeedDiffMult[3] = { 0.02f, 0.015f, 0.005f };
+
+void
+CCam::Process_BehindBoat(const CVector &CameraTarget, float TargetOrientation, float, float)
+{
+	if(!CamTargetEntity->IsVehicle()){
+		ResetStatics = false;
+		return;
+	}
+
+	CVector TargetCoors = CameraTarget;
+	float DeltaBeta = 0.0f;
+	static float TargetWhenChecksWereOn = 0.0f;
+	static float CenterObscuredWhenChecksWereOn = 0.0f;
+	static float WaterZAddition = 2.75f;
+	float WaterLevel = 0.0f;
+	float MaxHeightUp = MAX_HEIGHT_UP;
+	static float WaterLevelBuffered = 0.0f;
+	static float WaterLevelSpeed = 0.0f;
+	float BetaDiffMult = 0.0f;
+	float BetaSpeedDiffMult = 0.0f;
+
+	Beta = CGeneral::GetATanOfXY(TargetCoors.x - Source.x, TargetCoors.y - Source.y);
+	FOV = DefaultFOV;
+	float TargetAlpha = 0.0f;
+
+	if(ResetStatics){
+		CenterObscuredWhenChecksWereOn = 0.0f;
+		TargetWhenChecksWereOn = 0.0f;
+	}else if(DirectionWasLooking != LOOKING_FORWARD)
+		Beta = TargetOrientation;
+
+	if(!CWaterLevel::GetWaterLevelNoWaves(TargetCoors.x, TargetCoors.y, TargetCoors.z, &WaterLevel))
+		WaterLevel = TargetCoors.z - 0.5f;
+	if(ResetStatics){
+		WaterLevelBuffered = WaterLevel;
+		WaterLevelSpeed = 0.0f;
+	}
+	WellBufferMe(WaterLevel, &WaterLevelBuffered, &WaterLevelSpeed, 0.2f, 0.07f, false);
+
+	static float FixerForGoingBelowGround = 0.4f;
+	if(-FixerForGoingBelowGround < TargetCoors.z-WaterLevelBuffered+WATER_Z_ADDITION)
+		WaterLevelBuffered += TargetCoors.z-WaterLevelBuffered+WATER_Z_ADDITION - FixerForGoingBelowGround;
+
+	CVector BoatDimensions = CamTargetEntity->GetColModel()->boundingBox.GetSize();
+	float BoatSize = BoatDimensions.Magnitude2D();
+	int index = 0;
+	TheCamera.GetArrPosForVehicleType(((CVehicle*)CamTargetEntity)->GetVehicleAppearance(), index);
+	if(TheCamera.CarZoomIndicator == CAM_ZOOM_1){
+		TargetAlpha = ZmOneAlphaOffset[index];
+		BetaDiffMult = afBoatBetaDiffMult[0];
+		BetaSpeedDiffMult = afBoatBetaSpeedDiffMult[0];
+	}else if(TheCamera.CarZoomIndicator == CAM_ZOOM_2){
+		TargetAlpha = ZmTwoAlphaOffset[index];
+		BetaDiffMult = afBoatBetaDiffMult[1];
+		BetaSpeedDiffMult = afBoatBetaSpeedDiffMult[1];
+	}else if(TheCamera.CarZoomIndicator == CAM_ZOOM_3){
+		TargetAlpha = ZmThreeAlphaOffset[index];
+		BetaDiffMult = afBoatBetaDiffMult[2];
+		BetaSpeedDiffMult = afBoatBetaSpeedDiffMult[2];
+	}
+	if(TheCamera.CarZoomIndicator == CAM_ZOOM_1 && BoatSize < 10.0f){
+		TargetAlpha -= SMALLBOAT_CLOSE_ALPHA_MINUS;
+		BoatSize = 10.0f;
+	}else if(CCullZones::Cam1stPersonForPlayer()){
+		float Water = 0.0f;
+		// useless call
+		//CWaterLevel::GetWaterLevelNoWaves(TargetCoors.x, TargetCoors.y, TargetCoors.z, &Water);
+		Water = (WaterLevel + WATER_Z_ADDITION_MIN - WaterLevelBuffered - WATER_Z_ADDITION)/(BoatDimensions.z/2.0f + MaxHeightUp);
+		TargetAlpha = Asin(clamp(Water, -1.0f, 1.0f));
+	}
+
+	if(ResetStatics){
+		Alpha = TargetAlpha;
+		AlphaSpeed = 0.0f;
+	}
+	WellBufferMe(TargetAlpha, &Alpha, &AlphaSpeed, 0.15f, 0.07f, true);
+
+	if(ResetStatics){
+		Beta = TargetOrientation;
+		DeltaBeta = 0.0f;
+	}
+	// inlined
+	WellBufferMe(TargetOrientation, &Beta, &BetaSpeed, BetaDiffMult * ((CVehicle*)CamTargetEntity)->m_vecMoveSpeed.Magnitude(), BetaSpeedDiffMult, true);
+
+	Source = (TheCamera.CarZoomValueSmooth+BoatSize) * CVector(-Cos(Beta), -Sin(Beta), 0.0f) + TargetCoors;
+	Source.z = WaterLevelBuffered + WATER_Z_ADDITION + (BoatDimensions.z/2.0f + MaxHeightUp) * Sin(Alpha);
+
+	m_cvecTargetCoorsForFudgeInter = TargetCoors;
+	CVector OrigSource = Source;
+	TheCamera.AvoidTheGeometry(OrigSource, TargetCoors, Source, FOV);
+	Front = TargetCoors - Source;
+	Front.Normalise();
+
+
+	float TargetRoll;
+	if(CPad::GetPad(0)->GetDPadLeft() || CPad::GetPad(0)->GetDPadRight()){
+#ifdef FIX_BUGS
+		float fwdSpeed = 180.0f*DotProduct(((CVehicle*)CamTargetEntity)->m_vecMoveSpeed, CamTargetEntity->GetForward());
+		if(fwdSpeed > 210.0f) fwdSpeed = 210.0f;
+#endif
+		if(CPad::GetPad(0)->GetDPadLeft())
+			TargetRoll = DEGTORAD(10.0f)*TiltOverShoot[index] + f_max_role_angle;
+		else
+			TargetRoll = -(DEGTORAD(10.0f)*TiltOverShoot[index] + f_max_role_angle);
+		CVector FwdTarget = CamTargetEntity->GetForward();
+		FwdTarget.Normalise();
+		float AngleDiff = DotProduct(FwdTarget, Front);
+		AngleDiff = Acos(Min(Abs(AngleDiff), 1.0f));
+#ifdef FIX_BUGS
+		TargetRoll *= fwdSpeed/210.0f * Sin(AngleDiff);
+#else
+		TargetRoll *= Sin(AngleDiff);
+#endif
+	}else{
+		float fwdSpeed = 180.0f*DotProduct(((CVehicle*)CamTargetEntity)->m_vecMoveSpeed, CamTargetEntity->GetForward());
+		if(fwdSpeed > 210.0f) fwdSpeed = 210.0f;
+		TargetRoll = CPad::GetPad(0)->GetLeftStickX()/128.0f * fwdSpeed/210.0f;
+		CVector FwdTarget = CamTargetEntity->GetForward();
+		FwdTarget.Normalise();
+		float AngleDiff = DotProduct(FwdTarget, Front);
+		AngleDiff = Acos(Min(Abs(AngleDiff), 1.0f));
+		TargetRoll *= (DEGTORAD(10.0f)*TiltOverShoot[index] + f_max_role_angle) * Sin(AngleDiff);
+	}
+
+	WellBufferMe(TargetRoll, &f_Roll, &f_rollSpeed, 0.15f, 0.07f, false);
+	Up = CVector(Cos(f_Roll + HALFPI), 0.0f, Sin(f_Roll + HALFPI));
+	Up.Normalise();
+	Front.Normalise();
+	CVector Left = CrossProduct(Up, Front);
+	Left.Normalise();
+	Up = CrossProduct(Front, Left);
+	Up.Normalise();
+
+	ResetStatics = false;
+}
+
+float FIGHT_HORIZ_DIST = 3.0f;
+float FIGHT_VERT_DIST = 1.0f;
+float FIGHT_BETA_ANGLE = 125.0f;
+
+void
+CCam::Process_Fight_Cam(const CVector &CameraTarget, float TargetOrientation, float, float)
+{
+	if(!CamTargetEntity->IsPed())
+		return;
+
+	FOV = DefaultFOV;
+	float HorizDist = FIGHT_HORIZ_DIST;
+	float VertDist = FIGHT_VERT_DIST;
+	float BetaLeft, BetaRight, DeltaBetaLeft, DeltaBetaRight;
+	static bool PreviouslyFailedBuildingChecks = false;
+	float TargetCamHeight;
+	CVector TargetCoors;
+
+	m_fMinDistAwayFromCamWhenInterPolating = FIGHT_HORIZ_DIST;
+	Front = Source - CameraTarget;
+	if(ResetStatics)
+		Beta = CGeneral::GetATanOfXY(Front.x, Front.y);
+	while(TargetOrientation >= PI) TargetOrientation -= 2*PI;
+	while(TargetOrientation < -PI) TargetOrientation += 2*PI;
+	while(Beta >= PI) Beta -= 2*PI;
+	while(Beta < -PI) Beta += 2*PI;
+
+	// Figure out Beta
+	BetaLeft = TargetOrientation - DEGTORAD(FIGHT_BETA_ANGLE);
+	BetaRight = TargetOrientation + DEGTORAD(FIGHT_BETA_ANGLE);
+	DeltaBetaLeft = Beta - BetaLeft;
+	DeltaBetaRight = Beta - BetaRight;
+	while(DeltaBetaLeft >= PI) DeltaBetaLeft -= 2*PI;
+	while(DeltaBetaLeft < -PI) DeltaBetaLeft += 2*PI;
+	while(DeltaBetaRight >= PI) DeltaBetaRight -= 2*PI;
+	while(DeltaBetaRight < -PI) DeltaBetaRight += 2*PI;
+
+	if(ResetStatics){
+		if(Abs(DeltaBetaLeft) < Abs(DeltaBetaRight))
+			m_fTargetBeta = DeltaBetaLeft;
+		else
+			m_fTargetBeta = DeltaBetaRight;
+		m_fBufferedTargetOrientation = TargetOrientation;
+		m_fBufferedTargetOrientationSpeed = 0.0f;
+		m_bCollisionChecksOn = true;
+		BetaSpeed = 0.0f;
+	}else if(CPad::GetPad(0)->WeaponJustDown()){
+		if(Abs(DeltaBetaLeft) < Abs(DeltaBetaRight))
+			m_fTargetBeta = DeltaBetaLeft;
+		else
+			m_fTargetBeta = DeltaBetaRight;
+	}
+
+	WellBufferMe(m_fTargetBeta, &Beta, &BetaSpeed, 0.015f, 0.007f, true);
+
+	Source = CameraTarget + HorizDist*CVector(Cos(Beta), Sin(Beta), 0.0f);
+	Source.z += VertDist;
+
+	WellBufferMe(TargetOrientation, &m_fBufferedTargetOrientation, &m_fBufferedTargetOrientationSpeed, 0.07f, 0.004f, true);
+	TargetCoors = CameraTarget + 0.1f*CVector(Cos(m_fBufferedTargetOrientation), Sin(m_fBufferedTargetOrientation), 0.0f);
+
+	TargetCamHeight = CameraTarget.z - Source.z + Max(m_fPedBetweenCameraHeightOffset, m_fDimensionOfHighestNearCar) + VertDist;
+	if(TargetCamHeight > m_fCamBufferedHeight)
+		WellBufferMe(TargetCamHeight, &m_fCamBufferedHeight, &m_fCamBufferedHeightSpeed, 0.15f, 0.04f, false);
+	else
+		WellBufferMe(0.0f, &m_fCamBufferedHeight, &m_fCamBufferedHeightSpeed, 0.08f, 0.0175f, false);
+	Source.z += m_fCamBufferedHeight;
+
+	m_cvecTargetCoorsForFudgeInter = TargetCoors;
+	CVector OrigSource = Source;
+	TheCamera.AvoidTheGeometry(OrigSource, TargetCoors, Source, FOV);
+	Front = TargetCoors - Source;
+	Front.Normalise();
+	GetVectorsReadyForRW();
+
+	ResetStatics = false;
+}
+
+/*
+// Spline format is this, but game doesn't seem to use any kind of struct:
+struct Spline
+{
+	float numFrames;
+	struct {
+		float time;
+		float f[3];	// CVector for Vector spline
+	} frames[1];	// numFrames
+};
+*/
+
+// These two functions are pretty ugly
+
+#define MS(t) (uint32)((t)*1000.0f)
+
+void
+FindSplinePathPositionFloat(float *out, float *spline, uint32 time, uint32 &marker)
+{
+	// marker is at time
+	uint32 numFrames = spline[0];
+	uint32 timeDelta = MS(spline[marker] - spline[marker-4]);
+	uint32 endTime = MS(spline[4*(numFrames-1) + 1]);
+	if(time < endTime){
+		bool canAdvance = true;
+		if((marker-1)/4 > numFrames){
+			canAdvance = false;
+			marker = 4*(numFrames-1) + 1;
+		}
+		// skipping over small time deltas apparently?
+		while(timeDelta <= 75 && canAdvance){
+			marker += 4;
+			if((marker-1)/4 > numFrames){
+				canAdvance = false;
+				marker = 4*(numFrames-1) + 1;
+			}
+			timeDelta = (spline[marker] - spline[marker-4]) * 1000.0f;
+		}
+	}
+	float a = ((float)time - (float)MS(spline[marker-4])) / (float)MS(spline[marker] - spline[marker-4]);
+	a = clamp(a, 0.0f, 1.0f);
+	float b = 1.0f - a;
+	*out =	b*b*b * spline[marker-3] +
+		3.0f*a*b*b * spline[marker-1] +
+		3.0f*a*a*b * spline[marker+2] +
+		a*a*a * spline[marker+1];
+}
+
+void
+FindSplinePathPositionVector(CVector *out, float *spline, uint32 time, uint32 &marker)
+{
+	// marker is at time
+	uint32 numFrames = spline[0];
+	uint32 timeDelta = MS(spline[marker] - spline[marker-10]);
+	uint32 endTime = MS(spline[10*(numFrames-1) + 1]);
+	if(time < endTime){
+		bool canAdvance = true;
+		if((marker-1)/10 > numFrames){
+			canAdvance = false;
+			marker = 10*(numFrames-1) + 1;
+		}
+		// skipping over small time deltas apparently?
+		while(timeDelta <= 75 && canAdvance){
+			marker += 10;
+			if((marker-1)/10 > numFrames){
+				canAdvance = false;
+				marker = 10*(numFrames-1) + 1;
+			}
+			timeDelta = (spline[marker] - spline[marker-10]) * 1000.0f;
+		}
+	}
+
+	if((marker-1)/10 > numFrames){
+		printf("Arraymarker %i \n", marker);
+		printf("Path zero %i \n", numFrames);
+	}
+
+	float a = ((float)time - (float)MS(spline[marker-10])) / (float)MS(spline[marker] - spline[marker-10]);
+	a = clamp(a, 0.0f, 1.0f);
+	float b = 1.0f - a;
+	out->x =
+		b*b*b * spline[marker-9] +
+		3.0f*a*b*b * spline[marker-3] +
+		3.0f*a*a*b * spline[marker+4] +
+		a*a*a * spline[marker+1];
+	out->y =
+		b*b*b * spline[marker-8] +
+		3.0f*a*b*b * spline[marker-2] +
+		3.0f*a*a*b * spline[marker+5] +
+		a*a*a * spline[marker+2];
+	out->z =
+		b*b*b * spline[marker-7] +
+		3.0f*a*b*b * spline[marker-1] +
+		3.0f*a*a*b * spline[marker+6] +
+		a*a*a * spline[marker+3];
+	*out += TheCamera.m_vecCutSceneOffset;
+}
+
+void
+CCam::Process_FlyBy(const CVector&, float, float, float)
+{
+	float UpAngle = 0.0f;
+	static float FirstFOVValue = 0.0f;
+	static float PsuedoFOV;
+	static uint32 ArrayMarkerFOV;
+	static uint32 ArrayMarkerUp;
+	static uint32 ArrayMarkerSource;
+	static uint32 ArrayMarkerFront;
+
+	if(TheCamera.m_bcutsceneFinished)
+		return;
+#ifdef FIX_BUGS
+	// this would crash, not nice when cycling debug mode
+	if(TheCamera.m_arrPathArray[0].m_arr_PathData == nil)
+		return;
+#endif
+
+	Up = CVector(0.0f, 0.0f, 1.0f);
+	if(TheCamera.m_bStartingSpline)
+		m_fTimeElapsedFloat += CTimer::GetTimeStepNonClippedInMilliseconds();
+	else{
+		m_fTimeElapsedFloat = 0.0f;
+		m_uiFinishTime = MS(TheCamera.m_arrPathArray[2].m_arr_PathData[10*((int)TheCamera.m_arrPathArray[2].m_arr_PathData[0]-1) + 1]);
+		TheCamera.m_bStartingSpline = true;
+		FirstFOVValue = TheCamera.m_arrPathArray[0].m_arr_PathData[2];
+		PsuedoFOV = TheCamera.m_arrPathArray[0].m_arr_PathData[2];
+		ArrayMarkerFOV = 5;
+		ArrayMarkerUp = 5;
+		ArrayMarkerSource = 11;
+		ArrayMarkerFront = 11;
+	}
+
+	float fTime = m_fTimeElapsedFloat;
+	uint32 uiFinishTime = m_uiFinishTime;
+	uint32 uiTime = fTime;
+	if(uiTime < uiFinishTime){
+		TheCamera.m_fPositionAlongSpline = (float) uiTime / uiFinishTime;
+
+		while(uiTime >= (TheCamera.m_arrPathArray[2].m_arr_PathData[ArrayMarkerSource] - TheCamera.m_arrPathArray[2].m_arr_PathData[1])*1000.0f)
+			ArrayMarkerSource += 10;
+		FindSplinePathPositionVector(&Source, TheCamera.m_arrPathArray[2].m_arr_PathData, uiTime, ArrayMarkerSource);
+
+		while(uiTime >= (TheCamera.m_arrPathArray[3].m_arr_PathData[ArrayMarkerFront] - TheCamera.m_arrPathArray[3].m_arr_PathData[1])*1000.0f)
+			ArrayMarkerFront += 10;
+		FindSplinePathPositionVector(&Front, TheCamera.m_arrPathArray[3].m_arr_PathData, uiTime, ArrayMarkerFront);
+
+		while(uiTime >= (TheCamera.m_arrPathArray[1].m_arr_PathData[ArrayMarkerUp] - TheCamera.m_arrPathArray[1].m_arr_PathData[1])*1000.0f)
+			ArrayMarkerUp += 4;
+		FindSplinePathPositionFloat(&UpAngle, TheCamera.m_arrPathArray[1].m_arr_PathData, uiTime, ArrayMarkerUp);
+		UpAngle = DEGTORAD(UpAngle) + HALFPI;
+		Up.x = Cos(UpAngle);
+		Up.z = Sin(UpAngle);
+
+		while(uiTime >= (TheCamera.m_arrPathArray[0].m_arr_PathData[ArrayMarkerFOV] - TheCamera.m_arrPathArray[0].m_arr_PathData[1])*1000.0f)
+			ArrayMarkerFOV += 4;
+		FindSplinePathPositionFloat(&PsuedoFOV, TheCamera.m_arrPathArray[0].m_arr_PathData, uiTime, ArrayMarkerFOV);
+
+		m_cvecTargetCoorsForFudgeInter = Front;
+		Front = Front - Source;
+		Front.Normalise();
+		CVector Left = CrossProduct(Up, Front);
+		Up = CrossProduct(Front, Left);
+		Up.Normalise();
+	}else if(uiTime >= uiFinishTime){
+		// end
+		ArrayMarkerSource = (TheCamera.m_arrPathArray[2].m_arr_PathData[0] - 1)*10 + 1;
+		ArrayMarkerFront = (TheCamera.m_arrPathArray[3].m_arr_PathData[0] - 1)*10 + 1;
+		ArrayMarkerUp = (TheCamera.m_arrPathArray[1].m_arr_PathData[0] - 1)*4 + 1;
+		ArrayMarkerFOV = (TheCamera.m_arrPathArray[0].m_arr_PathData[0] - 1)*4 + 1;
+
+		FindSplinePathPositionVector(&Source, TheCamera.m_arrPathArray[2].m_arr_PathData, uiTime, ArrayMarkerSource);
+		FindSplinePathPositionVector(&Front, TheCamera.m_arrPathArray[3].m_arr_PathData, uiTime, ArrayMarkerFront);
+		FindSplinePathPositionFloat(&UpAngle, TheCamera.m_arrPathArray[1].m_arr_PathData, uiTime, ArrayMarkerUp);
+		UpAngle = DEGTORAD(UpAngle) + HALFPI;
+		Up.x = Cos(UpAngle);
+		Up.z = Sin(UpAngle);
+		FindSplinePathPositionFloat(&PsuedoFOV, TheCamera.m_arrPathArray[0].m_arr_PathData, uiTime, ArrayMarkerFOV);
+
+		TheCamera.m_fPositionAlongSpline = 1.0f;
+		ArrayMarkerFOV = 0;
+		ArrayMarkerUp = 0;
+		ArrayMarkerSource = 0;
+		ArrayMarkerFront = 0;
+
+		m_cvecTargetCoorsForFudgeInter = Front;
+		Front = Front - Source;
+		Front.Normalise();
+		CVector Left = CrossProduct(Up, Front);
+		Up = CrossProduct(Front, Left);
+		Up.Normalise();
+	}
+	FOV = PsuedoFOV;
+}
+
+CVector vecWheelCamBoatOffset(-0.5f, -0.8f, 0.3f);
+CVector vecWheelCamBoatOffsetAlt(0.2f, -0.2f, -0.3f);
+float fWheelCamCarXOffset = 0.33f;
+float fWheelCamBikeXOffset = 0.2f;
+
+bool
+CCam::Process_WheelCam(const CVector&, float, float, float)
+{
+	FOV = DefaultFOV;
+
+	CVector WheelPos;
+	if(CamTargetEntity->IsPed()){
+		// what? ped with wheels or what?
+		Source = Multiply3x3(CamTargetEntity->GetMatrix(), CVector(-0.3f, -0.5f, 0.1f));
+		Source += CamTargetEntity->GetPosition();
+		Front = CVector(1.0f, 0.0f, 0.0f);
+	}else{
+		WheelPos = CamTargetEntity->GetColModel()->boundingBox.min;
+		WheelPos.x -= 0.33f;
+		WheelPos.y = -2.3f;
+		WheelPos.z = 0.3f;
+		Source = CamTargetEntity->GetMatrix() * WheelPos;
+		Front = CamTargetEntity->GetForward();
+	}
+
+	CVector NewUp, Right;
+	if(CamTargetEntity->IsVehicle() &&
+	   (((CVehicle*)CamTargetEntity)->GetVehicleAppearance() == VEHICLE_APPEARANCE_HELI ||
+	    ((CVehicle*)CamTargetEntity)->GetVehicleAppearance() == VEHICLE_APPEARANCE_PLANE)){
+		WheelPos.x = -1.55f;
+		Right = CamTargetEntity->GetRight();
+		NewUp = CamTargetEntity->GetUp();
+		Source = CamTargetEntity->GetMatrix() * WheelPos;
+	}else if(CamTargetEntity->IsVehicle() && ((CVehicle*)CamTargetEntity)->IsBoat()){
+		NewUp = CVector(0.0f, 0.0f, 1.0f);
+		Right = CrossProduct(Front, NewUp);
+		Right.Normalise();
+		NewUp = CrossProduct(Right, Front);
+		NewUp.Normalise();
+
+		CVector BoatCamPos(0.0f, 0.0f, 0.0f);
+		if(((CVehicle*)CamTargetEntity)->pDriver){
+			((CVehicle*)CamTargetEntity)->pDriver->m_pedIK.GetComponentPosition(BoatCamPos, PED_HEAD);
+			BoatCamPos += ((CVehicle*)CamTargetEntity)->m_vecMoveSpeed * CTimer::GetTimeStep();
+			BoatCamPos += vecWheelCamBoatOffset.x * Right;
+			BoatCamPos += vecWheelCamBoatOffset.y * CamTargetEntity->GetForward();
+			BoatCamPos.z += vecWheelCamBoatOffset.z;
+			if(CamTargetEntity->GetModelIndex() == MI_PREDATOR){
+				BoatCamPos += vecWheelCamBoatOffsetAlt.x * Right;
+				BoatCamPos += vecWheelCamBoatOffsetAlt.y * CamTargetEntity->GetForward();
+				BoatCamPos.z += vecWheelCamBoatOffsetAlt.z;
+			}
+			Source = BoatCamPos;
+		}else
+			Source.z += 2.0f*vecWheelCamBoatOffset.z;
+	}else if(CamTargetEntity->IsVehicle() && ((CVehicle*)CamTargetEntity)->IsBike()){
+		NewUp = CVector(0.0f, 0.0f, 1.0f);
+		Right = CrossProduct(Front, NewUp);
+		Right.Normalise();
+		NewUp = CrossProduct(Right, Front);
+		NewUp.Normalise();
+
+		WheelPos.z += fWheelCamCarXOffset - fWheelCamBikeXOffset;
+		Source = CamTargetEntity->GetPosition();
+		Source += WheelPos.x * CamTargetEntity->GetRight();
+		Source += WheelPos.y * Front;
+		Source += WheelPos.z * Up;
+	}else{
+		NewUp = CVector(0.0f, 0.0f, 1.0f);
+		Right = CrossProduct(Front, NewUp);
+		Right.Normalise();
+		NewUp = CrossProduct(Right, Front);
+		NewUp.Normalise();
+	}
+
+	float Roll = Cos((CTimer::GetTimeInMilliseconds()&0x1FFFF)/(float)0x1FFFF * TWOPI);
+	Up = Cos(Roll*0.4f)*NewUp + Sin(Roll*0.4f)*Right;
+
+	CEntity *entity = nil;
+	CColPoint point;
+	CWorld::pIgnoreEntity = CamTargetEntity;
+	bool blocked = CWorld::ProcessLineOfSight(Source, CamTargetEntity->GetPosition(), point, entity, true, false, false, true, false, false, true);
+	CWorld::pIgnoreEntity = nil;
+	return !blocked;
+}
+
+int BOAT_UNDERWATER_CAM_BLUR = 20;
+float BOAT_UNDERWATER_CAM_COLORMAG_LIMIT = 10.0f;
+
+//--MIAIM: done
+void
+CCam::Process_Fixed(const CVector &CameraTarget, float, float, float)
+{
+	if(DirectionWasLooking != LOOKING_FORWARD)
+		DirectionWasLooking = LOOKING_FORWARD;
+
+	Source = m_cvecCamFixedModeSource;
+	Front = CameraTarget - Source;
+	Front.Normalise();
+	m_cvecTargetCoorsForFudgeInter = CameraTarget;
+	GetVectorsReadyForRW();
+
+	Up = CVector(0.0f, 0.0f, 1.0f) + m_cvecCamFixedModeUpOffSet;
+	Up.Normalise();
+	CVector Right = CrossProduct(Front, Up);
+	Right.Normalise();
+	Up = CrossProduct(Right, Front);
+
+	FOV = DefaultFOV;
+	if(TheCamera.m_bUseSpecialFovTrain)
+		FOV = TheCamera.m_fFovForTrain;
+
+	float WaterZ = 0.0f;
+	if(CWaterLevel::GetWaterLevel(Source, &WaterZ, true) && Source.z < WaterZ){
+		float WaterLum = Sqrt(SQR(CTimeCycle::GetWaterRed()) + SQR(CTimeCycle::GetWaterGreen()) + SQR(CTimeCycle::GetWaterBlue()));
+		if(WaterLum > BOAT_UNDERWATER_CAM_COLORMAG_LIMIT){
+			float f = BOAT_UNDERWATER_CAM_COLORMAG_LIMIT/WaterLum;
+			TheCamera.SetMotionBlur(CTimeCycle::GetWaterRed()*f,
+				CTimeCycle::GetWaterGreen()*f,
+				CTimeCycle::GetWaterBlue()*f, BOAT_UNDERWATER_CAM_BLUR, MOTION_BLUR_LIGHT_SCENE);
+		}else{
+			TheCamera.SetMotionBlur(CTimeCycle::GetWaterRed(),
+				CTimeCycle::GetWaterGreen(),
+				CTimeCycle::GetWaterBlue(), BOAT_UNDERWATER_CAM_BLUR, MOTION_BLUR_LIGHT_SCENE);
+		}
+	}
+
+#ifdef PC_PLAYER_CONTROLS
+	if(FrontEndMenuManager.m_ControlMethod == CONTROL_STANDARD && Using3rdPersonMouseCam()){
+		CPed *player = FindPlayerPed();
+		if(player && player->CanStrafeOrMouseControl()){
+			float Heading = Front.Heading();
+			((CPed*)TheCamera.pTargetEntity)->m_fRotationCur = Heading;
+			((CPed*)TheCamera.pTargetEntity)->m_fRotationDest = Heading;
+			TheCamera.pTargetEntity->SetHeading(Heading);
+			TheCamera.pTargetEntity->GetMatrix().UpdateRW();
+		}
+	}
+#endif
+}
+
+void
+CCam::Process_LightHouse(const CVector &CameraTarget, float, float, float)
+{
+	static float Timer;
+
+	Source = CameraTarget;
+	Source.x = 474.3f;
+	Source.y = -1717.6f;
+
+	int CamMode;
+	if(CameraTarget.z > 57.0f && (CameraTarget-Source).Magnitude2D() > 3.2f){
+		// Outside at top
+		if(Timer > 0.0f){
+			Timer -= CTimer::GetTimeStep();
+			CamMode = 1;
+		}else{
+			Timer = -24.0f;
+			CamMode = 2;
+		}
+	}else if(CameraTarget.z > 57.0f){
+		// Inside at top
+		if(Timer < 0.0f){
+			Timer += CTimer::GetTimeStep();
+			CamMode = 2;
+		}else{
+			Timer = 24.0f;
+			CamMode = 1;
+		}
+	}else{
+		Timer = 0.0f;
+		CamMode = 0;
+	}
+
+	if(CamMode == 2){
+		Source.z = 57.5f;
+		Front = Source - CameraTarget;
+		Front.Normalise();
+		Source.x = CameraTarget.x - 5.0f*Front.x;
+		Source.y = CameraTarget.y - 5.0f*Front.y;
+	}else if(CamMode == 1){
+		Front = CameraTarget - Source;
+		Front.Normalise();
+		Source.x = CameraTarget.x - 2.0f*Front.x;
+		Source.y = CameraTarget.y - 2.0f*Front.y;
+	}else{
+		Source.z += 4.0f;
+		Front = CameraTarget - Source;
+		Front.Normalise();
+		Source -= 4.0f*Front;
+		Source.z = Min(Source.z, 55.0f);
+		Front = CameraTarget - Source;
+	}
+
+	m_cvecTargetCoorsForFudgeInter = CameraTarget;
+	GetVectorsReadyForRW();
+
+	Up = CVector(0.0f, 0.0f, 1.0f) + m_cvecCamFixedModeUpOffSet;
+	Up.Normalise();
+	CVector Right = CrossProduct(Front, Up);
+	Right.Normalise();
+	Up = CrossProduct(Right, Front);
+
+	FOV = DefaultFOV;
+	if(TheCamera.m_bUseSpecialFovTrain)	// uh, sure...
+		FOV = TheCamera.m_fFovForTrain;
+}
+
+void
+CCam::Process_Player_Fallen_Water(const CVector &CameraTarget, float TargetOrientation, float, float)
+{
+	CColPoint colPoint;
+	CEntity *entity = nil;
+
+	FOV = DefaultFOV;
+	Source = m_vecLastAboveWaterCamPosition;
+	Source.z += 4.0f;
+
+	m_cvecTargetCoorsForFudgeInter = CameraTarget;
+	Front = CameraTarget - Source;
+	Front.Normalise();
+	if(CWorld::ProcessLineOfSight(CameraTarget, Source, colPoint, entity, true, false, false, true, false, true, true))
+		Source = colPoint.point;
+	GetVectorsReadyForRW();
+	Front = CameraTarget - Source;
+	Front.Normalise();
+}
+
+void
+CCam::Process_SpecialFixedForSyphon(const CVector &CameraTarget, float, float, float)
+{
+	Source = m_cvecCamFixedModeSource;
+	m_cvecTargetCoorsForFudgeInter = CameraTarget;
+	m_cvecTargetCoorsForFudgeInter.z += m_fSyphonModeTargetZOffSet;
+	Front = CameraTarget - Source;
+	CVector OrigSource = Source;
+	TheCamera.AvoidTheGeometry(OrigSource, m_cvecTargetCoorsForFudgeInter, Source, FOV);
+	Front.z += m_fSyphonModeTargetZOffSet;
+
+	GetVectorsReadyForRW();
+
+	Up += m_cvecCamFixedModeUpOffSet;
+	Up.Normalise();
+	CVector Left = CrossProduct(Up, Front);
+	Left.Normalise();
+	Front = CrossProduct(Left, Up);
+	Front.Normalise();
+	FOV = DefaultFOV;
+}
+
+#ifdef IMPROVED_CAMERA
+
+#define KEYJUSTDOWN(k) ControlsManager.GetIsKeyboardKeyJustDown((RsKeyCodes)k)
+#define KEYDOWN(k) ControlsManager.GetIsKeyboardKeyDown((RsKeyCodes)k)
+#define CTRLJUSTDOWN(key) \
+	       ((KEYDOWN(rsLCTRL) || KEYDOWN(rsRCTRL)) && KEYJUSTDOWN((RsKeyCodes)key) || \
+	        (KEYJUSTDOWN(rsLCTRL) || KEYJUSTDOWN(rsRCTRL)) && KEYDOWN((RsKeyCodes)key))
+#define CTRLDOWN(key) ((KEYDOWN(rsLCTRL) || KEYDOWN(rsRCTRL)) && KEYDOWN((RsKeyCodes)key))
+
+
+void
+CCam::Process_Debug(const CVector&, float, float, float)
+{
+	static float Speed = 0.0f;
+	static float PanSpeedX = 0.0f;
+	static float PanSpeedY = 0.0f;
+	CVector TargetCoors;
+
+	RwCameraSetNearClipPlane(Scene.camera, DEFAULT_NEAR);
+	FOV = DefaultFOV;
+	Alpha += DEGTORAD(CPad::GetPad(1)->GetLeftStickY()) / 50.0f;
+	Beta  += DEGTORAD(CPad::GetPad(1)->GetLeftStickX()*1.5f) / 19.0f;
+	if(CPad::GetPad(0)->GetLeftMouse()){
+		Alpha += DEGTORAD(CPad::GetPad(0)->GetMouseY()/2.0f);
+		Beta += DEGTORAD(CPad::GetPad(0)->GetMouseX()/2.0f);
+	}
+
+	TargetCoors.x = Source.x + Cos(Alpha) * Sin(Beta) * 7.0f;
+	TargetCoors.y = Source.y + Cos(Alpha) * Cos(Beta) * 7.0f;
+	TargetCoors.z = Source.z + Sin(Alpha) * 3.0f;
+
+	if(Alpha > DEGTORAD(89.5f)) Alpha = DEGTORAD(89.5f);
+	else if(Alpha < DEGTORAD(-89.5f)) Alpha = DEGTORAD(-89.5f);
+
+	if(CPad::GetPad(1)->GetSquare() || KEYDOWN('W'))
+		Speed += 0.1f;
+	else if(CPad::GetPad(1)->GetCross() || KEYDOWN('S'))
+		Speed -= 0.1f;
+	else
+		Speed = 0.0f;
+	if(Speed > 70.0f) Speed = 70.0f;
+	if(Speed < -70.0f) Speed = -70.0f;
+
+
+	if(KEYDOWN(rsRIGHT) || KEYDOWN('D'))
+		PanSpeedX += 0.1f;
+	else if(KEYDOWN(rsLEFT) || KEYDOWN('A'))
+		PanSpeedX -= 0.1f;
+	else
+		PanSpeedX = 0.0f;
+	if(PanSpeedX > 70.0f) PanSpeedX = 70.0f;
+	if(PanSpeedX < -70.0f) PanSpeedX = -70.0f;
+
+
+	if(KEYDOWN(rsUP))
+		PanSpeedY += 0.1f;
+	else if(KEYDOWN(rsDOWN))
+		PanSpeedY -= 0.1f;
+	else
+		PanSpeedY = 0.0f;
+	if(PanSpeedY > 70.0f) PanSpeedY = 70.0f;
+	if(PanSpeedY < -70.0f) PanSpeedY = -70.0f;
+
+
+	Front = TargetCoors - Source;
+	Front.Normalise();
+	Source = Source + Front*Speed;
+
+	Up = CVector{ 0.0f, 0.0f, 1.0f };
+	CVector Right = CrossProduct(Front, Up);
+	Up = CrossProduct(Right, Front);
+	Source = Source + Up*PanSpeedY + Right*PanSpeedX;
+
+	if(Source.z < -450.0f)
+		Source.z = -450.0f;
+
+	if(CPad::GetPad(1)->GetRightShoulder2JustDown() || KEYJUSTDOWN(rsENTER)){
+		if(FindPlayerVehicle())
+			FindPlayerVehicle()->Teleport(Source);
+		else
+			CWorld::Players[CWorld::PlayerInFocus].m_pPed->SetPosition(Source);
+	}
+
+	// stay inside sectors
+	while(CWorld::GetSectorX(Source.x) > NUMSECTORS_X-5.0f)
+		Source.x -= 1.0f;
+	while(CWorld::GetSectorX(Source.x) < 5.0f)
+		Source.x += 1.0f;
+	while(CWorld::GetSectorY(Source.y) > NUMSECTORS_X-5.0f)
+		Source.y -= 1.0f;
+	while(CWorld::GetSectorY(Source.y) < 5.0f)
+		Source.y += 1.0f;
+	GetVectorsReadyForRW();
+
+#ifdef FIX_BUGS
+	CPad::GetPad(0)->SetDisablePlayerControls(PLAYERCONTROL_CAMERA);
+#else
+	CPad::GetPad(0)->DisablePlayerControls = PLAYERCONTROL_CAMERA;
+#endif
+
+	if(CPad::GetPad(1)->GetLeftShockJustDown() && gbBigWhiteDebugLightSwitchedOn)
+		CShadows::StoreShadowToBeRendered(SHADOWTYPE_ADDITIVE, gpShadowExplosionTex, &Source,
+			12.0f, 0.0f, 0.0f, -12.0f,
+			128, 128, 128, 128, 1000.0f, false, 1.0f, nil, false);
+
+	if(CHud::m_Wants_To_Draw_Hud){
+		char str[256];
+		sprintf(str, "CamX: %f CamY: %f  CamZ:  %f", Source.x, Source.y, Source.z);
+		sprintf(str, "Frontx: %f, Fronty: %f, Frontz: %f ", Front.x, Front.y, Front.z);
+		sprintf(str, "Look@: %f, Look@: %f, Look@: %f ", Front.x + Source.x, Front.y + Source.y, Front.z + Source.z);
+	}
+}
+#else
+void
+CCam::Process_Debug(const CVector&, float, float, float)
+{
+	static float Speed = 0.0f;
+	CVector TargetCoors;
+
+	RwCameraSetNearClipPlane(Scene.camera, DEFAULT_NEAR);
+	FOV = DefaultFOV;
+	Alpha += DEGTORAD(CPad::GetPad(1)->GetLeftStickY()) / 50.0f;
+	Beta  += DEGTORAD(CPad::GetPad(1)->GetLeftStickX()*1.5f) / 19.0f;
+
+	TargetCoors.x = Source.x + Cos(Alpha) * Sin(Beta) * 7.0f;
+	TargetCoors.y = Source.y + Cos(Alpha) * Cos(Beta) * 7.0f;
+	TargetCoors.z = Source.z + Sin(Alpha) * 3.0f;
+
+	if(Alpha > DEGTORAD(89.5f)) Alpha = DEGTORAD(89.5f);
+	else if(Alpha < DEGTORAD(-89.5f)) Alpha = DEGTORAD(-89.5f);
+
+	if(CPad::GetPad(1)->GetSquare() || CPad::GetPad(1)->GetLeftMouse())
+		Speed += 0.1f;
+	else if(CPad::GetPad(1)->GetCross() || CPad::GetPad(1)->GetRightMouse())
+		Speed -= 0.1f;
+	else
+		Speed = 0.0f;
+	if(Speed > 70.0f) Speed = 70.0f;
+	if(Speed < -70.0f) Speed = -70.0f;
+
+	Front = TargetCoors - Source;
+	Front.Normalise();
+	Source = Source + Front*Speed;
+
+	if(Source.z < -450.0f)
+		Source.z = -450.0f;
+
+	if(CPad::GetPad(1)->GetRightShoulder2JustDown()){
+		if(FindPlayerVehicle())
+			FindPlayerVehicle()->Teleport(Source);
+		else
+			CWorld::Players[CWorld::PlayerInFocus].m_pPed->SetPosition(Source);
+	}
+
+	// stay inside sectors
+	while(CWorld::GetSectorX(Source.x) > NUMSECTORS_X-5.0f)
+		Source.x -= 1.0f;
+	while(CWorld::GetSectorX(Source.x) < 5.0f)
+		Source.x += 1.0f;
+	while(CWorld::GetSectorY(Source.y) > NUMSECTORS_X-5.0f)
+		Source.y -= 1.0f;
+	while(CWorld::GetSectorY(Source.y) < 5.0f)
+		Source.y += 1.0f;
+	GetVectorsReadyForRW();
+
+	if(CPad::GetPad(1)->GetLeftShockJustDown() && gbBigWhiteDebugLightSwitchedOn)
+		CShadows::StoreShadowToBeRendered(SHADOWTYPE_ADDITIVE, gpShadowExplosionTex, &Source,
+			12.0f, 0.0f, 0.0f, -12.0f,
+			128, 128, 128, 128, 1000.0f, false, 1.0f, nil, 1.0f);
+
+	if(CHud::m_Wants_To_Draw_Hud){
+		char str[256];
+		sprintf(str, "CamX: %f CamY: %f  CamZ:  %f", Source.x, Source.y, Source.z);
+		sprintf(str, "Frontx: %f, Fronty: %f, Frontz: %f ", Front.x, Front.y, Front.z);
+		sprintf(str, "Look@: %f, Look@: %f, Look@: %f ", Front.x + Source.x, Front.y + Source.y, Front.z + Source.z);
+	}
+}
+#endif
+
+#ifdef GTA_SCENE_EDIT
+void
+CCam::Process_Editor(const CVector&, float, float, float)
+{
+	static float Speed = 0.0f;
+	CVector TargetCoors;
+
+	if(ResetStatics){
+		Source = CVector(796.0f, -937.0, 40.0f);
+		CamTargetEntity = nil;
+	}
+	ResetStatics = false;
+
+	RwCameraSetNearClipPlane(Scene.camera, DEFAULT_NEAR);
+	FOV = DefaultFOV;
+	Alpha += DEGTORAD(CPad::GetPad(1)->GetLeftStickY()) / 50.0f;
+	Beta  += DEGTORAD(CPad::GetPad(1)->GetLeftStickX()*1.5f) / 19.0f;
+
+	if(CamTargetEntity && CSceneEdit::m_bCameraFollowActor){
+		TargetCoors = CamTargetEntity->GetPosition();
+	}else if(CSceneEdit::m_bRecording){
+		TargetCoors.x = Source.x + Cos(Alpha) * Sin(Beta) * 7.0f;
+		TargetCoors.y = Source.y + Cos(Alpha) * Cos(Beta) * 7.0f;
+		TargetCoors.z = Source.z + Sin(Alpha) * 7.0f;
+	}else
+		TargetCoors = CSceneEdit::m_vecCamHeading + Source;
+	CSceneEdit::m_vecCurrentPosition = TargetCoors;
+	CSceneEdit::m_vecCamHeading = TargetCoors - Source;
+
+	if(Alpha > DEGTORAD(89.5f)) Alpha = DEGTORAD(89.5f);
+	else if(Alpha < DEGTORAD(-89.5f)) Alpha = DEGTORAD(-89.5f);
+
+	if(CPad::GetPad(1)->GetSquare() || CPad::GetPad(1)->GetLeftMouse())
+		Speed += 0.1f;
+	else if(CPad::GetPad(1)->GetCross() || CPad::GetPad(1)->GetRightMouse())
+		Speed -= 0.1f;
+	else
+		Speed = 0.0f;
+	if(Speed > 70.0f) Speed = 70.0f;
+	if(Speed < -70.0f) Speed = -70.0f;
+
+	Front = TargetCoors - Source;
+	Front.Normalise();
+	Source = Source + Front*Speed;
+
+	if(Source.z < -450.0f)
+		Source.z = -450.0f;
+
+	if(CPad::GetPad(1)->GetRightShoulder2JustDown()){
+		if(FindPlayerVehicle())
+			FindPlayerVehicle()->Teleport(Source);
+		else
+			CWorld::Players[CWorld::PlayerInFocus].m_pPed->SetPosition(Source);
+			
+	}
+
+	// stay inside sectors
+	while(CWorld::GetSectorX(Source.x) > NUMSECTORS_X-5.0f)
+		Source.x -= 1.0f;
+	while(CWorld::GetSectorX(Source.x) < 5.0f)
+		Source.x += 1.0f;
+	while(CWorld::GetSectorY(Source.y) > NUMSECTORS_X-5.0f)
+		Source.y -= 1.0f;
+	while(CWorld::GetSectorY(Source.y) < 5.0f)
+		Source.y += 1.0f;
+	GetVectorsReadyForRW();
+
+	if(CPad::GetPad(1)->GetLeftShockJustDown() && gbBigWhiteDebugLightSwitchedOn)
+		CShadows::StoreShadowToBeRendered(SHADOWTYPE_ADDITIVE, gpShadowExplosionTex, &Source,
+			12.0f, 0.0f, 0.0f, -12.0f,
+			128, 128, 128, 128, 1000.0f, false, 1.0f, nil, false);
+
+	if(CHud::m_Wants_To_Draw_Hud){
+		char str[256];
+		sprintf(str, "CamX: %f CamY: %f  CamZ:  %f", Source.x, Source.y, Source.z);
+		sprintf(str, "Frontx: %f, Fronty: %f, Frontz: %f ", Front.x, Front.y, Front.z);
+		sprintf(str, "Look@: %f, Look@: %f, Look@: %f ", Front.x + Source.x, Front.y + Source.y, Front.z + Source.z);
+	}
+}
+#endif
+
+void
+CCam::Process_ModelView(const CVector &CameraTarget, float, float, float)
+{
+	CVector TargetCoors = CameraTarget;
+	float Angle = Atan2(Front.x, Front.y);
+	FOV = DefaultFOV;
+
+	Angle += CPad::GetPad(0)->GetLeftStickX()/1280.0f;
+	if(Distance < 10.0f)
+		Distance += CPad::GetPad(0)->GetLeftStickY()/1000.0f;
+	else
+		Distance += CPad::GetPad(0)->GetLeftStickY() * ((Distance - 10.0f)/20.0f + 1.0f) / 1000.0f;
+#ifdef IMPROVED_CAMERA
+	if(CPad::GetPad(0)->GetLeftMouse()){
+		Distance += DEGTORAD(CPad::GetPad(0)->GetMouseY()/2.0f);
+		Angle += DEGTORAD(CPad::GetPad(0)->GetMouseX()/2.0f);
+	}
+#endif
+	if(Distance < 1.5f)
+		Distance = 1.5f;
+
+	Front.x = Cos(0.3f) * Sin(Angle);
+	Front.y = Cos(0.3f) * Cos(Angle);
+	Front.z = -Sin(0.3f);
+	Source = CameraTarget - Distance*Front;
+
+	GetVectorsReadyForRW();
+}
+
+float DEADCAM_HEIGHT_START = 2.0f;
+float DEADCAM_HEIGHT_RATE = 0.04f;
+float DEADCAM_WAFT_AMPLITUDE = 2.0f;
+float DEADCAM_WAFT_RATE = 600.0f;
+float DEADCAM_WAFT_TILT_AMP = -0.35f;
+
+void
+CCam::ProcessPedsDeadBaby(void)
+{
+	CVector TargetCoors;
+	CVector CamPos;
+
+	if(TheCamera.pTargetEntity->IsPed())
+		((CPed*)TheCamera.pTargetEntity)->m_pedIK.GetComponentPosition(TargetCoors, PED_MID);
+	else if(TheCamera.pTargetEntity->IsVehicle()){
+		TargetCoors = TheCamera.pTargetEntity->GetPosition();
+		TargetCoors.z += TheCamera.pTargetEntity->GetColModel()->boundingBox.max.z;
+	}else
+		return;
+
+	if(ResetStatics){
+		TheCamera.m_uiTimeLastChange = CTimer::GetTimeInMilliseconds();
+		CamPos = TargetCoors;
+		CamPos.z += DEADCAM_HEIGHT_START;
+		float WaterZ = 0.0f;
+		if(CWaterLevel::GetWaterLevelNoWaves(TargetCoors.x, TargetCoors.y, TargetCoors.z, &WaterZ)){
+			if(WaterZ + 1.5f > CamPos.z)
+				CamPos.z = WaterZ + 1.5f;
+		}
+		CVector Right = CrossProduct(TheCamera.pTargetEntity->GetForward(), CVector(0.0f, 0.0f, 1.0f));
+		Right.z = 0.0f;
+		Right.Normalise();
+		Front = TargetCoors - CamPos;
+		Front.Normalise();
+		Up = CrossProduct(Right, Front);
+		Up.Normalise();
+		ResetStatics = false;
+	}else{
+		CamPos = Source;
+		if(CWorld::TestSphereAgainstWorld(CamPos+CVector(0.0f, 0.0f, 0.2f), 0.3f, TheCamera.pTargetEntity, true, true, false, true, false, true) == nil)
+			CamPos.z += DEADCAM_HEIGHT_RATE*CTimer::GetTimeStep();
+		CVector Right = CrossProduct(TheCamera.pTargetEntity->GetForward(), CVector(0.0f, 0.0f, 1.0f));
+		Right.z = 0.0f;
+		Right.Normalise();
+
+		float Time = CTimer::GetTimeInMilliseconds() - TheCamera.m_uiTimeLastChange;
+		CVector WaftOffset = DEADCAM_WAFT_AMPLITUDE * Min(1000.0f,Time)/1000.0f * Sin(Time/DEADCAM_WAFT_RATE) * Right;
+		CVector WaftPos = TargetCoors + WaftOffset;
+		WaftPos.z = CamPos.z;
+		CVector WaftFront = WaftPos - CamPos;
+		WaftFront.Normalise();
+		if(CWorld::TestSphereAgainstWorld(CamPos+0.2f*WaftFront, 0.3f, TheCamera.pTargetEntity, true, true, false, true, false, true) == nil)
+			CamPos = WaftPos;
+
+		Front = CVector(0.0f, 0.0f, -1.0f);
+		Front += Cos(Time/DEADCAM_WAFT_RATE) * DEADCAM_WAFT_TILT_AMP * Min(2000.0f,Time)/2000.0f * Right;
+
+		Front.Normalise();
+		Up = CrossProduct(Right, Front);
+		Up.Normalise();
+	}
+
+	Source = CamPos;
+	CVector OrigSource = Source;
+	TheCamera.AvoidTheGeometry(OrigSource, TargetCoors, Source, FOV);
+	TheCamera.m_bMoveCamToAvoidGeom = false;
+}
+
+float ARRESTDIST_BEHIND_COP = 5.0f;
+float ARRESTDIST_RIGHTOF_COP = 3.0f;
+float ARRESTDIST_ABOVE_COP = 1.4f;	// unused
+float ARRESTDIST_MINFROM_PLAYER = 8.0f;
+float ARRESTCAM_LAMP_BEST_DIST = 17.0f;
+float ARRESTCAM_ROTATION_SPEED = 0.1f;
+float ARRESTCAM_ROTATION_UP = 0.05f;
+float ARRESTCAM_S_ROTATION_UP = 0.1f;
+float ARRESTDIST_ALONG_GROUND = 5.0f;
+float ARRESTDIST_SIDE_GROUND = 10.0f;
+float ARRESTDIST_ABOVE_GROUND = 0.7f;
+float ARRESTCAM_LAMPPOST_ROTATEDIST = 10.0f;
+float ARRESTCAM_LAMPPOST_TRANSLATE = 0.1f;
+
+bool
+CCam::GetLookAlongGroundPos(CEntity *Target, CPed *Cop, CVector &TargetCoors, CVector &SourceOut)
+{
+	if(Target == nil || Cop == nil)
+		return false;
+	CVector CopToTarget = TargetCoors - Cop->GetPosition();
+	CopToTarget.z = 0.0f;
+	CopToTarget.Normalise();
+	SourceOut = TargetCoors + ARRESTDIST_ALONG_GROUND*CopToTarget;
+	CVector Side = CrossProduct(CopToTarget, CVector(0.0f, 0.0f, 1.0f));
+	SourceOut += ARRESTDIST_SIDE_GROUND*Side;
+	SourceOut.z += 5.0f;
+	bool found = false;
+	float ground = CWorld::FindGroundZFor3DCoord(SourceOut.x, SourceOut.y, SourceOut.z, &found);
+	if(found)
+		SourceOut.z = ground + ARRESTDIST_ABOVE_GROUND;
+	return true;
+}
+
+bool
+CCam::GetLookFromLampPostPos(CEntity *Target, CPed *Cop, CVector &TargetCoors, CVector &SourceOut)
+{
+	int i;
+	int16 NumObjects;
+	CEntity *Objects[16];
+	CEntity *NearestLampPost = nil;
+	CWorld::FindObjectsInRange(TargetCoors, 30.0f, true, &NumObjects, 15, Objects, false, false, false, true, true);
+	float NearestDist = 10000.0f;
+	for(i = 0; i < NumObjects; i++){
+		if(Objects[i]->GetIsStatic() && Objects[i]->GetUp().z > 0.9f && IsLampPost(Objects[i]->GetModelIndex())){
+			float Dist = (Objects[i]->GetPosition() - TargetCoors).Magnitude2D();
+			if(Abs(ARRESTCAM_LAMP_BEST_DIST - Dist) < NearestDist){
+				CVector TestStart = Objects[i]->GetColModel()->boundingBox.max;
+				TestStart = Objects[i]->GetMatrix() * TestStart;
+				CVector TestEnd = TestStart - TargetCoors;
+				TestEnd.Normalise();
+				TestEnd += TargetCoors;
+				if(CWorld::GetIsLineOfSightClear(TestStart, TestEnd, true, false, false, false, false, true, true)){
+					NearestDist = Abs(ARRESTCAM_LAMP_BEST_DIST - Dist);
+					NearestLampPost = Objects[i];
+					SourceOut = TestStart;
+				}
+			}
+		}
+	}
+	return NearestLampPost != nil;
+}
+
+bool
+CCam::GetLookOverShoulderPos(CEntity *Target, CPed *Cop, CVector &TargetCoors, CVector &SourceOut)
+{
+	if(Target == nil || Cop == nil)
+		return false;
+	CVector CopCoors = Cop->GetPosition();
+	CVector CopToTarget = TargetCoors - CopCoors;
+	CVector Side = CrossProduct(CopToTarget, CVector(0.0f, 0.0f, 1.0f));
+	Side.Normalise();
+	CopCoors += ARRESTDIST_RIGHTOF_COP * Side;
+	CopToTarget.Normalise();
+	if(CopToTarget.z < -0.7071f){
+		CopToTarget.z = -0.7071f;
+		float GroundDist = CopToTarget.Magnitude2D();
+		if(GroundDist > 0.0f){
+			CopToTarget.x *= 0.7071f/GroundDist;
+			CopToTarget.y *= 0.7071f/GroundDist;
+		}
+		CopToTarget.Normalise();
+	}else{
+		if(CopToTarget.z > 0.0f){
+			CopToTarget.z = 0.0f;
+			CopToTarget.Normalise();
+		}
+	}
+	CopCoors -= ARRESTDIST_BEHIND_COP * CopToTarget;
+	CopToTarget = TargetCoors - CopCoors;
+	float Dist = CopToTarget.Magnitude();
+	if(Dist < ARRESTDIST_MINFROM_PLAYER && Dist > 0.0f)
+		CopToTarget *= ARRESTDIST_MINFROM_PLAYER/Dist;
+	SourceOut = TargetCoors - CopToTarget;
+	return true;
+}
+
+enum {
+	ARRESTCAM_OVERSHOULDER = 1,
+	ARRESTCAM_ALONGGROUND,
+	ARRESTCAM_ALONGGROUND_RIGHT,
+	ARRESTCAM_ALONGGROUND_RIGHT_UP,
+	ARRESTCAM_ALONGGROUND_LEFT,
+	ARRESTCAM_ALONGGROUND_LEFT_UP,
+	ARRESTCAM_LAMPPOST,
+};
+
+int nUsingWhichCamera;
+CPed *pStoredCopPed;
+
+bool
+CCam::ProcessArrestCamOne(void)
+{
+	CVector TargetPos;
+	CVector CamSource;
+	CPed *cop = nil;
+	FOV = 45.0f;
+	bool foundPos = false;
+	int ArrestModes[5] = { -1, -1, -1, -1, -1 };
+
+	if(ResetStatics){
+		CPed *targetPed = (CPed*)TheCamera.pTargetEntity;
+		nUsingWhichCamera = 0;
+		if(TheCamera.pTargetEntity->IsPed()){
+			((CPed*)TheCamera.pTargetEntity)->m_pedIK.GetComponentPosition(TargetPos, PED_MID);
+			if(FindPlayerPed() && FindPlayerPed()->m_pArrestingCop)
+				cop = FindPlayerPed()->m_pArrestingCop;
+			if(cop && CGeneral::GetRandomNumberInRange(0.0f, 1.0f) > 0.5f){
+				ArrestModes[0] = ARRESTCAM_OVERSHOULDER;
+				ArrestModes[1] = ARRESTCAM_ALONGGROUND;
+				ArrestModes[2] = ARRESTCAM_OVERSHOULDER;
+				ArrestModes[3] = ARRESTCAM_LAMPPOST;
+			}else{
+				ArrestModes[0] = ARRESTCAM_ALONGGROUND;
+				ArrestModes[1] = ARRESTCAM_OVERSHOULDER;
+				ArrestModes[2] = ARRESTCAM_LAMPPOST;
+			}
+		}else if(TheCamera.pTargetEntity->IsVehicle()){
+			CVehicle *targetVehicle = (CVehicle*)TheCamera.pTargetEntity;
+			if(targetVehicle->pDriver && targetVehicle->pDriver->IsPlayer()){
+				targetPed = targetVehicle->pDriver;
+				targetPed->m_pedIK.GetComponentPosition(TargetPos, PED_MID);
+			}else{
+				targetPed = nil;
+				TargetPos = targetVehicle->GetPosition();
+			}
+
+			if(FindPlayerPed() && FindPlayerPed()->m_pArrestingCop)
+				cop = FindPlayerPed()->m_pArrestingCop;
+			if(cop && CGeneral::GetRandomNumberInRange(0.0f, 1.0f) > 0.65f){
+				ArrestModes[0] = ARRESTCAM_OVERSHOULDER;
+				ArrestModes[1] = ARRESTCAM_LAMPPOST;
+				ArrestModes[2] = ARRESTCAM_ALONGGROUND;
+				ArrestModes[3] = ARRESTCAM_OVERSHOULDER;
+			}else{
+				ArrestModes[0] = ARRESTCAM_LAMPPOST;
+				ArrestModes[1] = ARRESTCAM_ALONGGROUND;
+				ArrestModes[2] = ARRESTCAM_OVERSHOULDER;
+			}
+		}else
+			return false;
+
+		for(int i = 0; nUsingWhichCamera == 0 && i < ARRAY_SIZE(ArrestModes) && ArrestModes[i] > 0; i++){
+			switch(ArrestModes[i]){
+			case ARRESTCAM_OVERSHOULDER:
+				if(cop){
+					foundPos = GetLookOverShoulderPos(TheCamera.pTargetEntity, cop, TargetPos, CamSource);
+					pStoredCopPed = cop;
+					cop = nil;
+				}else if(targetPed){
+					for(int j = 0; j < targetPed->m_numNearPeds; j++){
+						CPed *nearPed = targetPed->m_nearPeds[j];
+						if(nearPed->GetPedState() == PED_ARREST_PLAYER)
+							foundPos = GetLookOverShoulderPos(TheCamera.pTargetEntity, nearPed, TargetPos, CamSource);
+						if(foundPos){
+							pStoredCopPed = nearPed;
+							break;
+						}
+					}
+				}
+				break;
+			case ARRESTCAM_ALONGGROUND:
+				if(cop){
+					foundPos = GetLookAlongGroundPos(TheCamera.pTargetEntity, cop, TargetPos, CamSource);
+					pStoredCopPed = cop;
+					cop = nil;
+				}else if(targetPed){
+					for(int j = 0; j < targetPed->m_numNearPeds; j++){
+						CPed *nearPed = targetPed->m_nearPeds[j];
+						if(nearPed->GetPedState() == PED_ARREST_PLAYER)
+							foundPos = GetLookAlongGroundPos(TheCamera.pTargetEntity, nearPed, TargetPos, CamSource);
+						if(foundPos){
+							pStoredCopPed = nearPed;
+							break;
+						}
+					}
+				}
+				break;
+			case ARRESTCAM_LAMPPOST:
+				foundPos = GetLookFromLampPostPos(TheCamera.pTargetEntity, cop, TargetPos, CamSource);
+				break;
+			}
+
+			if(foundPos){
+				if(pStoredCopPed)
+					pStoredCopPed->RegisterReference((CEntity**)&pStoredCopPed);
+				nUsingWhichCamera = ArrestModes[i];
+				if(ArrestModes[i] == ARRESTCAM_ALONGGROUND){
+					float rnd = CGeneral::GetRandomNumberInRange(0.0f, 5.0f);
+					if(rnd < 1.0f) nUsingWhichCamera = ARRESTCAM_ALONGGROUND;
+					else if(rnd < 2.0f) nUsingWhichCamera = ARRESTCAM_ALONGGROUND_RIGHT;
+					else if(rnd < 3.0f) nUsingWhichCamera = ARRESTCAM_ALONGGROUND_RIGHT_UP;
+					else if(rnd < 4.0f) nUsingWhichCamera = ARRESTCAM_ALONGGROUND_LEFT;
+					else nUsingWhichCamera = ARRESTCAM_ALONGGROUND_LEFT_UP;
+				}
+			}else
+				pStoredCopPed = nil;
+		}
+
+		Source = CamSource;
+		CVector OrigSource = Source;
+		TheCamera.AvoidTheGeometry(OrigSource, TargetPos, Source, FOV);
+		Front = TargetPos - Source;
+		Front.Normalise();
+		Up = CVector(0.0f, 0.0f, 1.0f);
+		CVector Right = CrossProduct(Front, Up);
+		Right.Normalise();
+		Up = CrossProduct(Right, Front);
+		if(nUsingWhichCamera != 0)
+			ResetStatics = false;
+		return true;
+	}
+
+	if(TheCamera.pTargetEntity->IsPed()){
+		((CPed*)TheCamera.pTargetEntity)->m_pedIK.GetComponentPosition(TargetPos, PED_MID);
+	}else if(TheCamera.pTargetEntity->IsVehicle()){
+		CPed *driver = ((CVehicle*)TheCamera.pTargetEntity)->pDriver;
+		if(driver && driver->IsPlayer())
+			driver->m_pedIK.GetComponentPosition(TargetPos, PED_MID);
+		else
+			TargetPos = TheCamera.pTargetEntity->GetPosition();
+	}else
+		return false;
+
+	if(nUsingWhichCamera == ARRESTCAM_OVERSHOULDER && pStoredCopPed){
+		foundPos = GetLookOverShoulderPos(TheCamera.pTargetEntity, pStoredCopPed, TargetPos, CamSource);
+		float newZ = Source.z + ARRESTCAM_S_ROTATION_UP*CTimer::GetTimeStep();
+		if(CamSource.z > newZ)
+			CamSource.z = newZ;
+	}else if(nUsingWhichCamera >= ARRESTCAM_ALONGGROUND_RIGHT && nUsingWhichCamera <= ARRESTCAM_ALONGGROUND_LEFT_UP){
+		CamSource = Source;
+		Front = TargetPos - CamSource;
+		Front.Normalise();
+		Up = CVector(0.0f, 0.0f, 1.0f);
+		CVector Right = CrossProduct(Front, Up);
+		if(nUsingWhichCamera == ARRESTCAM_ALONGGROUND_LEFT || nUsingWhichCamera == ARRESTCAM_ALONGGROUND_LEFT_UP)
+			Right *= -1.0f;
+		if(CWorld::TestSphereAgainstWorld(CamSource + 0.5f*Right, 0.4f, TheCamera.pTargetEntity, true, true, false, true, false, true) == nil){
+			foundPos = true;
+			CamSource += Right*ARRESTCAM_ROTATION_SPEED*CTimer::GetTimeStep();
+			if(nUsingWhichCamera == ARRESTCAM_ALONGGROUND_RIGHT_UP || nUsingWhichCamera == ARRESTCAM_ALONGGROUND_LEFT_UP){
+				CamSource.z += ARRESTCAM_ROTATION_UP*CTimer::GetTimeStep();
+			}else{
+				bool found = false;
+				float ground = CWorld::FindGroundZFor3DCoord(CamSource.x, CamSource.y, CamSource.z, &found);
+				if(found)
+					CamSource.z = ground + ARRESTDIST_ABOVE_GROUND;
+			}
+		}
+	}else if(nUsingWhichCamera == ARRESTCAM_LAMPPOST){
+		CamSource = Source;
+		Front = TargetPos - CamSource;
+		Front.z = 0.0f;
+		Front.Normalise();
+		Up = CVector(0.0f, 0.0f, 1.0f);
+		CVector Right = CrossProduct(Front, Up);
+		Right.Normalise();
+		Front = TargetPos - CamSource + Right*ARRESTCAM_LAMPPOST_ROTATEDIST;
+		Front.z = 0.0f;
+		Front.Normalise();
+		if(CWorld::TestSphereAgainstWorld(CamSource + 0.5f*Front, 0.4f, TheCamera.pTargetEntity, true, true, false, true, false, true) == nil){
+			foundPos = true;
+			CamSource += Front*ARRESTCAM_LAMPPOST_TRANSLATE*CTimer::GetTimeStep();
+		}
+	}
+
+	if(foundPos){
+		Source = CamSource;
+		CVector OrigSource = Source;
+		TheCamera.AvoidTheGeometry(OrigSource, TargetPos, Source, FOV);
+		Front = TargetPos - Source;
+		Front.Normalise();
+		Up = CVector(0.0f, 0.0f, 1.0f);
+		CVector Right = CrossProduct(Front, Up);
+		Right.Normalise();
+		Up = CrossProduct(Right, Front);
+	}else{
+		CVector OrigSource = Source;
+		TheCamera.AvoidTheGeometry(OrigSource, TargetPos, Source, FOV);
+	}
+
+	return true;
+}
+
+bool
+CCam::ProcessArrestCamTwo(void)
+{
+	CPed *player = CWorld::Players[CWorld::PlayerInFocus].m_pPed;
+	if(!ResetStatics)
+		return true;
+	ResetStatics = false;
+
+	CVector TargetCoors, ToCamera;
+	float BetaOffset;
+	float SourceX, SourceY;
+	if(&TheCamera.Cams[TheCamera.ActiveCam] == this){
+		SourceX = TheCamera.Cams[(TheCamera.ActiveCam + 1) % 2].Source.x;
+		SourceY = TheCamera.Cams[(TheCamera.ActiveCam + 1) % 2].Source.y;
+	}else{
+		SourceX = TheCamera.Cams[TheCamera.ActiveCam].Source.x;
+		SourceY = TheCamera.Cams[TheCamera.ActiveCam].Source.y;
+	}
+
+	for(int i = 0; i <= 1; i++){
+		int Dir = i == 0 ? 1 : -1;
+
+		FOV = 60.0f;
+		TargetCoors = player->GetPosition();
+		Beta = CGeneral::GetATanOfXY(TargetCoors.x-SourceX, TargetCoors.y-SourceY);
+		BetaOffset = DEGTORAD(Dir*80);
+		Source = TargetCoors + 11.5f*CVector(Cos(Beta+BetaOffset), Sin(Beta+BetaOffset), 0.0f);
+
+		ToCamera = Source - TargetCoors;
+		ToCamera.Normalise();
+		TargetCoors.x += 0.4f*ToCamera.x;
+		TargetCoors.y += 0.4f*ToCamera.y;
+		if(CWorld::GetIsLineOfSightClear(Source, TargetCoors, true, true, false, true, false, true, true)){
+			Source.z += 5.5f;
+			TargetCoors += CVector(-0.8f*ToCamera.x, -0.8f*ToCamera.y, 2.2f);
+			m_cvecTargetCoorsForFudgeInter = TargetCoors;
+			Front = TargetCoors - Source;
+			ResetStatics = false;
+			GetVectorsReadyForRW();
+			return true;
+		}
+	}
+	return false;
+}
+
+
+#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 * (1.0f/20.0f) * FOV/80.0f * CTimer::GetTimeStep();
+		AlphaOffset = LookUpDown * fStickSens * (0.6f/20.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);
+	else 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;
+	}
+
+	if(TheCamera.m_bUseTransitionBeta)
+		Beta = CGeneral::GetATanOfXY(-Cos(m_fTransitionBeta), -Sin(m_fTransitionBeta));
+
+	if(TheCamera.m_bUseTransitionBeta)
+		Beta = CGeneral::GetATanOfXY(-Cos(m_fTransitionBeta), -Sin(m_fTransitionBeta));
+
+	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 > DEFAULT_NEAR + 0.1f){
+			// 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 < DEFAULT_NEAR + 0.3f)
+					RwCameraSetNearClipPlane(Scene.camera, Max(PedColDist-0.3f, 0.05f));
+			}else{
+				RwCameraSetNearClipPlane(Scene.camera, Min(ColCamDist-0.35f, DEFAULT_NEAR));
+			}
+		}else{
+			Source = colPoint.point;
+			if(PedColDist < DEFAULT_NEAR + 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::CalculateAspectRatio() * 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
+		Near = RwCameraGetNearClipPlane(Scene.camera);
+		radius = ViewPlaneWidth*Near;
+		entity = CWorld::TestSphereAgainstWorld(Source + Front*Near, radius, nil, true, true, false, true, false, false);
+
+		i++;
+		if(i > 5)
+			entity = nil;
+	}
+
+	GetVectorsReadyForRW();
+}
+
+// LCS cam hehe
+void
+CCam::Process_FollowCar_SA(const CVector& CameraTarget, float TargetOrientation, float, float)
+{
+	// Missing things on III CCam
+	static CVector m_aTargetHistoryPosOne;
+	static CVector m_aTargetHistoryPosTwo;
+	static CVector m_aTargetHistoryPosThree;
+	static int m_nCurrentHistoryPoints = 0;
+	static float lastBeta = -9999.0f;
+	static float lastAlpha = -9999.0f;
+	static float stepsLeftToChangeBetaByMouse;
+	static float dontCollideWithCars;
+	static bool alphaCorrected;
+	static float heightIncreaseMult;
+
+	if (!CamTargetEntity->IsVehicle())
+		return;
+
+	CVehicle* car = (CVehicle*)CamTargetEntity;
+	CVector TargetCoors = CameraTarget;
+	uint8 camSetArrPos = 0;
+
+	// We may need those later
+	bool isPlane = car->GetVehicleAppearance() == VEHICLE_APPEARANCE_PLANE;
+	bool isHeli = car->GetVehicleAppearance() == VEHICLE_APPEARANCE_HELI;
+	bool isBike = car->GetVehicleAppearance() == VEHICLE_APPEARANCE_BIKE;
+	bool isCar = car->IsCar() && !isPlane && !isHeli && !isBike;
+
+	CPad* pad = CPad::GetPad(0);
+
+	// Next direction is non-existent in III
+	uint8 nextDirectionIsForward = !(pad->GetLookBehindForCar() || pad->GetLookBehindForPed() || pad->GetLookLeft() || pad->GetLookRight()) &&
+		DirectionWasLooking == LOOKING_FORWARD;
+
+	if (car->GetModelIndex() == MI_FIRETRUCK) {
+		camSetArrPos = 7;
+	} else if (car->GetModelIndex() == MI_RCBANDIT || car->GetModelIndex() == MI_RCBARON) {
+		camSetArrPos = 5;
+	} else if (car->GetModelIndex() == MI_RCGOBLIN || car->GetModelIndex() == MI_RCRAIDER) {
+		camSetArrPos = 6;
+	} else if (car->IsBoat()) {
+		camSetArrPos = 4;
+	} else if (isBike) {
+		camSetArrPos = 1;
+	} else if (isPlane) {
+		camSetArrPos = 3;
+	} else if (isHeli) {
+		camSetArrPos = 2;
+	}
+
+	// LCS one but index 1(firetruck) moved to last
+	float CARCAM_SET[][15] = {
+		{1.3f, 1.0f, 0.4f, 10.0f, 15.0f, 0.5f, 1.0f, 1.0f, 0.85f, 0.2f, 0.075f, 0.05f, 0.8f, DEGTORAD(45.0f), DEGTORAD(89.0f)}, // cars
+		{1.1f, 1.0f, 0.1f, 10.0f, 11.0f, 0.5f, 1.0f, 1.0f, 0.85f, 0.2f, 0.075f, 0.05f, 0.75f, DEGTORAD(45.0f), DEGTORAD(89.0f)}, // bike
+		{1.1f, 1.0f, 0.2f, 10.0f, 15.0f, 0.05f, 0.05f, 0.0f, 0.9f, 0.05f, 0.01f, 0.05f, 1.0f, DEGTORAD(10.0f), DEGTORAD(70.0f)}, // heli (SA values)
+		{1.1f, 3.5f, 0.2f, 10.0f, 25.0f, 0.5f, 1.0f, 1.0f, 0.75f, 0.1f, 0.005f, 0.2f, 1.0f, DEGTORAD(89.0f), DEGTORAD(89.0f)}, // plane (SA values)
+		{0.9f, 1.0f, 0.1f, 10.0f, 15.0f, 0.5f, 1.0f, 0.0f, 0.9f, 0.05f, 0.005f, 0.05f, 1.0f, -0.2f, DEGTORAD(70.0f)}, // boat
+		{1.1f, 1.0f, 0.2f, 10.0f, 5.0f, 0.5f, 1.0f, 1.0f, 0.75f, 0.1f, 0.005f, 0.2f, 1.0f, DEGTORAD(45.0f), DEGTORAD(89.0f)}, // rc cars
+		{1.1f, 1.0f, 0.2f, 10.0f, 5.0f, 0.5f, 1.0f, 1.0f, 0.75f, 0.1f, 0.005f, 0.2f, 1.0f, DEGTORAD(20.0f), DEGTORAD(70.0f)}, // rc heli/planes
+		{1.3f, 1.0f, 0.4f, 10.0f, 15.0f, 0.5f, 1.0f, 1.0f, 0.85f, 0.2f, 0.075f, 0.05f, 0.8f, -0.18f, DEGTORAD(40.0f)}, // firetruck...
+	};
+
+	// RC Heli/planes use same alpha values with heli/planes (LCS firetruck will fallback to 0)
+	uint8 alphaArrPos = (camSetArrPos > 4 ? (isPlane ? 3 : (isHeli ? 2 : 0)) : camSetArrPos);
+	float zoomModeAlphaOffset = 0.0f;
+	static float ZmOneAlphaOffsetLCS[] = { 0.12f, 0.08f, 0.15f, 0.08f, 0.08f };
+	static float ZmTwoAlphaOffsetLCS[] = { 0.1f, 0.08f, 0.3f, 0.08f, 0.08f };
+	static float ZmThreeAlphaOffsetLCS[] = { 0.065f, 0.05f, 0.15f, 0.06f, 0.08f };
+
+	if (isHeli && car->GetStatus() == STATUS_PLAYER_REMOTE)
+		zoomModeAlphaOffset = ZmTwoAlphaOffsetLCS[alphaArrPos];
+	else {
+		switch ((int)TheCamera.CarZoomIndicator) {
+			// near
+		case CAM_ZOOM_1:
+			zoomModeAlphaOffset = ZmOneAlphaOffsetLCS[alphaArrPos];
+			break;
+			// mid
+		case CAM_ZOOM_2:
+			zoomModeAlphaOffset = ZmTwoAlphaOffsetLCS[alphaArrPos];
+			break;
+			// far
+		case CAM_ZOOM_3:
+			zoomModeAlphaOffset = ZmThreeAlphaOffsetLCS[alphaArrPos];
+			break;
+		default:
+			break;
+		}
+	}
+
+	CColModel* carCol = (CColModel*)car->GetColModel();
+	float colMaxZ = carCol->boundingBox.max.z;  // As opposed to LCS and SA, VC does this: carCol->boundingBox.max.z - carCol->boundingBox.min.z;
+	float approxCarLength = 2.0f * Abs(carCol->boundingBox.min.y); // SA taxi min.y = -2.95, max.z = 0.883502f
+
+	float newDistance = TheCamera.CarZoomValueSmooth + CARCAM_SET[camSetArrPos][1] + approxCarLength;
+
+	// Taken from VC CCam::Cam_On_A_String_Unobscured. If we don't this, we will end up seeing the world from the inside of RC Goblin/Raider.
+	// I couldn't find where SA does that. It's possible that they've increased the size of these veh.'s collision bounding box.
+
+	if (car->m_modelIndex == MI_RCRAIDER || car->m_modelIndex == MI_RCGOBLIN)
+		newDistance += INIT_RC_HELI_HORI_EXTRA;
+	else if (car->m_modelIndex == MI_RCBARON)
+		newDistance += INIT_RC_PLANE_HORI_EXTRA;
+
+	float minDistForThisCar = approxCarLength * CARCAM_SET[camSetArrPos][3];
+
+	if (!isHeli || car->GetStatus() == STATUS_PLAYER_REMOTE) {
+		float radiusToStayOutside = colMaxZ * CARCAM_SET[camSetArrPos][0] - CARCAM_SET[camSetArrPos][2];
+		if (radiusToStayOutside > 0.0f) {
+			TargetCoors.z += radiusToStayOutside;
+			newDistance += radiusToStayOutside;
+			zoomModeAlphaOffset += 0.3f / newDistance * radiusToStayOutside;
+		}
+	} else {
+		// 0.6f = fTestShiftHeliCamTarget
+		TargetCoors += 0.6f * car->GetUp() * colMaxZ;
+	}
+
+	if (car->m_modelIndex == MI_RCGOBLIN)
+		zoomModeAlphaOffset += 0.178997f;
+
+	float minDistForVehType = CARCAM_SET[camSetArrPos][4];
+
+	if (TheCamera.CarZoomIndicator == CAM_ZOOM_1 && (camSetArrPos < 2 || camSetArrPos == 7)) {
+		minDistForVehType = minDistForVehType * 0.65f;
+	}
+
+	float nextDistance = Max(newDistance, minDistForVehType);
+
+	CA_MAX_DISTANCE = newDistance;
+	CA_MIN_DISTANCE = 3.5f;
+
+	if (ResetStatics) {
+		FOV = DefaultFOV;
+	} else {
+		if (isCar || isBike) {
+			// 0.4f: CAR_FOV_START_SPEED
+			if (DotProduct(car->GetForward(), car->m_vecMoveSpeed) > 0.4f)
+				FOV += (DotProduct(car->GetForward(), car->m_vecMoveSpeed) - 0.4f) * CTimer::GetTimeStep();
+		}
+
+		if (FOV > DefaultFOV)
+			// 0.98f: CAR_FOV_FADE_MULT
+			FOV = Pow(0.98f, CTimer::GetTimeStep()) * (FOV - DefaultFOV) + DefaultFOV;
+
+		FOV = clamp(FOV, DefaultFOV, DefaultFOV + 30.0f);
+	}
+
+	// WORKAROUND: I still don't know how looking behind works (m_bCamDirectlyInFront is unused in III, they seem to use m_bUseTransitionBeta)
+	if (pad->GetLookBehindForCar())
+		if (DirectionWasLooking == LOOKING_FORWARD || !LookingBehind)
+			TheCamera.m_bCamDirectlyInFront = true;
+
+	// Taken from RotCamIfInFrontCar, because we don't call it anymore
+	if (!(pad->GetLookBehindForCar() || pad->GetLookBehindForPed() || pad->GetLookLeft() || pad->GetLookRight()))
+		if (DirectionWasLooking != LOOKING_FORWARD)
+			TheCamera.m_bCamDirectlyBehind = true;
+
+	// Called when we just entered the car, just started to look behind or returned back from looking left, right or behind
+	if (ResetStatics || TheCamera.m_bCamDirectlyBehind || TheCamera.m_bCamDirectlyInFront) {
+		ResetStatics = false;
+		Rotating = false;
+		m_bCollisionChecksOn = true;
+
+		if (!TheCamera.m_bJustCameOutOfGarage) {
+			Alpha = 0.0f;
+			Beta = car->GetForward().Heading() - HALFPI;
+			if (TheCamera.m_bCamDirectlyInFront) {
+				Beta += PI;
+			}
+		}
+
+		BetaSpeed = 0.0;
+		AlphaSpeed = 0.0;
+		Distance = 1000.0;
+
+		Front.x = -(cos(Beta) * cos(Alpha));
+		Front.y = -(sin(Beta) * cos(Alpha));
+		Front.z = sin(Alpha);
+
+		m_aTargetHistoryPosOne = TargetCoors - nextDistance * Front;
+
+		m_aTargetHistoryPosTwo = TargetCoors - newDistance * Front;
+
+		m_nCurrentHistoryPoints = 0;
+		if (!TheCamera.m_bJustCameOutOfGarage)
+			Alpha = -zoomModeAlphaOffset;
+	}
+
+	Front = TargetCoors - m_aTargetHistoryPosOne;
+	Front.Normalise();
+
+	// Code that makes cam rotate around the car
+	float camRightHeading = Front.Heading() - HALFPI;
+	if (camRightHeading < -PI)
+		camRightHeading = camRightHeading + TWOPI;
+
+	float velocityRightHeading;
+	if (car->m_vecMoveSpeed.Magnitude2D() <= 0.02f)
+		velocityRightHeading = camRightHeading;
+	else
+		velocityRightHeading = car->m_vecMoveSpeed.Heading() - HALFPI;
+
+	if (velocityRightHeading < camRightHeading - PI)
+		velocityRightHeading = velocityRightHeading + TWOPI;
+	else if (velocityRightHeading > camRightHeading + PI)
+		velocityRightHeading = velocityRightHeading - TWOPI;
+
+	float betaChangeMult1 = CTimer::GetTimeStep() * CARCAM_SET[camSetArrPos][10];
+	float betaChangeLimit = CTimer::GetTimeStep() * CARCAM_SET[camSetArrPos][11];
+
+	float betaChangeMult2 = (car->m_vecMoveSpeed - DotProduct(car->m_vecMoveSpeed, Front) * Front).Magnitude();
+
+	float betaChange = Min(1.0f, betaChangeMult1 * betaChangeMult2) * (velocityRightHeading - camRightHeading);
+	if (betaChange <= betaChangeLimit) {
+		if (betaChange < -betaChangeLimit)
+			betaChange = -betaChangeLimit;
+	} else {
+		betaChange = betaChangeLimit;
+	}
+	float targetBeta = camRightHeading + betaChange;
+
+	if (targetBeta < Beta - HALFPI)
+		targetBeta += TWOPI;
+	else if (targetBeta > Beta + PI)
+		targetBeta -= TWOPI;
+
+	float carPosChange = (TargetCoors - m_aTargetHistoryPosTwo).Magnitude();
+	if (carPosChange < newDistance && newDistance > minDistForThisCar) {
+		newDistance = Max(minDistForThisCar, carPosChange);
+	}
+	float maxAlphaAllowed = CARCAM_SET[camSetArrPos][13];
+
+	// Originally this is to prevent camera enter into car while we're stopping, but what about moving???
+	// This is also original LCS and SA bug, or some attempt to fix lag. We'll never know
+
+	// if (car->m_vecMoveSpeed.MagnitudeSqr() < sq(0.2f))
+		if (car->GetModelIndex() != MI_FIRETRUCK)
+			if (!isBike || ((CBike*)car)->m_nWheelsOnGround > 3)
+				if (!isHeli && (!isPlane || ((CAutomobile*)car)->m_nWheelsOnGround)) {
+
+					CVector left = CrossProduct(car->GetForward(), CVector(0.0f, 0.0f, 1.0f));
+					left.Normalise();
+					CVector up = CrossProduct(left, car->GetForward());
+					up.Normalise();
+					float lookingUp = DotProduct(up, Front);
+					if (lookingUp > 0.0f) {
+						float v88 = Asin(Abs(Sin(Beta - (car->GetForward().Heading() - HALFPI))));
+						float v200;
+						if (v88 <= Atan2(carCol->boundingBox.max.x, -carCol->boundingBox.min.y)) {
+							v200 = (1.5f - carCol->boundingBox.min.y) / Cos(v88);
+						} else {
+							float a6g = 1.2f + carCol->boundingBox.max.x;
+							v200 = a6g / Cos(Max(0.0f, HALFPI - v88));
+						}
+						maxAlphaAllowed = Cos(Beta - (car->GetForward().Heading() - HALFPI)) * Atan2(car->GetForward().z, car->GetForward().Magnitude2D())
+							+ Atan2(TargetCoors.z - car->GetPosition().z + car->GetHeightAboveRoad(), v200 * 1.2f);
+
+						if (isCar && ((CAutomobile*)car)->m_nWheelsOnGround > 1 && Abs(DotProduct(car->m_vecTurnSpeed, car->GetForward())) < 0.05f) {
+							maxAlphaAllowed += Cos(Beta - (car->GetForward().Heading() - HALFPI) + HALFPI) * Atan2(car->GetRight().z, car->GetRight().Magnitude2D());
+						}
+					}
+				}
+
+	float targetAlpha = Asin(clamp(Front.z, -1.0f, 1.0f)) - zoomModeAlphaOffset;
+	if (targetAlpha <= maxAlphaAllowed) {
+		if (targetAlpha < -CARCAM_SET[camSetArrPos][14])
+			targetAlpha = -CARCAM_SET[camSetArrPos][14];
+	} else {
+		targetAlpha = maxAlphaAllowed;
+	}
+	float maxAlphaBlendAmount = CTimer::GetTimeStep() * CARCAM_SET[camSetArrPos][6];
+	float targetAlphaBlendAmount = (1.0f - Pow(CARCAM_SET[camSetArrPos][5], CTimer::GetTimeStep())) * (targetAlpha - Alpha);
+	if (targetAlphaBlendAmount <= maxAlphaBlendAmount) {
+		if (targetAlphaBlendAmount < -maxAlphaBlendAmount)
+			targetAlphaBlendAmount = -maxAlphaBlendAmount;
+	} else {
+		targetAlphaBlendAmount = maxAlphaBlendAmount;
+	}
+
+	// Using GetCarGun(LR/UD) will give us same unprocessed RightStick value as SA
+	float stickX = -(pad->GetCarGunLeftRight());
+	float stickY = -pad->GetCarGunUpDown();
+
+	// In SA this checks for m_bUseMouse3rdPerson so num2 / num8 do not move camera
+	// when Keyboard & Mouse controls are used. To make it work better with III/VC, check for actual pad state instead
+	if (!CPad::IsAffectedByController && !isCar)
+		stickY = 0.0f;
+	else if (CPad::bInvertLook4Pad)
+		stickY = -stickY;
+
+	float xMovement = Abs(stickX) * (FOV / 80.0f * 5.f / 70.f) * stickX * 0.007f * 0.007f;
+	float yMovement = Abs(stickY) * (FOV / 80.0f * 3.f / 70.f) * stickY * 0.007f * 0.007f;
+
+	bool correctAlpha = true;
+	//	if (SA checks if we aren't in work car, why?) {
+	if (!isCar || car->GetModelIndex() != MI_VOODOO) {
+		correctAlpha = false;
+	}
+	else {
+		xMovement = 0.0f;
+		yMovement = 0.0f;
+	}
+	//	} else
+	//		yMovement = 0.0;
+
+	if (!nextDirectionIsForward) {
+		yMovement = 0.0f;
+		xMovement = 0.0f;
+	}
+
+	if (camSetArrPos == 0 || camSetArrPos == 7) {
+		// This is not working on cars as SA
+		// Because III/VC doesn't have any buttons tied to LeftStick if you're not in Classic Configuration, using Dodo or using GInput/Pad, so :shrug:
+		if (Abs(pad->GetSteeringUpDown()) > 120.0f) {
+			if (car->pDriver && car->pDriver->m_objective != OBJECTIVE_LEAVE_CAR) {
+				yMovement += Abs(pad->GetSteeringUpDown()) * (FOV / 80.0f * 3.f / 70.f) * pad->GetSteeringUpDown() * 0.007f * 0.007f * 0.5;
+			}
+		}
+	}
+
+	if (yMovement > 0.0)
+		yMovement = yMovement * 0.5;
+
+	bool mouseChangesBeta = false;
+
+	// FIX: Disable mouse movement in drive-by, it's buggy. Original SA bug.
+	if (/*bFreeMouseCam &&*/ CCamera::m_bUseMouse3rdPerson && !pad->ArePlayerControlsDisabled() && nextDirectionIsForward) {
+		float mouseY = pad->GetMouseY() * 2.0f;
+		float mouseX = pad->GetMouseX() * -2.0f;
+
+		// If you want an ability to toggle free cam while steering with mouse, you can add an OR after DisableMouseSteering.
+		// There was a pad->NewState.m_bVehicleMouseLook in SA, which doesn't exists in III.
+
+		if ((mouseX != 0.0 || mouseY != 0.0) && (CVehicle::m_bDisableMouseSteering)) {
+			yMovement = mouseY * FOV / 80.0f * TheCamera.m_fMouseAccelHorzntl; // Same as SA, horizontal sensitivity.
+			BetaSpeed = 0.0;
+			AlphaSpeed = 0.0;
+			xMovement = mouseX * FOV / 80.0f * TheCamera.m_fMouseAccelHorzntl;
+			targetAlpha = Alpha;
+			stepsLeftToChangeBetaByMouse = 1.0f * 50.0f;
+			mouseChangesBeta = true;
+		} else if (stepsLeftToChangeBetaByMouse > 0.0f) {
+			// Finish rotation by decreasing speed when we stopped moving mouse
+			BetaSpeed = 0.0;
+			AlphaSpeed = 0.0;
+			yMovement = 0.0;
+			xMovement = 0.0;
+			targetAlpha = Alpha;
+			stepsLeftToChangeBetaByMouse = Max(0.0f, stepsLeftToChangeBetaByMouse - CTimer::GetTimeStep());
+			mouseChangesBeta = true;
+		}
+	}
+
+	if (correctAlpha) {
+		if (nPreviousMode != MODE_CAM_ON_A_STRING)
+			alphaCorrected = false;
+
+		if (!alphaCorrected && Abs(zoomModeAlphaOffset + Alpha) > 0.05f) {
+			yMovement = (-zoomModeAlphaOffset - Alpha) * 0.05f;
+		} else
+			alphaCorrected = true;
+	}
+	float alphaSpeedFromStickY = yMovement * CARCAM_SET[camSetArrPos][12];
+	float betaSpeedFromStickX = xMovement * CARCAM_SET[camSetArrPos][12];
+
+	float newAngleSpeedMaxBlendAmount = CARCAM_SET[camSetArrPos][9];
+	float angleChangeStep = Pow(CARCAM_SET[camSetArrPos][8], CTimer::GetTimeStep());
+	float targetBetaWithStickBlendAmount = betaSpeedFromStickX + (targetBeta - Beta) / Max(CTimer::GetTimeStep(), 1.0f);
+
+	if (targetBetaWithStickBlendAmount < -newAngleSpeedMaxBlendAmount)
+		targetBetaWithStickBlendAmount = -newAngleSpeedMaxBlendAmount;
+	else if (targetBetaWithStickBlendAmount > newAngleSpeedMaxBlendAmount)
+		targetBetaWithStickBlendAmount = newAngleSpeedMaxBlendAmount;
+
+	float angleChangeStepLeft = 1.0f - angleChangeStep;
+	BetaSpeed = targetBetaWithStickBlendAmount * angleChangeStepLeft + angleChangeStep * BetaSpeed;
+	if (Abs(BetaSpeed) < 0.0001f)
+		BetaSpeed = 0.0f;
+
+	float betaChangePerFrame;
+	if (mouseChangesBeta)
+		betaChangePerFrame = betaSpeedFromStickX;
+	else
+		betaChangePerFrame = CTimer::GetTimeStep() * BetaSpeed;
+	Beta = betaChangePerFrame + Beta;
+
+	if (TheCamera.m_bJustCameOutOfGarage) {
+		float invHeading = Atan2(Front.y, Front.x);
+		if (invHeading < 0.0f)
+			invHeading += TWOPI;
+
+		Beta = invHeading + PI;
+	}
+
+	Beta = CGeneral::LimitRadianAngle(Beta);
+	if (Beta < 0.0f)
+		Beta += TWOPI;
+
+	if ((camSetArrPos <= 1 || camSetArrPos == 7) && targetAlpha < Alpha && carPosChange >= newDistance) {
+		if (isCar && ((CAutomobile*)car)->m_nWheelsOnGround > 1 ||
+			isBike && ((CBike*)car)->m_nWheelsOnGround > 1)
+			alphaSpeedFromStickY += (targetAlpha - Alpha) * 0.075f;
+	}
+
+	AlphaSpeed = angleChangeStepLeft * alphaSpeedFromStickY + angleChangeStep * AlphaSpeed;
+	float maxAlphaSpeed = newAngleSpeedMaxBlendAmount;
+	if (alphaSpeedFromStickY > 0.0f)
+		maxAlphaSpeed = maxAlphaSpeed * 0.5;
+
+	if (AlphaSpeed <= maxAlphaSpeed) {
+		float minAlphaSpeed = -maxAlphaSpeed;
+		if (AlphaSpeed < minAlphaSpeed)
+			AlphaSpeed = minAlphaSpeed;
+	} else {
+		AlphaSpeed = maxAlphaSpeed;
+	}
+
+	if (Abs(AlphaSpeed) < 0.0001f)
+		AlphaSpeed = 0.0f;
+
+		float alphaWithSpeedAccounted;
+		if (mouseChangesBeta) {
+			alphaWithSpeedAccounted = alphaSpeedFromStickY + targetAlpha;
+				Alpha += alphaSpeedFromStickY;
+		} else {
+			alphaWithSpeedAccounted = CTimer::GetTimeStep() * AlphaSpeed + targetAlpha;
+			Alpha += targetAlphaBlendAmount;
+		}
+
+	if (Alpha <= maxAlphaAllowed) {
+		float minAlphaAllowed = -CARCAM_SET[camSetArrPos][14];
+		if (minAlphaAllowed > Alpha) {
+			Alpha = minAlphaAllowed;
+			AlphaSpeed = 0.0f;
+		}
+	} else {
+		Alpha = maxAlphaAllowed;
+		AlphaSpeed = 0.0f;
+	}
+
+	// Prevent unsignificant angle changes
+	if (Abs(lastAlpha - Alpha) < 0.0001f)
+		Alpha = lastAlpha;
+
+	lastAlpha = Alpha;
+
+	if (Abs(lastBeta - Beta) < 0.0001f)
+		Beta = lastBeta;
+
+	lastBeta = Beta;
+
+	Front.x = -(cos(Beta) * cos(Alpha));
+	Front.y = -(sin(Beta) * cos(Alpha));
+	Front.z = sin(Alpha);
+	GetVectorsReadyForRW();
+	TheCamera.m_bCamDirectlyBehind = false;
+	TheCamera.m_bCamDirectlyInFront = false;
+
+	Source = TargetCoors - newDistance * Front;
+
+	m_cvecTargetCoorsForFudgeInter = TargetCoors;
+	m_aTargetHistoryPosThree = m_aTargetHistoryPosOne;
+	float nextAlpha = alphaWithSpeedAccounted + zoomModeAlphaOffset;
+	float nextFrontX = -(cos(Beta) * cos(nextAlpha));
+	float nextFrontY = -(sin(Beta) * cos(nextAlpha));
+	float nextFrontZ = sin(nextAlpha);
+
+	m_aTargetHistoryPosOne.x = TargetCoors.x - nextFrontX * nextDistance;
+	m_aTargetHistoryPosOne.y = TargetCoors.y - nextFrontY * nextDistance;
+	m_aTargetHistoryPosOne.z = TargetCoors.z - nextFrontZ * nextDistance;
+
+	m_aTargetHistoryPosTwo.x = TargetCoors.x - nextFrontX * newDistance;
+	m_aTargetHistoryPosTwo.y = TargetCoors.y - nextFrontY * newDistance;
+	m_aTargetHistoryPosTwo.z = TargetCoors.z - nextFrontZ * newDistance;
+
+	// SA calls SetColVarsVehicle in here
+	if (nextDirectionIsForward) {
+
+		// LCS uses exactly the same collision code as FollowPedWithMouse, so we will do so.
+
+		// This is only in LCS!
+		float timestepFactor = Pow(0.99f, CTimer::GetTimeStep());
+		dontCollideWithCars = (timestepFactor * dontCollideWithCars) + ((1.0f - timestepFactor) * car->m_vecMoveSpeed.Magnitude());
+
+		// Our addition
+#define IS_TRAFFIC_LIGHT(ent) (ent->IsObject() && IsLightObject(ent->GetModelIndex()))
+
+		// Clip Source and fix near clip
+		CColPoint colPoint;
+		CEntity* entity;
+		CWorld::pIgnoreEntity = CamTargetEntity;
+		if(CWorld::ProcessLineOfSight(TargetCoors, Source, colPoint, entity, true, dontCollideWithCars < 0.1f, false, true, false, true, true) && !IS_TRAFFIC_LIGHT(entity)){
+			float PedColDist = (TargetCoors - colPoint.point).Magnitude();
+			float ColCamDist = newDistance - PedColDist;
+			if(entity->IsPed() && ColCamDist > DEFAULT_NEAR + 0.1f){
+				// Ped in the way but not clipping through
+				if(CWorld::ProcessLineOfSight(colPoint.point, Source, colPoint, entity, true, dontCollideWithCars < 0.1f, false, true, false, true, true) || IS_TRAFFIC_LIGHT(entity)){
+					PedColDist = (TargetCoors - colPoint.point).Magnitude();
+					Source = colPoint.point;
+					if(PedColDist < DEFAULT_NEAR + 0.3f)
+						RwCameraSetNearClipPlane(Scene.camera, Max(PedColDist-0.3f, 0.05f));
+				}else{
+					RwCameraSetNearClipPlane(Scene.camera, Min(ColCamDist-0.35f, DEFAULT_NEAR));
+				}
+			}else{
+				Source = colPoint.point;
+				if(PedColDist < DEFAULT_NEAR + 0.3f)
+					RwCameraSetNearClipPlane(Scene.camera, Max(PedColDist-0.3f, 0.05f));
+			}
+		}
+		
+		CWorld::pIgnoreEntity = nil;
+
+		// If we're seeing blue hell due to camera intersects some surface, fix it.
+		// SA and LCS have this unrolled.
+
+		float ViewPlaneHeight = Tan(DEGTORAD(FOV) / 2.0f);
+		float ViewPlaneWidth = ViewPlaneHeight * CDraw::CalculateAspectRatio() * fTweakFOV;
+		float Near = RwCameraGetNearClipPlane(Scene.camera);
+		float radius = ViewPlaneWidth*Near;
+		entity = CWorld::TestSphereAgainstWorld(Source + Front*Near, radius, nil, true, true, false, true, false, true);
+		int i = 0;
+		while(entity){
+
+			if (IS_TRAFFIC_LIGHT(entity))
+				break;
+
+			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
+			Near = RwCameraGetNearClipPlane(Scene.camera);
+			radius = ViewPlaneWidth*Near;
+			entity = CWorld::TestSphereAgainstWorld(Source + Front*Near, radius, nil, true, true, false, true, false, true);
+
+			i++;
+			if(i > 5)
+				entity = nil;
+		}
+#undef IS_TRAFFIC_LIGHT
+	}
+	TheCamera.m_bCamDirectlyBehind = false;
+	TheCamera.m_bCamDirectlyInFront = false;
+
+	// ------- LCS specific part starts
+
+	if (camSetArrPos == 5 && Source.z < 1.0f) // RC Bandit and Baron
+		Source.z = 1.0f;
+
+	// CCam::FixSourceAboveWaterLevel
+	if (CameraTarget.z >= -2.0f) {
+		float level = -6000.0;
+
+		if (CWaterLevel::GetWaterLevelNoWaves(Source.x, Source.y, Source.z, &level)) {
+			if (Source.z < level)
+				Source.z = level;
+		}
+	}
+	Front = TargetCoors - Source;
+
+	// -------- LCS specific part ends
+
+	GetVectorsReadyForRW();
+	// SA
+	// gTargetCoordsForLookingBehind = TargetCoors;
+
+	// SA code from CAutomobile::TankControl/FireTruckControl.
+	if (car->GetModelIndex() == MI_RHINO || car->GetModelIndex() == MI_FIRETRUCK) {
+
+		float &carGunLR = ((CAutomobile*)car)->m_fCarGunLR;
+		CVector hi = Multiply3x3(Front, car->GetMatrix());
+
+		// III/VC's firetruck turret angle is reversed
+		float angleToFace = (car->GetModelIndex() == MI_FIRETRUCK ? -hi.Heading() : hi.Heading());
+
+		if (angleToFace <= carGunLR + PI) {
+			if (angleToFace < carGunLR - PI)
+				angleToFace = angleToFace + TWOPI;
+		} else {
+			angleToFace = angleToFace - TWOPI;
+		}
+
+		float neededTurn = angleToFace - carGunLR;
+		float turnPerFrame = CTimer::GetTimeStep() * (car->GetModelIndex() == MI_FIRETRUCK ? 0.05f : 0.015f);
+		if (neededTurn <= turnPerFrame) {
+			if (neededTurn < -turnPerFrame)
+				angleToFace = carGunLR - turnPerFrame;
+		} else {
+			angleToFace = turnPerFrame + carGunLR;
+		}
+
+		if (car->GetModelIndex() == MI_RHINO && carGunLR != angleToFace) {
+			DMAudio.PlayOneShot(car->m_audioEntityId, SOUND_CAR_TANK_TURRET_ROTATE, Abs(angleToFace - carGunLR));
+		}
+		carGunLR = angleToFace;
+
+		if (carGunLR < -PI) {
+			carGunLR += TWOPI;
+		} else if (carGunLR > PI) {
+			carGunLR -= TWOPI;
+		}
+
+		// Because firetruk turret also has Y movement
+		if (car->GetModelIndex() == MI_FIRETRUCK) {
+			float &carGunUD = ((CAutomobile*)car)->m_fCarGunUD;
+
+			float alphaToFace = Atan2(hi.z, hi.Magnitude2D()) + DEGTORAD(15.0f);
+			float neededAlphaTurn = alphaToFace - carGunUD;
+			float alphaTurnPerFrame = CTimer::GetTimeStep() * 0.02f;
+
+			if (neededAlphaTurn > alphaTurnPerFrame) {
+				neededTurn = alphaTurnPerFrame;
+				carGunUD = neededTurn + carGunUD;
+			} else {
+				if (neededAlphaTurn >= -alphaTurnPerFrame) {
+					carGunUD = alphaToFace;
+				} else {
+					carGunUD = carGunUD - alphaTurnPerFrame;
+				}
+			}
+
+			float turretMinY = -DEGTORAD(20.0f);
+			float turretMaxY = DEGTORAD(20.0f);
+			if (turretMinY <= carGunUD) {
+				if (carGunUD > turretMaxY)
+					carGunUD = turretMaxY;
+			} else {
+				carGunUD = turretMinY;
+			}
+		}
+	}
+}
+#endif
diff --git a/src/core/Camera.cpp b/src/core/Camera.cpp
new file mode 100644
index 0000000..5b3f9aa
--- /dev/null
+++ b/src/core/Camera.cpp
@@ -0,0 +1,4148 @@
+#include "common.h"
+
+#include "main.h"
+#include "Draw.h"
+#include "World.h"
+#include "Vehicle.h"
+#include "Train.h"
+#include "Automobile.h"
+#include "Ped.h"
+#include "PlayerPed.h"
+#include "Wanted.h"
+#include "Pad.h"
+#include "ControllerConfig.h"
+#include "General.h"
+#include "ZoneCull.h"
+#include "SurfaceTable.h"
+#include "Particle.h"
+#include "WaterLevel.h"
+#include "World.h"
+#include "Garages.h"
+#include "Replay.h"
+#include "CutsceneMgr.h"
+#include "Renderer.h"
+#include "Timecycle.h"
+#include "MBlur.h"
+#include "Text.h"
+#include "Hud.h"
+#include "DMAudio.h"
+#include "FileMgr.h"
+#include "Frontend.h"
+#include "SceneEdit.h"
+#include "Pools.h"
+#include "Debug.h"
+#include "GenericGameStorage.h"
+#include "Camera.h"
+
+enum
+{
+	// car
+	OBBE_WHEEL,
+	OBBE_1,
+	OBBE_2,
+	OBBE_3,
+	OBBE_1STPERSON,	// unused
+	OBBE_5,
+	OBBE_ONSTRING,
+	OBBE_COPCAR,
+	OBBE_COPCAR_WHEEL,
+	// ped
+	OBBE_9,
+	OBBE_10,
+	OBBE_11,
+	OBBE_12,
+	OBBE_13,
+	// heli
+	OBBE_14,
+	OBBE_15,
+	OBBE_16,
+	OBBE_17,
+	OBBE_18,
+	OBBE_19,
+	OBBE_ONSTRING_HELI,
+
+	OBBE_INVALID
+};
+
+// abbreviate a few things
+#define PLAYER (CWorld::Players[CWorld::PlayerInFocus].m_pPed)
+// NB: removed explicit TheCamera from all functions
+
+CCamera TheCamera;
+#ifdef PC_PLAYER_CONTROLS
+bool CCamera::m_bUseMouse3rdPerson = true;
+#else
+bool CCamera::m_bUseMouse3rdPerson = false;
+#endif
+bool bDidWeProcessAnyCinemaCam;
+static bool bSwitchedToObbeCam;
+float CCamera::m_fMouseAccelHorzntl;
+float CCamera::m_fMouseAccelVertical;
+float CCamera::m_f3rdPersonCHairMultX;
+float CCamera::m_f3rdPersonCHairMultY;
+
+#ifdef IMPROVED_CAMERA
+#define KEYJUSTDOWN(k) ControlsManager.GetIsKeyboardKeyJustDown((RsKeyCodes)k)
+#define KEYDOWN(k) ControlsManager.GetIsKeyboardKeyDown((RsKeyCodes)k)
+#define CTRLJUSTDOWN(key) \
+	       ((KEYDOWN(rsLCTRL) || KEYDOWN(rsRCTRL)) && KEYJUSTDOWN((RsKeyCodes)key) || \
+	        (KEYJUSTDOWN(rsLCTRL) || KEYJUSTDOWN(rsRCTRL)) && KEYDOWN((RsKeyCodes)key))
+#define CTRLDOWN(key) ((KEYDOWN(rsLCTRL) || KEYDOWN(rsRCTRL)) && KEYDOWN((RsKeyCodes)key))
+#endif
+
+const float ZOOM_ONE_DISTANCE[] = { -0.6f, 0.05f, -3.2f, 0.05f, -2.41f };
+const float ZOOM_TWO_DISTANCE[] = { 1.9f, 1.4f, 0.65f, 1.9f, 6.49f };
+const float ZOOM_THREE_DISTANCE[] = { 15.9f, 15.9f, 15.9f, 15.9f, 25.25f };
+
+#ifdef FREE_CAM
+const float LCS_ZOOM_ONE_DISTANCE[] = { -1.0f, -0.2f, -3.2f, 0.05f, -2.41f };
+const float LCS_ZOOM_TWO_DISTANCE[] = { 2.0f, 2.2f, 1.65f, 2.9f, 6.49f };
+const float LCS_ZOOM_THREE_DISTANCE[] = { 6.0f, 6.0f, 15.9f, 15.9f, 15.0f };
+#endif
+
+CCamera::CCamera(void)
+{
+	Init();
+}
+
+void
+CCamera::Init(void)
+{
+	memset(this, 0, sizeof(CCamera));	// this is fine, no vtable
+	m_pRwCamera = nil;
+	m_bPlayerWasOnBike = false;
+	m_1rstPersonRunCloseToAWall = false;
+	m_fPositionAlongSpline = 0.0f;
+	m_bCameraJustRestored = false;
+	Cams[0].Init();
+	Cams[1].Init();
+	Cams[2].Init();
+	Cams[0].Mode = CCam::MODE_FOLLOWPED;
+	Cams[1].Mode = CCam::MODE_FOLLOWPED;
+	m_bEnable1rstPersonCamCntrlsScript = false;
+	m_bAllow1rstPersonWeaponsCamera = false;
+	m_bVehicleSuspenHigh = false;
+	Cams[0].m_fMinRealGroundDist = 1.85f;
+	// TODO: what weird value is this?
+	Cams[0].m_fTargetCloseInDist = 2.0837801f - Cams[0].m_fMinRealGroundDist;
+	Cams[0].m_fTargetZoomGroundOne = 0.25f;
+	Cams[0].m_fTargetZoomGroundTwo = 1.5f;
+	Cams[0].m_fTargetZoomGroundThree = 4.0f;
+	Cams[0].m_fTargetZoomOneZExtra = -0.14f;
+	Cams[0].m_fTargetZoomTwoZExtra = 0.16f;
+	Cams[0].m_fTargetZoomThreeZExtra = 0.25f;
+	// TODO: another weird value
+	Cams[0].m_fTargetZoomZCloseIn = 0.90040702f;
+	m_bMoveCamToAvoidGeom = false;
+	ClearPlayerWeaponMode();
+	m_bInATunnelAndABigVehicle = false;
+	m_iModeObbeCamIsInForCar = OBBE_INVALID;
+	Cams[0].CamTargetEntity = nil;
+	Cams[1].CamTargetEntity = nil;
+	Cams[2].CamTargetEntity = nil;
+	Cams[0].m_fCamBufferedHeight = 0.0f;
+	Cams[0].m_fCamBufferedHeightSpeed = 0.0f;
+	Cams[1].m_fCamBufferedHeight = 0.0f;
+	Cams[1].m_fCamBufferedHeightSpeed = 0.0f;
+	Cams[0].m_bCamLookingAtVector = false;
+	Cams[1].m_bCamLookingAtVector = false;
+	Cams[2].m_bCamLookingAtVector = false;
+	Cams[0].m_fPlayerVelocity = 0.0f;
+	Cams[1].m_fPlayerVelocity = 0.0f;
+	Cams[2].m_fPlayerVelocity = 0.0f;
+	m_bHeadBob = false;
+	m_fFractionInterToStopMoving = 0.25f;
+	m_fFractionInterToStopCatchUp = 0.75f;
+	m_fGaitSwayBuffer = 0.85f;
+	m_bScriptParametersSetForInterPol = false;
+	m_uiCamShakeStart = 0;
+	m_fCamShakeForce = 0.0f;
+	m_iModeObbeCamIsInForCar = OBBE_INVALID;
+	m_bIgnoreFadingStuffForMusic = false;
+	m_bWaitForInterpolToFinish = false;
+	pToGarageWeAreIn = nil;
+	pToGarageWeAreInForHackAvoidFirstPerson = nil;
+	m_bPlayerIsInGarage = false;
+	m_bJustCameOutOfGarage = false;
+	m_fNearClipScript = DEFAULT_NEAR;
+	m_bUseNearClipScript = false;
+	m_vecDoingSpecialInterPolation = false;
+	m_bAboveGroundTrainNodesLoaded = false;
+	m_bBelowGroundTrainNodesLoaded = false;
+	m_WideScreenOn = false;
+	m_fFOV_Wide_Screen = 0.0f;
+	m_bRestoreByJumpCut = false;
+	CarZoomIndicator = CAM_ZOOM_2;
+	PedZoomIndicator = CAM_ZOOM_2;
+	CarZoomValueSmooth = 0.0f;
+	m_fPedZoomValueSmooth = 0.0f;
+	pTargetEntity = nil;
+	if(FindPlayerVehicle())
+		pTargetEntity = FindPlayerVehicle();
+	else
+		pTargetEntity = CWorld::Players[CWorld::PlayerInFocus].m_pPed;
+	m_bInitialNodeFound = false;
+	m_ScreenReductionPercentage = 0.0f;
+	m_ScreenReductionSpeed = 0.0f;
+	m_WideScreenOn = false;
+	m_bWantsToSwitchWidescreenOff = false;
+	WorldViewerBeingUsed = false;
+	PlayerExhaustion = 1.0f;
+	DebugCamMode = CCam::MODE_NONE;
+	m_PedOrientForBehindOrInFront = 0.0f;
+	if(!FrontEndMenuManager.m_bWantToRestart){
+		m_bFading = false;
+		CDraw::FadeValue = 0;
+		m_fFLOATingFade = 0.0f;
+		m_bMusicFading = false;
+		m_fTimeToFadeMusic = 0.0f;
+		m_fFLOATingFadeMusic = 0.0f;
+		m_fMouseAccelVertical = 0.003f;
+		m_fMouseAccelHorzntl = 0.0025f;
+	}
+	if(FrontEndMenuManager.m_bWantToRestart)
+		m_fTimeToFadeMusic = 0.0f;
+	m_bStartingSpline = false;
+	m_iTypeOfSwitch = INTERPOLATION;
+	m_bUseScriptZoomValuePed = false;
+	m_bUseScriptZoomValueCar = false;
+	m_fPedZoomValueScript = 0.0f;
+	m_fCarZoomValueScript = 0.0f;
+	m_bUseSpecialFovTrain = false;
+	m_fFovForTrain = 70.0f;	// or DefaultFOV from Cam.cpp
+	m_iModeToGoTo = CCam::MODE_FOLLOWPED;
+	m_bJust_Switched = false;
+	m_bUseTransitionBeta = false;
+	m_matrix.SetScale(1.0f);
+	m_bTargetJustBeenOnTrain = false;
+	m_bInitialNoNodeStaticsSet = false;
+	m_uiLongestTimeInMill = 5000;
+	m_uiTimeLastChange = 0;
+	m_uiTimeWeEnteredIdle = 0;
+	m_bIdleOn = false;
+	m_uiTimeWeLeftIdle_StillNoInput = 0;
+	m_uiTimeWeEnteredIdle = 0;
+	LODDistMultiplier = 1.0f;
+	m_bCamDirectlyBehind = false;
+	m_bCamDirectlyInFront = false;
+	m_motionBlur = 0;
+	m_bGarageFixedCamPositionSet = false;
+	SetMotionBlur(255, 255, 255, 0, 0);
+	m_bCullZoneChecksOn = false;
+	m_bFailedCullZoneTestPreviously = false;
+	m_iCheckCullZoneThisNumFrames = 6;
+	m_iZoneCullFrameNumWereAt = 0;
+	m_CameraAverageSpeed = 0.0f;
+	m_CameraSpeedSoFar = 0.0f;
+	m_PreviousCameraPosition = CVector(0.0f, 0.0f, 0.0f);
+	m_iWorkOutSpeedThisNumFrames = 4;
+	m_iNumFramesSoFar = 0;
+	m_bJustInitalised = true;
+	m_uiTransitionState = 0;
+	m_uiTimeTransitionStart = 0;
+	m_bLookingAtPlayer = true;
+	m_f3rdPersonCHairMultX = 0.53f;
+	m_f3rdPersonCHairMultY = 0.4f;
+	m_fAvoidTheGeometryProbsTimer = 0.0f;
+	m_nAvoidTheGeometryProbsDirn = 0;
+}
+
+void
+CCamera::Process(void)
+{
+	// static bool InterpolatorNotInitialised = true;	// unused
+	static float PlayerMinDist = 1.3f;
+	static bool WasPreviouslyInterSyhonFollowPed = false;	// only written
+	float FOV = 0.0f;
+	float oldBeta, newBeta;
+	float deltaBeta = 0.0f;
+	bool lookLRBVehicle = false;
+	CVector CamFront, CamUp, CamRight, CamSource, Target;
+
+	m_bJust_Switched = false;
+	m_RealPreviousCameraPosition = GetPosition();
+
+	// Update target entity
+	if(m_bLookingAtPlayer || m_bTargetJustBeenOnTrain || WhoIsInControlOfTheCamera == CAMCONTROL_OBBE)
+		UpdateTargetEntity();
+	if(pTargetEntity == nil)
+		pTargetEntity = FindPlayerPed();
+	if(Cams[ActiveCam].CamTargetEntity == nil)
+		Cams[ActiveCam].CamTargetEntity = pTargetEntity;
+	if(Cams[(ActiveCam+1)%2].CamTargetEntity == nil)
+		Cams[(ActiveCam+1)%2].CamTargetEntity = pTargetEntity;
+
+	CamControl();
+	if(m_bFading)
+		ProcessFade();
+	if(m_bMusicFading)
+		ProcessMusicFade();
+	if(m_WideScreenOn)
+		ProcessWideScreenOn();
+
+#ifndef MASTER
+#ifdef IMPROVED_CAMERA
+	if(CPad::GetPad(1)->GetCircleJustDown() || CTRLJUSTDOWN('B')){
+#else
+	if(CPad::GetPad(1)->GetCircleJustDown()){
+#endif
+		WorldViewerBeingUsed = !WorldViewerBeingUsed;
+		if(WorldViewerBeingUsed)
+			InitialiseCameraForDebugMode();
+		else
+			CPad::m_bMapPadOneToPadTwo = false;
+	}
+#endif
+
+	RwCameraSetNearClipPlane(Scene.camera, DEFAULT_NEAR);
+
+	if(Cams[ActiveCam].Front.x == 0.0f && Cams[ActiveCam].Front.y == 0.0f)
+		oldBeta = 0.0f;
+	else
+		oldBeta = CGeneral::GetATanOfXY(Cams[ActiveCam].Front.x, Cams[ActiveCam].Front.y);
+
+	Cams[ActiveCam].Process();
+	Cams[ActiveCam].ProcessSpecialHeightRoutines();
+
+	if(Cams[ActiveCam].Front.x == 0.0f && Cams[ActiveCam].Front.y == 0.0f)
+		newBeta = 0.0f;
+	else
+		newBeta = CGeneral::GetATanOfXY(Cams[ActiveCam].Front.x, Cams[ActiveCam].Front.y);
+
+
+	// Stop transition when it's done
+	if(m_uiTransitionState != 0){
+		if(CTimer::GetTimeInMilliseconds() > m_uiTransitionDuration+m_uiTimeTransitionStart){
+			m_uiTransitionState = 0;
+			m_vecDoingSpecialInterPolation = false;
+			m_bWaitForInterpolToFinish = false;
+		}
+	}
+
+	if(m_bUseNearClipScript)
+		RwCameraSetNearClipPlane(Scene.camera, m_fNearClipScript);
+
+	deltaBeta = newBeta - oldBeta;
+	while(deltaBeta >= PI) deltaBeta -= 2*PI;
+	while(deltaBeta < -PI) deltaBeta += 2*PI;
+	if(Abs(deltaBeta) > 0.3f)
+		m_bJust_Switched = true;
+
+#ifndef MASTER
+	// Debug stuff
+	if(!gbModelViewer)
+		Cams[ActiveCam].PrintMode();	// actually missing in VC
+	if(WorldViewerBeingUsed)
+		Cams[2].Process();
+#endif
+
+	if(Cams[ActiveCam].DirectionWasLooking != LOOKING_FORWARD && pTargetEntity->IsVehicle())
+		lookLRBVehicle = true;
+
+	if(m_uiTransitionState != 0 && !lookLRBVehicle){
+		// Process transition
+
+		uint32 currentTime = CTimer::GetTimeInMilliseconds() - m_uiTimeTransitionStart;
+		if(currentTime >= m_uiTransitionDuration)
+			currentTime = m_uiTransitionDuration;
+		float fractionInter = (float) currentTime / m_uiTransitionDuration;
+		float fractionInterTarget = (float) currentTime / m_uiTransitionDurationTargetCoors;
+		fractionInterTarget = clamp(fractionInterTarget, 0.0f, 1.0f);
+
+		// Interpolate target separately
+		if(fractionInterTarget <= m_fFractionInterToStopMovingTarget){
+			float inter;
+			if(m_fFractionInterToStopMovingTarget == 0.0f)
+				inter = 0.0f;
+			else
+				inter = (m_fFractionInterToStopMovingTarget - fractionInterTarget)/m_fFractionInterToStopMovingTarget;
+			inter = 0.5f - 0.5*Cos(inter*PI);	// smooth it
+
+			m_vecTargetWhenInterPol = m_cvecStartingTargetForInterPol + inter*m_cvecTargetSpeedAtStartInter;
+			Target = m_vecTargetWhenInterPol;
+		}else if(fractionInterTarget > m_fFractionInterToStopMovingTarget){
+			float inter;
+			if(m_fFractionInterToStopCatchUpTarget == 0.0f)
+				inter = 0.0f;
+			else
+				inter = (fractionInterTarget - m_fFractionInterToStopMovingTarget)/m_fFractionInterToStopCatchUpTarget;
+			inter = 0.5f - 0.5*Cos(inter*PI);	// smooth it
+
+			if(m_fFractionInterToStopMovingTarget == 0.0f)
+				m_vecTargetWhenInterPol = m_cvecStartingTargetForInterPol;
+			Target = m_vecTargetWhenInterPol + inter*(Cams[ActiveCam].m_cvecTargetCoorsForFudgeInter - m_vecTargetWhenInterPol);
+		}
+
+		if(fractionInter <= m_fFractionInterToStopMoving){
+			float inter;
+			if(m_fFractionInterToStopMoving == 0.0f)
+				inter = 0.0f;
+			else
+				inter = (m_fFractionInterToStopMoving - fractionInter)/m_fFractionInterToStopMoving;
+			inter = 0.5f - 0.5*Cos(inter*PI);	// smooth it
+
+			m_vecSourceWhenInterPol = m_cvecStartingSourceForInterPol + inter*m_cvecSourceSpeedAtStartInter;
+
+			if(m_bLookingAtPlayer){
+				CVector ToCam = m_vecSourceWhenInterPol - Target;
+				if(ToCam.Magnitude2D() < PlayerMinDist){
+					float beta = CGeneral::GetATanOfXY(ToCam.x, ToCam.y);
+					CamSource.x = Target.x + PlayerMinDist*Cos(beta);
+					CamSource.y = Target.y + PlayerMinDist*Sin(beta);
+				}
+			}
+
+			m_vecUpWhenInterPol = m_cvecStartingUpForInterPol + inter*m_cvecUpSpeedAtStartInter;
+			m_fFOVWhenInterPol = m_fStartingFOVForInterPol + inter*m_fFOVSpeedAtStartInter;
+
+			CamSource = m_vecSourceWhenInterPol;
+			CamFront = Target - CamSource;
+			StoreValuesDuringInterPol(CamSource, m_vecTargetWhenInterPol, m_vecUpWhenInterPol, m_fFOVWhenInterPol);
+			CamFront.Normalise();
+			if(m_bLookingAtPlayer)
+				CamUp = CVector(0.0f, 0.0f, 1.0f);
+			else
+				CamUp = m_vecUpWhenInterPol;
+			CamUp.Normalise();
+
+			if(Cams[ActiveCam].Mode == CCam::MODE_TOPDOWN || Cams[ActiveCam].Mode == CCam::MODE_TOP_DOWN_PED){
+				CamFront.Normalise();
+				CamRight = CVector(-1.0f, 0.0f, 0.0f);
+				CamUp = CrossProduct(CamFront, CamRight);
+				CamUp.Normalise();
+			}else{
+				CamFront.Normalise();
+				CamUp.Normalise();
+				CamRight = CrossProduct(CamFront, CamUp);
+				CamRight.Normalise();
+				CamUp = CrossProduct(CamRight, CamFront);
+				CamUp.Normalise();
+			}
+			FOV = m_fFOVWhenInterPol;
+		}else if(fractionInter > m_fFractionInterToStopMoving && fractionInter <= 1.0f){
+			float inter;
+			if(m_fFractionInterToStopCatchUp == 0.0f)
+				inter = 0.0f;
+			else
+				inter = (fractionInter - m_fFractionInterToStopMoving)/m_fFractionInterToStopCatchUp;
+			inter = 0.5f - 0.5*Cos(inter*PI);	// smooth it
+
+			CamSource = m_vecSourceWhenInterPol + inter*(Cams[ActiveCam].Source - m_vecSourceWhenInterPol);
+
+			if(m_bLookingAtPlayer){
+				CVector ToCam = m_vecSourceWhenInterPol - Target;
+				if(ToCam.Magnitude2D() < PlayerMinDist){
+					float beta = CGeneral::GetATanOfXY(ToCam.x, ToCam.y);
+					CamSource.x = Target.x + PlayerMinDist*Cos(beta);
+					CamSource.y = Target.y + PlayerMinDist*Sin(beta);
+				}
+			}
+
+			FOV = m_fFOVWhenInterPol + inter*(Cams[ActiveCam].FOV - m_fFOVWhenInterPol);
+			CamUp = m_vecUpWhenInterPol + inter*(Cams[ActiveCam].Up - m_vecUpWhenInterPol);
+			deltaBeta = Cams[ActiveCam].m_fTrueBeta - m_fBetaWhenInterPol;
+			MakeAngleLessThan180(deltaBeta);
+
+			CamFront = Target - CamSource;
+			StoreValuesDuringInterPol(CamSource, Target, CamUp, FOV);
+			CamFront.Normalise();
+			if(m_bLookingAtPlayer)
+				CamUp = CVector(0.0f, 0.0f, 1.0f);
+
+			if(Cams[ActiveCam].Mode == CCam::MODE_TOPDOWN || Cams[ActiveCam].Mode == CCam::MODE_TOP_DOWN_PED){
+				CamFront.Normalise();
+				CamRight = CVector(-1.0f, 0.0f, 0.0f);
+				CamUp = CrossProduct(CamFront, CamRight);
+				CamUp.Normalise();
+			}else{
+				CamFront.Normalise();
+				CamUp.Normalise();
+				CamRight = CrossProduct(CamFront, CamUp);
+				CamRight.Normalise();
+				CamUp = CrossProduct(CamRight, CamFront);
+				CamUp.Normalise();
+			}
+#ifndef FIX_BUGS
+			// BUG: FOV was already interpolated but m_fFOVWhenInterPol was not
+			FOV = m_fFOVWhenInterPol;
+#endif
+		}
+
+		CVector Dist = CamSource - Target;
+		float DistOnGround = Dist.Magnitude2D();
+		float Alpha = CGeneral::GetATanOfXY(DistOnGround, Dist.z);
+		float Beta = CGeneral::GetATanOfXY(Dist.x, Dist.y);
+		Cams[ActiveCam].KeepTrackOfTheSpeed(CamSource, Target, CamUp, Alpha, Beta, FOV);
+	}else{
+		// No transition, take Cam values directly
+#ifndef MASTER
+		if(WorldViewerBeingUsed){
+			CamSource = Cams[2].Source;
+			CamFront = Cams[2].Front;
+			CamUp = Cams[2].Up;
+			FOV = Cams[2].FOV;
+		}else
+#endif
+		{
+			CamSource = Cams[ActiveCam].Source;
+			CamUp = Cams[ActiveCam].Up;
+			if(m_bMoveCamToAvoidGeom){
+				CamSource += m_vecClearGeometryVec;
+				CamFront = Cams[ActiveCam].m_cvecTargetCoorsForFudgeInter - CamSource;
+				CamFront.Normalise();
+				CVector Right = CrossProduct(CamFront, CamUp);
+				Right.Normalise();
+				CamUp = CrossProduct(Right, CamFront);
+				CamUp.Normalise();
+			}else{
+				CamFront = Cams[ActiveCam].Front;
+				CamUp = Cams[ActiveCam].Up;
+			}
+			FOV = Cams[ActiveCam].FOV;
+		}
+		WasPreviouslyInterSyhonFollowPed = false;	// unused
+	}
+
+	if(m_uiTransitionState != 0)
+		if(!m_bLookingAtVector && m_bLookingAtPlayer && !CCullZones::CamStairsForPlayer() && !m_bPlayerIsInGarage){
+			CEntity *entity = nil;
+			CColPoint colPoint;
+			if(CWorld::ProcessLineOfSight(pTargetEntity->GetPosition(), CamSource, colPoint, entity, true, false, false, true, false, true, true)){
+				CamSource = colPoint.point;
+				RwCameraSetNearClipPlane(Scene.camera, 0.05f);
+			}
+		}
+
+	if(CMBlur::Drunkness > 0.0f){
+		static float DrunkAngle;
+
+		int tableIndex = (int)(DEGTORAD(DrunkAngle)/TWOPI * CParticle::SIN_COS_TABLE_SIZE) & CParticle::SIN_COS_TABLE_SIZE-1;
+		DrunkAngle += 5.0f;
+#ifndef FIX_BUGS
+		// This just messes up interpolation, probably not what they intended
+		// and multiplying the interpolated FOV is also a bit extreme
+		// so let's not do any of this nonsense
+		Cams[ActiveCam].FOV *= (1.0f + CMBlur::Drunkness);
+#endif
+
+		CamSource.x += -0.02f*CMBlur::Drunkness * CParticle::m_CosTable[tableIndex];
+		CamSource.y += -0.02f*CMBlur::Drunkness * CParticle::m_SinTable[tableIndex];
+
+		CamUp.Normalise();
+		CamUp.x += 0.05f*CMBlur::Drunkness * CParticle::m_CosTable[tableIndex];
+		CamUp.y += 0.05f*CMBlur::Drunkness * CParticle::m_SinTable[tableIndex];
+		CamUp.Normalise();
+
+		CamFront.Normalise();
+		CamFront.x += -0.1f*CMBlur::Drunkness * CParticle::m_CosTable[tableIndex];
+		CamFront.y += -0.1f*CMBlur::Drunkness * CParticle::m_SinTable[tableIndex];
+		CamFront.Normalise();
+
+		CamRight = CrossProduct(CamFront, CamUp);
+		CamRight.Normalise();
+		CamUp = CrossProduct(CamRight, CamFront);
+		CamUp.Normalise();
+	}
+
+	GetMatrix().GetRight() = CrossProduct(CamUp, CamFront);	// actually Left
+	GetMatrix().GetForward() = CamFront;
+	GetMatrix().GetUp() = CamUp;
+	GetMatrix().GetPosition() = CamSource;
+
+	// Process Shake
+	float shakeStrength = m_fCamShakeForce - 0.28f*(CTimer::GetTimeInMilliseconds()-m_uiCamShakeStart)/1000.0f;
+	shakeStrength = clamp(shakeStrength, 0.0f, 2.0f);
+	int shakeRand = CGeneral::GetRandomNumber();
+	float shakeOffset = shakeStrength*0.1f;
+	GetMatrix().GetPosition().x += shakeOffset * ((shakeRand & 0xF) - 7);
+	GetMatrix().GetPosition().y += shakeOffset * (((shakeRand & 0xF0) >> 4) - 7);
+	GetMatrix().GetPosition().z += shakeOffset * (((shakeRand & 0xF00) >> 8) - 7);
+
+	if(shakeOffset > 0.0f && m_BlurType != MOTION_BLUR_SNIPER)
+		SetMotionBlurAlpha(Min((int)(shakeStrength*255.0f) + 25, 150));
+
+	static bool bExtra1stPrsBlur = false;
+	if(Cams[ActiveCam].Mode == CCam::MODE_1STPERSON && FindPlayerVehicle() && FindPlayerVehicle()->GetUp().z < 0.2f){
+		SetMotionBlur(230, 230, 230, 215, MOTION_BLUR_LIGHT_SCENE);
+		bExtra1stPrsBlur = true;
+	}else if(bExtra1stPrsBlur){
+		SetMotionBlur(CTimeCycle::GetBlurRed(), CTimeCycle::GetBlurGreen(), CTimeCycle::GetBlurBlue(), m_motionBlur, MOTION_BLUR_LIGHT_SCENE);
+		bExtra1stPrsBlur = false;
+	}
+
+	CalculateDerivedValues();
+	CDraw::SetFOV(FOV);
+
+	// Set RW camera
+#ifndef MASTER
+	if(WorldViewerBeingUsed){
+		RwFrame *frame = RwCameraGetFrame(m_pRwCamera);
+		CVector Source = Cams[2].Source;
+		CVector Front = Cams[2].Front;
+		CVector Up = Cams[2].Up;
+
+		GetMatrix().GetRight() = CrossProduct(Up, Front);
+		GetMatrix().GetForward() = Front;
+		GetMatrix().GetUp() = Up;
+		GetMatrix().GetPosition() = Source;
+
+		CDraw::SetFOV(Cams[2].FOV);
+		m_vecGameCamPos = Cams[ActiveCam].Source;
+
+		*RwMatrixGetPos(RwFrameGetMatrix(frame)) = GetPosition();
+		*RwMatrixGetAt(RwFrameGetMatrix(frame)) = GetForward();
+		*RwMatrixGetUp(RwFrameGetMatrix(frame)) = GetUp();
+		*RwMatrixGetRight(RwFrameGetMatrix(frame)) = GetRight();
+		RwMatrixUpdate(RwFrameGetMatrix(frame));
+		RwFrameUpdateObjects(frame);
+	}else
+#endif
+	{
+		RwFrame *frame = RwCameraGetFrame(m_pRwCamera);
+		m_vecGameCamPos = GetPosition();
+		*RwMatrixGetPos(RwFrameGetMatrix(frame)) = GetPosition();
+		*RwMatrixGetAt(RwFrameGetMatrix(frame)) = GetForward();
+		*RwMatrixGetUp(RwFrameGetMatrix(frame)) = GetUp();
+		*RwMatrixGetRight(RwFrameGetMatrix(frame)) = GetRight();
+		RwMatrixUpdate(RwFrameGetMatrix(frame));
+		RwFrameUpdateObjects(frame);
+		RwFrameOrthoNormalize(frame);
+	}
+
+	UpdateSoundDistances();
+
+	if((CTimer::GetFrameCounter()&0xF) == 3)
+		DistanceToWater = CWaterLevel::CalcDistanceToWater(GetPosition().x, GetPosition().y);
+
+	// LOD dist
+	if(!CCutsceneMgr::IsRunning() || CCutsceneMgr::UseLodMultiplier()){
+		LODDistMultiplier = 70.0f/CDraw::GetFOV();
+
+		if(GetPosition().z > 55.0f && FindPlayerVehicle() && FindPlayerVehicle()->pHandling->Flags & (HANDLING_IS_HELI|HANDLING_IS_PLANE) ||
+		   FindPlayerPed()->m_attachedTo){
+			LODDistMultiplier *= 1.0f + Max((GetPosition().z - 55.0f)/60.0f, 0.0f);
+			float NewNear = DEFAULT_NEAR * (1.0f + Max((GetPosition().z - 55.0f)/60.0f, 0.0f));
+			if(RwCameraGetNearClipPlane(Scene.camera) >= DEFAULT_NEAR)
+				RwCameraSetNearClipPlane(Scene.camera, NewNear);
+		}
+		if(LODDistMultiplier > 2.2f) LODDistMultiplier = 2.2f;
+	}else
+		LODDistMultiplier = 1.0f;
+	GenerationDistMultiplier = LODDistMultiplier;
+	LODDistMultiplier *= CRenderer::ms_lodDistScale;
+
+	CDraw::SetNearClipZ(RwCameraGetNearClipPlane(m_pRwCamera));
+	CDraw::SetFarClipZ(RwCameraGetFarClipPlane(m_pRwCamera));
+
+	// Keep track of speed
+	if(m_bJustInitalised || m_bJust_Switched){
+		m_PreviousCameraPosition = GetPosition();
+		m_bJustInitalised = false;
+	}
+	m_CameraSpeedSoFar += (GetPosition() - m_PreviousCameraPosition).Magnitude();
+	m_iNumFramesSoFar++;
+	if(m_iNumFramesSoFar == m_iWorkOutSpeedThisNumFrames){
+		m_CameraAverageSpeed = m_CameraSpeedSoFar / m_iWorkOutSpeedThisNumFrames;
+		m_CameraSpeedSoFar = 0.0f;
+		m_iNumFramesSoFar = 0;
+	}
+	m_PreviousCameraPosition = GetPosition();
+
+	if(Cams[ActiveCam].DirectionWasLooking != LOOKING_FORWARD && Cams[ActiveCam].Mode != CCam::MODE_TOP_DOWN_PED){
+		Cams[ActiveCam].Source = Cams[ActiveCam].SourceBeforeLookBehind;
+		Orientation += PI;
+	}
+
+	if(m_uiTransitionState != 0){
+		int OtherCam = (ActiveCam+1)%2;
+		if(Cams[OtherCam].CamTargetEntity &&
+		   pTargetEntity && pTargetEntity->IsPed() &&
+		   !Cams[OtherCam].CamTargetEntity->IsVehicle() &&
+		   Cams[ActiveCam].Mode != CCam::MODE_TOP_DOWN_PED && Cams[ActiveCam].DirectionWasLooking != LOOKING_FORWARD){
+			Cams[OtherCam].Source = Cams[ActiveCam%2].SourceBeforeLookBehind;
+			Orientation += PI;
+		}
+	}
+
+	m_bCameraJustRestored = false;
+	m_bMoveCamToAvoidGeom = false;
+}
+
+void
+CCamera::CamControl(void)
+{
+	static bool PlaceForFixedWhenSniperFound = false;
+	static int16 ReqMode;
+	bool switchByJumpCut = false;
+	bool stairs = false;
+	bool boatTarget = false;
+	int PrevMode = Cams[ActiveCam].Mode;
+	CVector targetPos;
+	CVector garageCenter, garageDoorPos1, garageDoorPos2;
+	CVector garageCenterToDoor, garageCamPos;
+	int whichDoor;
+
+	m_bObbeCinematicPedCamOn = false;
+	m_bObbeCinematicCarCamOn = false;
+	m_bUseTransitionBeta = false;
+	m_bUseSpecialFovTrain = false;
+	m_bJustCameOutOfGarage = false;
+	m_bTargetJustCameOffTrain = false;
+	m_bInATunnelAndABigVehicle = false;
+	m_bJustJumpedOutOf1stPersonBecauseOfTarget = false;
+	bSwitchedToObbeCam = false;
+
+	if(Cams[ActiveCam].CamTargetEntity == nil && pTargetEntity == nil)
+		pTargetEntity = PLAYER;
+
+	m_iZoneCullFrameNumWereAt++;
+	if(m_iZoneCullFrameNumWereAt > m_iCheckCullZoneThisNumFrames)
+		m_iZoneCullFrameNumWereAt = 1;
+	m_bCullZoneChecksOn = m_iZoneCullFrameNumWereAt == m_iCheckCullZoneThisNumFrames;
+	if(m_bCullZoneChecksOn)
+		m_bFailedCullZoneTestPreviously = CCullZones::CamCloseInForPlayer();
+
+	if(m_bLookingAtPlayer){
+		CPad::GetPad(0)->DisablePlayerControls &= ~PLAYERCONTROL_CAMERA;
+		FindPlayerPed()->bIsVisible = true;
+	}
+
+	if(!CTimer::GetIsPaused() && !m_bIdleOn){
+		float CloseInCarHeightTarget = 0.0f;
+		float CloseInPedHeightTarget = 0.0f;
+
+		if(m_bTargetJustBeenOnTrain){
+			// Getting off train
+			if(!pTargetEntity->IsVehicle() || !((CVehicle*)pTargetEntity)->IsTrain()){
+				Restore();
+				m_bTargetJustCameOffTrain = true;
+				m_bTargetJustBeenOnTrain = false;
+				SetWideScreenOff();
+			}
+		}
+
+		// Vehicle target
+		if(pTargetEntity->IsVehicle()){
+#ifdef GTA_TRAIN
+			if(((CVehicle*)pTargetEntity)->IsTrain()){
+				if(!m_bTargetJustBeenOnTrain){
+					m_bInitialNodeFound = false;
+					m_bInitialNoNodeStaticsSet = false;
+				}
+				Process_Train_Camera_Control();
+			}else
+#endif
+			{
+				if(((CVehicle*)pTargetEntity)->IsBoat() && pTargetEntity->GetModelIndex() != MI_SKIMMER)
+					boatTarget = true;
+
+				// Change user selected mode
+				if(CPad::GetPad(0)->CycleCameraModeUpJustDown() && !CReplay::IsPlayingBack() &&
+				   (m_bLookingAtPlayer || WhoIsInControlOfTheCamera == CAMCONTROL_OBBE) &&
+				   !m_WideScreenOn){
+					CarZoomIndicator--;
+					// disable topdown here
+					if(CarZoomIndicator == CAM_ZOOM_TOPDOWN)
+						CarZoomIndicator--;
+				}
+				if(CPad::GetPad(0)->CycleCameraModeDownJustDown() && !CReplay::IsPlayingBack() &&
+				   (m_bLookingAtPlayer || WhoIsInControlOfTheCamera == CAMCONTROL_OBBE) &&
+				   !m_WideScreenOn){
+					CarZoomIndicator++;
+					if(CarZoomIndicator == CAM_ZOOM_TOPDOWN)
+						CarZoomIndicator++;
+				}
+				if(!m_bFailedCullZoneTestPreviously){
+					if(CarZoomIndicator < CAM_ZOOM_1STPRS) CarZoomIndicator = CAM_ZOOM_CINEMATIC;
+					else if(CarZoomIndicator > CAM_ZOOM_CINEMATIC) CarZoomIndicator = CAM_ZOOM_1STPRS;
+				}
+
+				if(m_bFailedCullZoneTestPreviously)
+					if(CarZoomIndicator != CAM_ZOOM_1STPRS && CarZoomIndicator != CAM_ZOOM_TOPDOWN)
+						ReqMode = CCam::MODE_CAM_ON_A_STRING;
+
+				int vehType = ((CVehicle*)pTargetEntity)->m_vehType;
+				if(((CVehicle*)pTargetEntity)->IsBoat() && pTargetEntity->GetModelIndex() == MI_SKIMMER)
+					vehType = VEHICLE_TYPE_CAR;
+
+				switch(vehType){
+				case VEHICLE_TYPE_CAR:
+				case VEHICLE_TYPE_BIKE:{
+					CAttributeZone *stairsZone = nil;
+					if(vehType == VEHICLE_TYPE_BIKE && CCullZones::CamStairsForPlayer()){
+						stairsZone = CCullZones::FindZoneWithStairsAttributeForPlayer();
+						if(stairsZone)
+							stairs = true;
+					}
+					if(CGarages::IsPointInAGarageCameraZone(pTargetEntity->GetPosition()) || stairs){
+						if(!m_bGarageFixedCamPositionSet && m_bLookingAtPlayer ||
+						   WhoIsInControlOfTheCamera == CAMCONTROL_OBBE){
+							if(pToGarageWeAreIn || stairsZone){
+								float ground;
+								bool foundGround;
+
+								if(pToGarageWeAreIn){
+									// This is all very strange....
+									// targetPos = pTargetEntity->GetPosition();	// unused
+									if(pToGarageWeAreIn->m_pDoor1){
+										whichDoor = 1;
+										garageDoorPos1.x = pToGarageWeAreIn->m_fDoor1X;
+										garageDoorPos1.y = pToGarageWeAreIn->m_fDoor1Y;
+										garageDoorPos1.z = 0.0f;
+										// targetPos.z = 0.0f;	// unused
+										// (targetPos - doorPos1).Magnitude();	// unused
+									}else if(pToGarageWeAreIn->m_pDoor2){
+										whichDoor = 2;
+#ifdef FIX_BUGS
+										garageDoorPos2.x = pToGarageWeAreIn->m_fDoor2X;
+										garageDoorPos2.y = pToGarageWeAreIn->m_fDoor2Y;
+										garageDoorPos2.z = 0.0f;
+#endif
+									}else{
+										whichDoor = 1;
+										garageDoorPos1.x = pTargetEntity->GetPosition().x;
+										garageDoorPos1.y = pTargetEntity->GetPosition().y;
+#ifdef FIX_BUGS
+										garageDoorPos1.z = 0.0f;
+#else
+										garageDoorPos2.z = 0.0f;
+#endif
+									}
+								}else{
+									assert(stairsZone);
+									whichDoor = 1;
+									garageDoorPos1 = Cams[ActiveCam].Source;
+									garageCenter = CVector((stairsZone->minx+stairsZone->maxx)/2.0f, (stairsZone->miny+stairsZone->maxy)/2.0f, 0.0f);
+									if((garageCenter-garageDoorPos1).Magnitude() > 15.0f){
+										bool bClearViewOutside = true;
+										CVector dirOutside = pTargetEntity->GetPosition() - garageCenter;
+										dirOutside.z = 0.0f;
+										dirOutside.Normalise();
+										float zoneDim = stairsZone->maxx - stairsZone->minx;
+										if(zoneDim < stairsZone->maxy - stairsZone->miny)
+											zoneDim = stairsZone->maxy - stairsZone->miny;
+										zoneDim *= 2.0f;
+										CVector posOutside = pTargetEntity->GetPosition() + zoneDim*dirOutside;
+										if(!CWorld::GetIsLineOfSightClear(pTargetEntity->GetPosition(), posOutside, true, false, false, false, false, false, true)){
+											posOutside = pTargetEntity->GetPosition() - zoneDim*dirOutside;
+											if(!CWorld::GetIsLineOfSightClear(pTargetEntity->GetPosition(), posOutside, true, false, false, false, false, false, true))
+												bClearViewOutside = false;
+										}
+										if(bClearViewOutside)
+											garageDoorPos1 = posOutside;
+									}
+								}
+
+								if(pToGarageWeAreIn){
+									garageCenter.x = pToGarageWeAreIn->GetGarageCenterX();
+									garageCenter.y = pToGarageWeAreIn->GetGarageCenterY();
+									garageCenter.z = 0.0f;
+								}else{
+									garageDoorPos1.z = 0.0f;
+									if(stairsZone == nil)	// how can this be true?
+										garageCenter = CVector(pTargetEntity->GetPosition().x, pTargetEntity->GetPosition().y, 0.0f);
+								}
+
+								if(whichDoor == 1)
+									garageCenterToDoor = garageDoorPos1 - garageCenter;
+								else
+									garageCenterToDoor = garageDoorPos2 - garageCenter;
+								targetPos = pTargetEntity->GetPosition();
+								ground = CWorld::FindGroundZFor3DCoord(targetPos.x, targetPos.y, targetPos.z, &foundGround);
+								if(!foundGround)
+									ground = targetPos.z - 0.2f;
+								garageCenterToDoor.z = 0.0f;
+								garageCenterToDoor.Normalise();
+								if(whichDoor == 1){
+									if(pToGarageWeAreIn == nil && stairsZone){
+										float zoneDim = stairsZone->maxx - stairsZone->minx;
+										if(zoneDim < stairsZone->maxy - stairsZone->miny)
+											zoneDim = stairsZone->maxy - stairsZone->miny;
+										garageCamPos = garageCenter + (0.7f*zoneDim + 3.75f)*garageCenterToDoor;
+									}else
+										garageCamPos = garageDoorPos1 + 13.0f*garageCenterToDoor;
+								}else
+									garageCamPos = garageDoorPos2 + 13.0f*garageCenterToDoor;
+								garageCamPos.z = ground + 3.1f;
+								SetCamPositionForFixedMode(garageCamPos, CVector(0.0f, 0.0f, 0.0f));
+								m_bGarageFixedCamPositionSet = true;
+							}
+						}
+
+						if(CGarages::CameraShouldBeOutside() && m_bGarageFixedCamPositionSet &&
+						   (m_bLookingAtPlayer || WhoIsInControlOfTheCamera == CAMCONTROL_OBBE)){
+							if(pToGarageWeAreIn){
+								ReqMode = CCam::MODE_FIXED;
+								m_bPlayerIsInGarage = true;
+							}
+						}else{
+							if(m_bPlayerIsInGarage){
+								m_bJustCameOutOfGarage = true;
+								m_bPlayerIsInGarage = false;
+							}
+							ReqMode = CCam::MODE_CAM_ON_A_STRING;
+						}
+					}else{
+						if(m_bPlayerIsInGarage){
+							m_bJustCameOutOfGarage = true;
+							m_bPlayerIsInGarage = false;
+						}
+						m_bGarageFixedCamPositionSet = false;
+						ReqMode = CCam::MODE_CAM_ON_A_STRING;
+					}
+					break;
+				}
+				case VEHICLE_TYPE_BOAT:
+					ReqMode = CCam::MODE_BEHINDBOAT;
+					break;
+				default: break;
+				}
+
+				int vehApp = ((CVehicle*)pTargetEntity)->GetVehicleAppearance();
+				int vehArrPos = 0;
+				GetArrPosForVehicleType(vehApp, vehArrPos);
+
+				// Car zoom value
+				if (CarZoomIndicator == CAM_ZOOM_1STPRS && !m_bPlayerIsInGarage) {
+					CarZoomValue = 0.0f;
+					ReqMode = CCam::MODE_1STPERSON;
+				}
+#ifdef FREE_CAM
+				else if (bFreeCam) {
+					if (CarZoomIndicator == CAM_ZOOM_1)
+						CarZoomValue = LCS_ZOOM_ONE_DISTANCE[vehArrPos];
+					else if (CarZoomIndicator == CAM_ZOOM_2)
+						CarZoomValue = LCS_ZOOM_TWO_DISTANCE[vehArrPos];
+					else if (CarZoomIndicator == CAM_ZOOM_3)
+						CarZoomValue = LCS_ZOOM_THREE_DISTANCE[vehArrPos];
+				}
+#endif
+				else if (CarZoomIndicator == CAM_ZOOM_1)
+					CarZoomValue = ZOOM_ONE_DISTANCE[vehArrPos];
+				else if(CarZoomIndicator == CAM_ZOOM_2)
+					CarZoomValue = ZOOM_TWO_DISTANCE[vehArrPos];
+				else if(CarZoomIndicator == CAM_ZOOM_3)
+					CarZoomValue = ZOOM_THREE_DISTANCE[vehArrPos];
+
+				if(CarZoomIndicator == CAM_ZOOM_TOPDOWN && !m_bPlayerIsInGarage){
+					CarZoomValue = 1.0f;
+					ReqMode = CCam::MODE_TOPDOWN;
+				}
+
+				// Check if we have to go into first person
+				if(vehType == VEHICLE_TYPE_CAR && !m_bPlayerIsInGarage){
+					if(CCullZones::Cam1stPersonForPlayer() && 
+					   pTargetEntity->GetColModel()->boundingBox.GetSize().z >= 3.026f &&
+					   pToGarageWeAreInForHackAvoidFirstPerson == nil){
+						ReqMode = CCam::MODE_1STPERSON;
+						m_bInATunnelAndABigVehicle = true;
+					}
+				}
+				if(ReqMode == CCam::MODE_TOPDOWN &&
+				   (CCullZones::Cam1stPersonForPlayer() || CCullZones::CamNoRain() || CCullZones::PlayerNoRain()))
+					ReqMode = CCam::MODE_1STPERSON;
+
+				// Smooth zoom value - ugly code
+				if(m_bUseScriptZoomValueCar){
+					if(CarZoomValueSmooth < m_fCarZoomValueScript){
+						CarZoomValueSmooth += 0.12f * CTimer::GetTimeStep();
+						CarZoomValueSmooth = Min(CarZoomValueSmooth, m_fCarZoomValueScript);
+					}else{
+						CarZoomValueSmooth -= 0.12f * CTimer::GetTimeStep();
+						CarZoomValueSmooth = Max(CarZoomValueSmooth, m_fCarZoomValueScript);
+					}
+				}else if(m_bFailedCullZoneTestPreviously){
+					CloseInCarHeightTarget = 0.65f;
+					if(CarZoomValueSmooth < -0.65f){
+						CarZoomValueSmooth += 0.12f * CTimer::GetTimeStep();
+						CarZoomValueSmooth = Min(CarZoomValueSmooth, -0.65f);
+					}else{
+						CarZoomValueSmooth -= 0.12f * CTimer::GetTimeStep();
+						CarZoomValueSmooth = Max(CarZoomValueSmooth, -0.65f);
+					}
+				}else{
+					if(CarZoomValueSmooth < CarZoomValue){
+						CarZoomValueSmooth += 0.12f * CTimer::GetTimeStep();
+						CarZoomValueSmooth = Min(CarZoomValueSmooth, CarZoomValue);
+					}else{
+						CarZoomValueSmooth -= 0.12f * CTimer::GetTimeStep();
+						CarZoomValueSmooth = Max(CarZoomValueSmooth, CarZoomValue);
+					}
+				}
+
+				WellBufferMe(CloseInCarHeightTarget, &Cams[ActiveCam].m_fCloseInCarHeightOffset, &Cams[ActiveCam].m_fCloseInCarHeightOffsetSpeed, 0.1f, 0.25f, false);
+
+				// Fallen into water
+				if(Cams[ActiveCam].IsTargetInWater(Cams[ActiveCam].Source) && !boatTarget &&
+				   !Cams[ActiveCam].CamTargetEntity->IsPed() &&
+				   pTargetEntity->GetModelIndex() != MI_SKIMMER && pTargetEntity->GetModelIndex() != MI_SEASPAR)
+					ReqMode = CCam::MODE_PLAYER_FALLEN_WATER;
+			}
+		}
+
+		// Ped target
+		else if(pTargetEntity->IsPed()){
+			// Change user selected mode
+			if(CPad::GetPad(0)->CycleCameraModeUpJustDown() && !CReplay::IsPlayingBack() &&
+			   (m_bLookingAtPlayer || WhoIsInControlOfTheCamera == CAMCONTROL_OBBE) &&
+			   !m_WideScreenOn && !m_bFailedCullZoneTestPreviously && !m_bFirstPersonBeingUsed){
+				if(FrontEndMenuManager.m_ControlMethod == CONTROL_STANDARD){
+					if(PedZoomIndicator == CAM_ZOOM_3)
+						PedZoomIndicator = CAM_ZOOM_1;
+					else
+						PedZoomIndicator = CAM_ZOOM_3;
+				}else
+					PedZoomIndicator--;
+			}
+			if(CPad::GetPad(0)->CycleCameraModeDownJustDown() && !CReplay::IsPlayingBack() &&
+			   (m_bLookingAtPlayer || WhoIsInControlOfTheCamera == CAMCONTROL_OBBE) &&
+			   !m_WideScreenOn && !m_bFailedCullZoneTestPreviously && !m_bFirstPersonBeingUsed){
+				if(FrontEndMenuManager.m_ControlMethod == CONTROL_STANDARD){
+					if(PedZoomIndicator == CAM_ZOOM_3)
+						PedZoomIndicator = CAM_ZOOM_1;
+					else
+						PedZoomIndicator = CAM_ZOOM_3;
+				}else
+					PedZoomIndicator++;
+			}
+			// disabled top down and obbe's cam here
+			if(PedZoomIndicator < CAM_ZOOM_1) PedZoomIndicator = CAM_ZOOM_3;
+			else if(PedZoomIndicator > CAM_ZOOM_3) PedZoomIndicator = CAM_ZOOM_1;
+
+			ReqMode = CCam::MODE_FOLLOWPED;
+
+			// Check 1st person mode
+			if((m_bLookingAtPlayer || m_bEnable1rstPersonCamCntrlsScript) && pTargetEntity->IsPed() &&
+			   (!m_WideScreenOn || m_bEnable1rstPersonCamCntrlsScript) && !Cams[0].Using3rdPersonMouseCam()
+#ifdef FREE_CAM
+			   && (!CCamera::bFreeCam || m_bEnable1rstPersonCamCntrlsScript)
+#endif
+			   ){
+				// See if we want to enter first person mode
+				if(CPad::GetPad(0)->LookAroundLeftRight() || CPad::GetPad(0)->LookAroundUpDown()){
+					m_uiFirstPersonCamLastInputTime = CTimer::GetTimeInMilliseconds();
+					m_bFirstPersonBeingUsed = true;
+				}
+				if(m_bFirstPersonBeingUsed){
+					// Or if we want to go back to 3rd person
+					if(CPad::GetPad(0)->GetPedWalkLeftRight() || CPad::GetPad(0)->GetPedWalkUpDown() ||
+					   CPad::GetPad(0)->GetSquare() || CPad::GetPad(0)->GetTriangle() ||
+					   CPad::GetPad(0)->GetCross() || CPad::GetPad(0)->GetCircle() ||
+					   CTimer::GetTimeInMilliseconds() - m_uiFirstPersonCamLastInputTime > 2850.0f){
+						m_bFirstPersonBeingUsed = false;
+					}else if(CPad::GetPad(0)->TargetJustDown()){
+						m_bFirstPersonBeingUsed = false;
+						m_bJustJumpedOutOf1stPersonBecauseOfTarget = true;
+					}
+				}
+			}else
+				m_bFirstPersonBeingUsed = false;
+
+			if(!FindPlayerPed()->IsPedInControl() || FindPlayerPed()->m_fMoveSpeed > 0.0f)
+				m_bFirstPersonBeingUsed = false;
+			if(m_bFirstPersonBeingUsed){
+				ReqMode = CCam::MODE_1STPERSON;
+				CPad::GetPad(0)->DisablePlayerControls |= PLAYERCONTROL_CAMERA;
+			}
+
+			// Zoom value
+			if(PedZoomIndicator == CAM_ZOOM_1)
+				m_fPedZoomValue = 0.25f;
+			else if(PedZoomIndicator == CAM_ZOOM_2)
+				m_fPedZoomValue = 1.5f;
+			else if(PedZoomIndicator == CAM_ZOOM_3)
+				m_fPedZoomValue = 2.9f;
+
+			// Smooth zoom value - ugly code
+			if(m_bUseScriptZoomValuePed){
+				if(m_fPedZoomValueSmooth < m_fPedZoomValueScript){
+					m_fPedZoomValueSmooth += 0.12f * CTimer::GetTimeStep();
+					m_fPedZoomValueSmooth = Min(m_fPedZoomValueSmooth, m_fPedZoomValueScript);
+				}else{
+					m_fPedZoomValueSmooth -= 0.12f * CTimer::GetTimeStep();
+					m_fPedZoomValueSmooth = Max(m_fPedZoomValueSmooth, m_fPedZoomValueScript);
+				}
+			}else if(m_bFailedCullZoneTestPreviously){
+				static float PedZoomedInVal = 0.5f;
+				CloseInPedHeightTarget = 0.7f;
+				if(m_fPedZoomValueSmooth < PedZoomedInVal){
+					m_fPedZoomValueSmooth += 0.12f * CTimer::GetTimeStep();
+					m_fPedZoomValueSmooth = Min(m_fPedZoomValueSmooth, PedZoomedInVal);
+				}else{
+					m_fPedZoomValueSmooth -= 0.12f * CTimer::GetTimeStep();
+					m_fPedZoomValueSmooth = Max(m_fPedZoomValueSmooth, PedZoomedInVal);
+				}
+			}else{
+				if(m_fPedZoomValueSmooth < m_fPedZoomValue){
+					m_fPedZoomValueSmooth += 0.12f * CTimer::GetTimeStep();
+					m_fPedZoomValueSmooth = Min(m_fPedZoomValueSmooth, m_fPedZoomValue);
+				}else{
+					m_fPedZoomValueSmooth -= 0.12f * CTimer::GetTimeStep();
+					m_fPedZoomValueSmooth = Max(m_fPedZoomValueSmooth, m_fPedZoomValue);
+				}
+				if(PedZoomIndicator == CAM_ZOOM_3 && m_fPedZoomValue == 0.0f)
+					m_fPedZoomValueSmooth = m_fPedZoomValue;
+			}
+
+			WellBufferMe(CloseInPedHeightTarget, &Cams[ActiveCam].m_fCloseInPedHeightOffset, &Cams[ActiveCam].m_fCloseInPedHeightOffsetSpeed, 0.1f, 0.025f, false);
+
+			// Check if entering fight cam
+			if(!m_bFirstPersonBeingUsed){
+				if(FindPlayerPed()->GetPedState() == PED_FIGHT && !m_bUseMouse3rdPerson)
+					ReqMode = CCam::MODE_FIGHT_CAM;
+				if(((CPed*)pTargetEntity)->GetWeapon()->m_eWeaponType == WEAPONTYPE_BASEBALLBAT &&
+				   FindPlayerPed()->GetPedState() == PED_ATTACK && !m_bUseMouse3rdPerson)
+					ReqMode = CCam::MODE_FIGHT_CAM;
+			}
+
+			// Garage cam
+			CAttributeZone *stairsZone = nil;
+			if(CCullZones::CamStairsForPlayer()){
+				stairsZone = CCullZones::FindZoneWithStairsAttributeForPlayer();
+				if(stairsZone)
+					stairs = true;
+			}
+			if(CGarages::IsPointInAGarageCameraZone(pTargetEntity->GetPosition()) && !m_bUseMouse3rdPerson || stairs){
+				if(!m_bGarageFixedCamPositionSet && m_bLookingAtPlayer){
+					if(pToGarageWeAreIn || stairs){
+						float ground;
+						bool foundGround;
+
+						if(pToGarageWeAreIn){
+							// targetPos = pTargetEntity->GetPosition();	// unused
+							if(pToGarageWeAreIn->m_pDoor1){
+								whichDoor = 1;
+								garageDoorPos1.x = pToGarageWeAreIn->m_fDoor1X;
+								garageDoorPos1.y = pToGarageWeAreIn->m_fDoor1Y;
+								garageDoorPos1.z = 0.0f;
+								// targetPos.z = 0.0f;	// unused
+								// (targetPos - doorPos1).Magnitude();	// unused
+							}else if(pToGarageWeAreIn->m_pDoor2){
+								whichDoor = 2;
+#ifdef FIX_BUGS
+								garageDoorPos2.x = pToGarageWeAreIn->m_fDoor2X;
+								garageDoorPos2.y = pToGarageWeAreIn->m_fDoor2Y;
+								garageDoorPos2.z = 0.0f;
+#endif
+							}else{
+								whichDoor = 1;
+								garageDoorPos1.x = pTargetEntity->GetPosition().x;
+								garageDoorPos1.y = pTargetEntity->GetPosition().y;
+#ifdef FIX_BUGS
+								garageDoorPos1.z = 0.0f;
+#else
+								garageDoorPos2.z = 0.0f;
+#endif
+							}
+						}else{
+							whichDoor = 1;
+							garageDoorPos1 = Cams[ActiveCam].Source;
+
+							if(stairsZone){	// always true
+								garageCenter = CVector((stairsZone->minx+stairsZone->maxx)/2, (stairsZone->miny+stairsZone->maxy)/2, 0.0f);
+								if(pTargetEntity->GetPosition().x > 376.0f && pTargetEntity->GetPosition().x < 383.0f &&
+								   pTargetEntity->GetPosition().y > -496.0f && pTargetEntity->GetPosition().y < -489.0f &&
+								   pTargetEntity->GetPosition().z > 11.6f && pTargetEntity->GetPosition().z < 13.6f){
+									garageDoorPos1 = CVector(382.6f, -489.6f, 13.1f);
+								}else{
+									bool bClearViewOutside = true;
+									CVector dirOutside = pTargetEntity->GetPosition() - garageCenter;
+									dirOutside.z = 0.0f;
+									dirOutside.Normalise();
+									float zoneDim = stairsZone->maxx - stairsZone->minx;
+									if(zoneDim < stairsZone->maxy - stairsZone->miny)
+										zoneDim = stairsZone->maxy - stairsZone->miny;
+									zoneDim *= 2.0f;
+									CVector posOutside = pTargetEntity->GetPosition() + zoneDim*dirOutside;
+									if(!CWorld::GetIsLineOfSightClear(pTargetEntity->GetPosition(), posOutside, true, false, false, false, false, false, true)){
+										posOutside = pTargetEntity->GetPosition() - zoneDim*dirOutside;
+										if(!CWorld::GetIsLineOfSightClear(pTargetEntity->GetPosition(), posOutside, true, false, false, false, false, false, true))
+											bClearViewOutside = false;
+									}
+									if(bClearViewOutside)
+										garageDoorPos1 = posOutside;
+								}
+							}
+						}
+
+						if(pToGarageWeAreIn){
+							garageCenter.x = pToGarageWeAreIn->GetGarageCenterX();
+							garageCenter.y = pToGarageWeAreIn->GetGarageCenterY();
+							garageCenter.z = 0.0f;
+						}else{
+							garageDoorPos1.z = 0.0f;
+							if(!stairs)	// how can this be true?
+								garageCenter = CVector(pTargetEntity->GetPosition().x, pTargetEntity->GetPosition().y, 0.0f);
+						}
+						if(whichDoor == 1)
+							garageCenterToDoor = garageDoorPos1 - garageCenter;
+						else
+							garageCenterToDoor = garageDoorPos2 - garageCenter;
+						targetPos = pTargetEntity->GetPosition();
+						ground = CWorld::FindGroundZFor3DCoord(targetPos.x, targetPos.y, targetPos.z, &foundGround);
+						if(!foundGround)
+							ground = targetPos.z - 0.2f;
+						garageCenterToDoor.z = 0.0f;
+						garageCenterToDoor.Normalise();
+						if(whichDoor == 1){
+							if(pToGarageWeAreIn == nil && stairs){
+								if(stairsZone){
+									float zoneDim = stairsZone->maxx - stairsZone->minx;
+									if(zoneDim < stairsZone->maxy - stairsZone->miny)
+										zoneDim = stairsZone->maxy - stairsZone->miny;
+									garageCamPos = garageCenter + (0.7f*zoneDim + 3.75f)*garageCenterToDoor;
+								}else	// how can this be true?
+									garageCamPos = garageDoorPos1 + 3.75f*garageCenterToDoor;
+							}else
+								garageCamPos = garageDoorPos1 + 13.0f*garageCenterToDoor;
+						}else{
+							garageCamPos = garageDoorPos2 + 13.0f*garageCenterToDoor;
+						}
+						if(PedZoomIndicator == CAM_ZOOM_TOPDOWN && !stairs){
+							garageCamPos = garageCenter;
+							garageCamPos.z += FindPlayerPed()->GetPosition().z + 2.1f;
+							if(pToGarageWeAreIn && garageCamPos.z > pToGarageWeAreIn->m_fSupX)	// What?
+								garageCamPos.z = pToGarageWeAreIn->m_fSupX;
+						}else
+							garageCamPos.z = ground + 3.1f;
+						SetCamPositionForFixedMode(garageCamPos, CVector(0.0f, 0.0f, 0.0f));
+						m_bGarageFixedCamPositionSet = true;
+					}
+				}
+
+				if((CGarages::CameraShouldBeOutside() || stairs) && m_bLookingAtPlayer && m_bGarageFixedCamPositionSet){
+					if(pToGarageWeAreIn || stairs){
+						ReqMode = CCam::MODE_FIXED;
+						m_bPlayerIsInGarage = true;
+					}
+				}else{
+					if(m_bPlayerIsInGarage){
+						m_bJustCameOutOfGarage = true;
+						m_bPlayerIsInGarage = false;
+					}
+					ReqMode = CCam::MODE_FOLLOWPED;
+				}
+			}else{
+				if(m_bPlayerIsInGarage){
+					m_bJustCameOutOfGarage = true;
+					m_bPlayerIsInGarage = false;
+				}
+				m_bGarageFixedCamPositionSet = false;
+			}
+
+			// Lighthouse
+			if(!m_bFirstPersonBeingUsed && (pTargetEntity->GetPosition() - CVector(474.3f, -1717.6f, 0.0f)).Magnitude2D() < 6.0f)
+				if((pTargetEntity->GetPosition() - CVector(474.3f, -1717.6f, 0.0f)).Magnitude2D() < 3.8f ||
+				   pTargetEntity->GetPosition().z > 50.0f)
+					if(!Cams[ActiveCam].Using3rdPersonMouseCam())
+						ReqMode = CCam::MODE_LIGHTHOUSE;
+
+			// Fallen into water
+			if(Cams[ActiveCam].IsTargetInWater(Cams[ActiveCam].Source) &&
+			   Cams[ActiveCam].CamTargetEntity->IsPed())
+				ReqMode = CCam::MODE_PLAYER_FALLEN_WATER;
+
+			// Set top down
+			if(PedZoomIndicator == CAM_ZOOM_TOPDOWN &&
+			   !CCullZones::Cam1stPersonForPlayer() &&
+			   !CCullZones::CamNoRain() &&
+			   !CCullZones::PlayerNoRain() &&
+			   !m_bFirstPersonBeingUsed &&
+			   !m_bPlayerIsInGarage)
+				ReqMode = CCam::MODE_TOP_DOWN_PED;
+
+			// Weapon mode
+			if(!CPad::GetPad(0)->GetTarget() && PlayerWeaponMode.Mode != CCam::MODE_HELICANNON_1STPERSON)
+				ClearPlayerWeaponMode();
+			if(m_PlayerMode.Mode != CCam::MODE_NONE)
+				ReqMode = m_PlayerMode.Mode;
+			if(PlayerWeaponMode.Mode != CCam::MODE_NONE && !stairs){
+				if(PlayerWeaponMode.Mode == CCam::MODE_SNIPER ||
+				   PlayerWeaponMode.Mode == CCam::MODE_ROCKETLAUNCHER ||
+					// game also checks MODE_MODELVIEW here but that does make any sense...
+				   PlayerWeaponMode.Mode == CCam::MODE_M16_1STPERSON ||
+				   PlayerWeaponMode.Mode == CCam::MODE_HELICANNON_1STPERSON ||
+				   PlayerWeaponMode.Mode == CCam::MODE_CAMERA ||
+				   Cams[ActiveCam].GetWeaponFirstPersonOn()){
+					// First person weapon mode
+					if(PLAYER->GetPedState() == PED_SEEK_CAR){
+						if(ReqMode == CCam::MODE_TOP_DOWN_PED || Cams[ActiveCam].GetWeaponFirstPersonOn())
+							ReqMode = PlayerWeaponMode.Mode;
+						else
+							ReqMode = CCam::MODE_FOLLOWPED;
+					}else
+						ReqMode = PlayerWeaponMode.Mode;
+				}else if(ReqMode != CCam::MODE_TOP_DOWN_PED && PedZoomIndicator != CAM_ZOOM_3){
+					// Syphon mode
+					float playerTargetDist;
+					float deadPedDist = 4.0f;
+					static float alivePedDist = 2.0f;	// original name lost
+					float pedDist;		// actually only used on dead target
+					bool targetDead = false;
+					float camAngle, targetAngle;
+					CVector playerToTarget = m_cvecAimingTargetCoors - pTargetEntity->GetPosition();
+					CVector playerToCam = Cams[ActiveCam].Source - pTargetEntity->GetPosition();
+
+					if(PedZoomIndicator == CAM_ZOOM_1)
+						deadPedDist = 2.25f;
+					if(FindPlayerPed()->m_pPointGunAt){
+						// BUG: this need not be a ped!
+						if(((CPed*)FindPlayerPed()->m_pPointGunAt)->DyingOrDead()){
+							targetDead = true;
+							pedDist = deadPedDist;
+						}else
+							pedDist = alivePedDist;
+						playerTargetDist = playerToTarget.Magnitude2D();
+						camAngle = CGeneral::GetATanOfXY(playerToCam.x, playerToCam.y);
+						targetAngle = CGeneral::GetATanOfXY(playerToTarget.x, playerToTarget.y);
+						ReqMode = PlayerWeaponMode.Mode;
+
+						// Check whether to start aiming in crim-in-front mode
+						if(Cams[ActiveCam].Mode != CCam::MODE_SYPHON){
+							float angleDiff = camAngle - targetAngle;
+							while(angleDiff >= PI) angleDiff -= 2*PI;
+							while(angleDiff < -PI) angleDiff += 2*PI;
+							if(Abs(angleDiff) < HALFPI && playerTargetDist < 3.5f && playerToTarget.z > -1.0f)
+								ReqMode = CCam::MODE_SYPHON_CRIM_IN_FRONT;
+						}
+
+						// Check whether to go to special fixed mode
+						float fixedModeDist = 0.0f;
+						if((ReqMode == CCam::MODE_SYPHON_CRIM_IN_FRONT || ReqMode == CCam::MODE_SYPHON) &&
+						   (m_uiTransitionState == 0 || Cams[ActiveCam].Mode == CCam::MODE_SPECIAL_FIXED_FOR_SYPHON) &&
+						   playerTargetDist < pedDist && targetDead){
+							if(ReqMode == CCam::MODE_SYPHON_CRIM_IN_FRONT)
+								fixedModeDist = 5.0f;
+							else
+								fixedModeDist = 5.6f;
+							ReqMode = CCam::MODE_SPECIAL_FIXED_FOR_SYPHON;
+						}
+						if(ReqMode == CCam::MODE_SPECIAL_FIXED_FOR_SYPHON){
+							if(!PlaceForFixedWhenSniperFound){
+								// Find position
+								CEntity *entity;
+								CColPoint colPoint;
+								CVector fixedPos = pTargetEntity->GetPosition();
+								fixedPos.x += fixedModeDist*Cos(camAngle);
+								fixedPos.y += fixedModeDist*Sin(camAngle);
+								fixedPos.z += 1.15f;
+								if(CWorld::ProcessLineOfSight(pTargetEntity->GetPosition(), fixedPos, colPoint, entity, true, false, false, true, false, true, true))
+									SetCamPositionForFixedMode(colPoint.point, CVector(0.0f, 0.0f, 0.0f));
+								else
+									SetCamPositionForFixedMode(fixedPos, CVector(0.0f, 0.0f, 0.0f));
+								PlaceForFixedWhenSniperFound = true;
+							}
+						}else
+							PlaceForFixedWhenSniperFound = false;
+					}
+				}
+			}
+		}
+	}
+
+	if(DebugCamMode)
+		ReqMode = DebugCamMode;
+
+
+	// Process arrested player
+	static int ThePickedArrestMode;
+	static int LastPedState;
+	bool startArrestCam = false;
+	static bool beingArrested = false;
+	bool stopArrestCam = false;
+
+	if(PLAYER->GetPedState() == PED_ARRESTED)
+		beingArrested = true;
+	else if(beingArrested){
+		stopArrestCam = true;
+		beingArrested = false;
+	}
+	if(LastPedState != PED_ARRESTED && PLAYER->GetPedState() == PED_ARRESTED){
+		if(CarZoomIndicator != CAM_ZOOM_1STPRS || !pTargetEntity->IsVehicle())
+			startArrestCam = true;
+	}else
+		startArrestCam = false;
+	LastPedState = PLAYER->GetPedState();
+
+	if(startArrestCam){
+		ThePickedArrestMode = CCam::MODE_ARRESTCAM_ONE;
+		ReqMode = CCam::MODE_ARRESTCAM_ONE;
+		Cams[ActiveCam].ResetStatics = true;
+	}else if(PLAYER->GetPedState() == PED_ARRESTED)
+		ReqMode = ThePickedArrestMode;
+
+	// Process dead player
+	if(PLAYER->GetPedState() == PED_DEAD){
+		if(Cams[ActiveCam].Mode == CCam::MODE_PED_DEAD_BABY)
+			ReqMode = CCam::MODE_PED_DEAD_BABY;
+		else{
+			bool useArrestCam = false;
+			if(pTargetEntity->IsPed()){
+				for(int i = 0; i < ((CPed*)pTargetEntity)->m_numNearPeds; i++){
+					CPed *ped = ((CPed*)pTargetEntity)->m_nearPeds[i];
+					if(ped && ped->GetPedState() == PED_ARREST_PLAYER)
+						if((ped->GetPosition() - pTargetEntity->GetPosition()).Magnitude() < 4.0f){
+							ReqMode = CCam::MODE_ARRESTCAM_ONE;
+							Cams[ActiveCam].ResetStatics = true;
+							useArrestCam = true;
+							break;
+						}
+				}
+			}
+			if(!useArrestCam){
+				ReqMode = CCam::MODE_PED_DEAD_BABY;
+				Cams[ActiveCam].ResetStatics = true;
+			}
+		}
+	}
+
+	// Restore with a jump cut
+	if(m_bRestoreByJumpCut){
+		if(ReqMode != CCam::MODE_FOLLOWPED &&
+		   ReqMode != CCam::MODE_BEHINDCAR &&
+		   ReqMode != CCam::MODE_CAM_ON_A_STRING &&
+		   ReqMode != CCam::MODE_M16_1STPERSON &&
+		   ReqMode != CCam::MODE_SYPHON &&
+		   ReqMode != CCam::MODE_SYPHON_CRIM_IN_FRONT &&
+		   ReqMode != CCam::MODE_SPECIAL_FIXED_FOR_SYPHON &&
+		   ReqMode != CCam::MODE_SNIPER &&
+		   ReqMode != CCam::MODE_ROCKETLAUNCHER &&
+		   ReqMode != CCam::MODE_CAMERA &&
+		   !m_bUseMouse3rdPerson)
+			SetCameraDirectlyBehindForFollowPed_CamOnAString();
+
+		ReqMode = m_iModeToGoTo;
+		Cams[ActiveCam].Mode = ReqMode;
+		m_bJust_Switched = true;
+		Cams[ActiveCam].ResetStatics = true;
+		Cams[ActiveCam].m_cvecCamFixedModeVector = m_vecFixedModeVector;
+		Cams[ActiveCam].CamTargetEntity = pTargetEntity;
+		Cams[ActiveCam].m_cvecCamFixedModeSource = m_vecFixedModeSource;
+		Cams[ActiveCam].m_cvecCamFixedModeUpOffSet = m_vecFixedModeUpOffSet;
+		Cams[ActiveCam].m_bCamLookingAtVector = false;
+		Cams[ActiveCam].m_vecLastAboveWaterCamPosition = Cams[(ActiveCam+1)%2].m_vecLastAboveWaterCamPosition;
+		m_bRestoreByJumpCut = false;
+		Cams[ActiveCam].ResetStatics = true;
+		pTargetEntity->RegisterReference(&pTargetEntity);
+		Cams[ActiveCam].CamTargetEntity->RegisterReference(&Cams[ActiveCam].CamTargetEntity);
+		CarZoomValueSmooth = CarZoomValue;
+		m_fPedZoomValueSmooth = m_fPedZoomValue;
+		m_uiTransitionState = 0;
+		m_vecDoingSpecialInterPolation = false;
+	}
+
+	if(gbModelViewer)
+		ReqMode = CCam::MODE_MODELVIEW;
+
+	// Turn on Obbe's cam
+	bool canUseObbeCam = true;
+	if(pTargetEntity){
+		if(pTargetEntity->IsVehicle()){
+			if(CarZoomIndicator == CAM_ZOOM_CINEMATIC)
+				m_bObbeCinematicCarCamOn = true;
+		}else{
+			if(PedZoomIndicator == CAM_ZOOM_CINEMATIC)
+				m_bObbeCinematicPedCamOn = true;
+		}
+	}
+	if(m_bTargetJustBeenOnTrain ||
+	   ReqMode == CCam::MODE_SYPHON || ReqMode == CCam::MODE_SYPHON_CRIM_IN_FRONT || ReqMode == CCam::MODE_SPECIAL_FIXED_FOR_SYPHON ||
+	   ReqMode == CCam::MODE_PED_DEAD_BABY || ReqMode == CCam::MODE_ARRESTCAM_ONE || ReqMode == CCam::MODE_ARRESTCAM_TWO ||
+	   ReqMode == CCam::MODE_FIGHT_CAM || ReqMode == CCam::MODE_PLAYER_FALLEN_WATER ||
+	   ReqMode == CCam::MODE_SNIPER || ReqMode == CCam::MODE_ROCKETLAUNCHER || ReqMode == CCam::MODE_M16_1STPERSON ||
+	   ReqMode == CCam::MODE_SNIPER_RUNABOUT || ReqMode == CCam::MODE_ROCKETLAUNCHER_RUNABOUT ||
+	   ReqMode == CCam::MODE_1STPERSON_RUNABOUT || ReqMode == CCam::MODE_M16_1STPERSON_RUNABOUT ||
+	   ReqMode == CCam::MODE_FIGHT_CAM_RUNABOUT || ReqMode == CCam::MODE_HELICANNON_1STPERSON || ReqMode == CCam::MODE_CAMERA ||
+	   WhoIsInControlOfTheCamera == CAMCONTROL_SCRIPT ||
+	   m_bJustCameOutOfGarage || m_bPlayerIsInGarage)
+		canUseObbeCam = false;
+
+	if(m_bObbeCinematicPedCamOn && canUseObbeCam)
+		ProcessObbeCinemaCameraPed();
+	else if(m_bObbeCinematicCarCamOn && canUseObbeCam){
+		if(pTargetEntity->IsVehicle() && ((CVehicle*)pTargetEntity)->GetVehicleAppearance() == VEHICLE_APPEARANCE_HELI ||
+		   ((CVehicle*)pTargetEntity)->IsBoat())
+			ProcessObbeCinemaCameraHeli();
+		else
+			ProcessObbeCinemaCameraCar();
+	}else{
+		if(m_bPlayerIsInGarage && m_bObbeCinematicCarCamOn)
+			switchByJumpCut = true;
+		canUseObbeCam = false;
+		DontProcessObbeCinemaCamera();
+	}
+
+	// Start the transition or do a jump cut
+	if(m_bLookingAtPlayer){
+		// Going into top down modes normally needs a jump cut (but see below)
+		if(ReqMode == CCam::MODE_TOPDOWN || ReqMode == CCam::MODE_1STPERSON || ReqMode == CCam::MODE_TOP_DOWN_PED){
+			switchByJumpCut = true;
+		}
+		// Going from top down to vehicle
+		else if(ReqMode == CCam::MODE_CAM_ON_A_STRING || ReqMode == CCam::MODE_BEHINDBOAT){
+			if(Cams[ActiveCam].Mode == CCam::MODE_TOPDOWN ||
+			   Cams[ActiveCam].Mode == CCam::MODE_1STPERSON ||
+			   Cams[ActiveCam].Mode == CCam::MODE_TOP_DOWN_PED)
+				switchByJumpCut = true;
+		}else if(ReqMode == CCam::MODE_FIXED){
+			if(Cams[ActiveCam].Mode == CCam::MODE_TOPDOWN)
+				switchByJumpCut = true;
+		}
+
+		// Going into Syphon mode
+		if(ReqMode == CCam::MODE_SYPHON || ReqMode == CCam::MODE_SYPHON_CRIM_IN_FRONT)
+			switchByJumpCut = true;
+
+		// Top down modes can interpolate between each other
+		if(ReqMode == CCam::MODE_TOPDOWN){
+			if(Cams[ActiveCam].Mode == CCam::MODE_TOP_DOWN_PED || Cams[ActiveCam].Mode == CCam::MODE_PED_DEAD_BABY)
+				switchByJumpCut = false;
+		}else if(ReqMode == CCam::MODE_TOP_DOWN_PED){
+			if(Cams[ActiveCam].Mode == CCam::MODE_TOPDOWN || Cams[ActiveCam].Mode == CCam::MODE_PED_DEAD_BABY)
+				switchByJumpCut = false;
+		}
+
+		if(ReqMode == CCam::MODE_1STPERSON || ReqMode == CCam::MODE_M16_1STPERSON ||
+		   ReqMode == CCam::MODE_SNIPER || ReqMode == CCam::MODE_ROCKETLAUNCHER ||
+		   ReqMode == CCam::MODE_SNIPER_RUNABOUT || ReqMode == CCam::MODE_ROCKETLAUNCHER_RUNABOUT ||
+		   ReqMode == CCam::MODE_1STPERSON_RUNABOUT || ReqMode == CCam::MODE_M16_1STPERSON_RUNABOUT ||
+		   ReqMode == CCam::MODE_FIGHT_CAM_RUNABOUT ||
+		   ReqMode == CCam::MODE_HELICANNON_1STPERSON || ReqMode == CCam::MODE_CAMERA ||
+		   ReqMode == CCam::MODE_ARRESTCAM_ONE || ReqMode == CCam::MODE_ARRESTCAM_TWO){
+			// Going into any 1st person mode is a jump cut
+			if(pTargetEntity->IsPed())
+				switchByJumpCut = true;
+		}else if(ReqMode == CCam::MODE_FIXED && m_bPlayerIsInGarage){
+			// Going from 1st peron mode into garage
+			if(Cams[ActiveCam].Mode == CCam::MODE_SNIPER ||
+			   Cams[ActiveCam].Mode == CCam::MODE_HELICANNON_1STPERSON ||
+			   Cams[ActiveCam].Mode == CCam::MODE_ROCKETLAUNCHER ||
+			   Cams[ActiveCam].Mode == CCam::MODE_M16_1STPERSON ||
+			   Cams[ActiveCam].Mode == CCam::MODE_TOP_DOWN_PED ||
+			   stairs ||
+			   Cams[ActiveCam].Mode == CCam::MODE_1STPERSON ||
+			   Cams[ActiveCam].Mode == CCam::MODE_SNIPER_RUNABOUT ||
+			   Cams[ActiveCam].Mode == CCam::MODE_ROCKETLAUNCHER_RUNABOUT ||
+			   Cams[ActiveCam].Mode == CCam::MODE_M16_1STPERSON_RUNABOUT ||
+			   Cams[ActiveCam].Mode == CCam::MODE_FIGHT_CAM_RUNABOUT ||
+			   Cams[ActiveCam].Mode == CCam::MODE_1STPERSON_RUNABOUT ||
+			   Cams[ActiveCam].Mode == CCam::MODE_CAMERA){
+				if(pTargetEntity && pTargetEntity->IsVehicle())
+					switchByJumpCut = true;
+			}
+		}else if(ReqMode == CCam::MODE_FOLLOWPED){
+			bool syphonJumpCut = false;
+			if(Cams[ActiveCam].Mode == CCam::MODE_SYPHON || Cams[ActiveCam].Mode == CCam::MODE_SYPHON_CRIM_IN_FRONT)
+				if(!((CPed*)pTargetEntity)->CanWeRunAndFireWithWeapon())
+					syphonJumpCut = true;
+			if(Cams[ActiveCam].Mode == CCam::MODE_1STPERSON ||
+			   Cams[ActiveCam].Mode == CCam::MODE_SNIPER ||
+			   Cams[ActiveCam].Mode == CCam::MODE_ROCKETLAUNCHER ||
+			   Cams[ActiveCam].Mode == CCam::MODE_ARRESTCAM_ONE ||
+			   Cams[ActiveCam].Mode == CCam::MODE_ARRESTCAM_TWO ||
+			   Cams[ActiveCam].Mode == CCam::MODE_M16_1STPERSON ||
+			   Cams[ActiveCam].Mode == CCam::MODE_PED_DEAD_BABY ||
+			   Cams[ActiveCam].Mode == CCam::MODE_PILLOWS_PAPS ||
+			   Cams[ActiveCam].Mode == CCam::MODE_SNIPER_RUNABOUT ||
+			   Cams[ActiveCam].Mode == CCam::MODE_ROCKETLAUNCHER_RUNABOUT ||
+			   Cams[ActiveCam].Mode == CCam::MODE_1STPERSON_RUNABOUT ||
+			   Cams[ActiveCam].Mode == CCam::MODE_M16_1STPERSON_RUNABOUT ||
+			   Cams[ActiveCam].Mode == CCam::MODE_FIGHT_CAM_RUNABOUT ||
+			   Cams[ActiveCam].Mode == CCam::MODE_HELICANNON_1STPERSON ||
+			   Cams[ActiveCam].Mode == CCam::MODE_CAMERA ||
+			   Cams[ActiveCam].Mode == CCam::MODE_TOPDOWN ||
+			   Cams[ActiveCam].Mode == CCam::MODE_TOP_DOWN_PED ||
+			   syphonJumpCut || stopArrestCam){
+				if(!m_bJustCameOutOfGarage){
+					if(Cams[ActiveCam].Mode == CCam::MODE_1STPERSON ||
+					   Cams[ActiveCam].Mode == CCam::MODE_SNIPER ||
+					   Cams[ActiveCam].Mode == CCam::MODE_ROCKETLAUNCHER ||
+					   Cams[ActiveCam].Mode == CCam::MODE_M16_1STPERSON ||
+					   Cams[ActiveCam].Mode == CCam::MODE_SNIPER_RUNABOUT ||
+					   Cams[ActiveCam].Mode == CCam::MODE_ROCKETLAUNCHER_RUNABOUT ||
+					   Cams[ActiveCam].Mode == CCam::MODE_1STPERSON_RUNABOUT ||
+					   Cams[ActiveCam].Mode == CCam::MODE_M16_1STPERSON_RUNABOUT ||
+					   Cams[ActiveCam].Mode == CCam::MODE_FIGHT_CAM_RUNABOUT ||
+					   Cams[ActiveCam].Mode == CCam::MODE_HELICANNON_1STPERSON ||
+					   Cams[ActiveCam].Mode == CCam::MODE_CAMERA){
+						float angle = CGeneral::GetATanOfXY(Cams[ActiveCam].Front.x, Cams[ActiveCam].Front.y) - HALFPI;
+						((CPed*)pTargetEntity)->m_fRotationCur = angle;
+						((CPed*)pTargetEntity)->m_fRotationDest = angle;
+					}
+					m_bUseTransitionBeta = true;
+					switchByJumpCut = true;
+					if(Cams[ActiveCam].Mode == CCam::MODE_TOP_DOWN_PED){
+						CVector front = Cams[ActiveCam].Source - FindPlayerPed()->GetPosition();
+						front.z = 0.0f;
+						front.Normalise();
+#ifdef FIX_BUGS
+						// this is almost as bad as the bugged code
+						if(front.x == 0.001f && front.y == 0.001f)
+							front.y = 1.0f;
+#else
+						// someone used = instead of == in the above check by accident
+						front.x = 0.001f;
+						front.y = 1.0f;
+#endif
+						Cams[ActiveCam].m_fTransitionBeta = CGeneral::GetATanOfXY(front.x, front.y);
+					}else
+						Cams[ActiveCam].m_fTransitionBeta = CGeneral::GetATanOfXY(Cams[ActiveCam].Front.x, Cams[ActiveCam].Front.y) + PI;
+				}
+			}
+		}else if(ReqMode == CCam::MODE_FIGHT_CAM){
+			if(Cams[ActiveCam].Mode == CCam::MODE_1STPERSON)
+				switchByJumpCut = true;
+		}else if(ReqMode == CCam::MODE_LIGHTHOUSE ||
+		         ReqMode == CCam::MODE_ARRESTCAM_ONE || ReqMode == CCam::MODE_ARRESTCAM_TWO ||
+		         ReqMode == CCam::MODE_PED_DEAD_BABY)
+			switchByJumpCut = true;
+		else if(Cams[ActiveCam].Mode == CCam::MODE_PED_DEAD_BABY && ReqMode != CCam::MODE_PED_DEAD_BABY)
+			switchByJumpCut = true;
+
+		if(ReqMode != Cams[ActiveCam].Mode && Cams[ActiveCam].CamTargetEntity == nil)
+			switchByJumpCut = true;
+		if(m_bPlayerIsInGarage && pToGarageWeAreIn){
+			if(pToGarageWeAreIn->m_eGarageType == GARAGE_BOMBSHOP1 ||
+			   pToGarageWeAreIn->m_eGarageType == GARAGE_BOMBSHOP2 ||
+			   pToGarageWeAreIn->m_eGarageType == GARAGE_BOMBSHOP3){
+				if(pTargetEntity->IsVehicle() && pTargetEntity->GetModelIndex() == MI_MRWHOOP &&
+				   ReqMode != Cams[ActiveCam].Mode)
+					switchByJumpCut = true;
+			}
+		}
+#ifdef GTA_SCENE_EDIT
+		if(CSceneEdit::m_bEditOn)
+			ReqMode = CCam::MODE_EDITOR;
+#endif
+
+		if((m_uiTransitionState == 0 || switchByJumpCut) && ReqMode != Cams[ActiveCam].Mode){
+			if(switchByJumpCut){
+				if(!m_bPlayerIsInGarage || m_bJustCameOutOfGarage){
+					if(ReqMode != CCam::MODE_FOLLOWPED &&
+					   ReqMode != CCam::MODE_M16_1STPERSON &&
+					   ReqMode != CCam::MODE_SNIPER &&
+					   ReqMode != CCam::MODE_ROCKETLAUNCHER &&
+					   !m_bUseMouse3rdPerson)
+						SetCameraDirectlyBehindForFollowPed_CamOnAString();
+				}
+				Cams[ActiveCam].Mode = ReqMode;
+				m_bJust_Switched = true;
+				Cams[ActiveCam].m_cvecCamFixedModeVector = m_vecFixedModeVector;
+				Cams[ActiveCam].CamTargetEntity = pTargetEntity;
+				Cams[ActiveCam].m_cvecCamFixedModeSource = m_vecFixedModeSource;
+				Cams[ActiveCam].m_cvecCamFixedModeUpOffSet = m_vecFixedModeUpOffSet;
+				Cams[ActiveCam].m_bCamLookingAtVector = m_bLookingAtVector;
+				Cams[ActiveCam].m_vecLastAboveWaterCamPosition = Cams[(ActiveCam+1)%2].m_vecLastAboveWaterCamPosition;
+				CarZoomValueSmooth = CarZoomValue;
+				m_fPedZoomValueSmooth = m_fPedZoomValue;
+				m_uiTransitionState = 0;
+				m_vecDoingSpecialInterPolation = false;
+				m_bStartInterScript = false;
+				Cams[ActiveCam].ResetStatics = true;
+
+				pTargetEntity->RegisterReference(&pTargetEntity);
+				Cams[ActiveCam].CamTargetEntity->RegisterReference(&Cams[ActiveCam].CamTargetEntity);
+			}else if(!m_bWaitForInterpolToFinish){
+				StartTransition(ReqMode);
+				pTargetEntity->RegisterReference(&pTargetEntity);
+				Cams[ActiveCam].CamTargetEntity->RegisterReference(&Cams[ActiveCam].CamTargetEntity);
+			}
+		}else if(m_uiTransitionState != 0 && ReqMode != Cams[ActiveCam].Mode){
+			bool startTransition = true;
+
+			if(ReqMode == CCam::MODE_FIGHT_CAM || Cams[ActiveCam].Mode == CCam::MODE_FIGHT_CAM)
+				startTransition = false;
+			if(ReqMode == CCam::MODE_FOLLOWPED && Cams[ActiveCam].Mode == CCam::MODE_FIGHT_CAM)
+				startTransition = false;
+
+			if(!m_bWaitForInterpolToFinish && m_bLookingAtPlayer && m_uiTransitionState != 0){
+				CVector playerDist;
+				playerDist.x = FindPlayerPed()->GetPosition().x - GetPosition().x;
+				playerDist.y = FindPlayerPed()->GetPosition().y - GetPosition().y;
+				playerDist.z = FindPlayerPed()->GetPosition().z - GetPosition().z;
+				// if player is too far away, keep interpolating and don't transition
+				if(pTargetEntity && pTargetEntity->IsPed()){
+					if(playerDist.Magnitude() > 17.5f &&
+					   (ReqMode == CCam::MODE_SYPHON || ReqMode == CCam::MODE_SYPHON_CRIM_IN_FRONT))
+						m_bWaitForInterpolToFinish = true;
+				}
+			}
+			if(m_bWaitForInterpolToFinish)
+				startTransition = false;
+
+			if(startTransition){
+				StartTransitionWhenNotFinishedInter(ReqMode);
+				pTargetEntity->RegisterReference(&pTargetEntity);
+				Cams[ActiveCam].CamTargetEntity->RegisterReference(&Cams[ActiveCam].CamTargetEntity);
+			}
+		}else if(ReqMode == CCam::MODE_FIXED && pTargetEntity != Cams[ActiveCam].CamTargetEntity && m_bPlayerIsInGarage){
+			if(m_uiTransitionState != 0)
+				StartTransitionWhenNotFinishedInter(ReqMode);
+			else
+				StartTransition(ReqMode);
+			pTargetEntity->RegisterReference(&pTargetEntity);
+			Cams[ActiveCam].CamTargetEntity->RegisterReference(&Cams[ActiveCam].CamTargetEntity);
+		}
+	}else{
+		// not following player
+		bool useWeaponMode = false;
+		bool jumpCutTo1stPrs = false;
+		if(m_bEnable1rstPersonCamCntrlsScript || m_bAllow1rstPersonWeaponsCamera){
+			if(ReqMode == CCam::MODE_1STPERSON){
+				if(Cams[ActiveCam].Mode != ReqMode)
+					jumpCutTo1stPrs = true;
+			}else if((PlayerWeaponMode.Mode == CCam::MODE_SNIPER || PlayerWeaponMode.Mode == CCam::MODE_1STPERSON || PlayerWeaponMode.Mode == CCam::MODE_ROCKETLAUNCHER) &&
+			         CPad::GetPad(0)->GetTarget() && m_bAllow1rstPersonWeaponsCamera){
+				useWeaponMode = true;
+				jumpCutTo1stPrs = true;
+			}else if(Cams[ActiveCam].Mode != m_iModeToGoTo){
+				m_bStartInterScript = true;
+				m_iTypeOfSwitch = JUMP_CUT;
+				CPad::GetPad(0)->DisablePlayerControls &= ~PLAYERCONTROL_CAMERA;
+			}
+		}
+
+		if(m_uiTransitionState == 0 && m_bStartInterScript && m_iTypeOfSwitch == INTERPOLATION){
+			ReqMode = m_iModeToGoTo;
+			StartTransition(ReqMode);
+			pTargetEntity->RegisterReference(&pTargetEntity);
+			Cams[ActiveCam].CamTargetEntity->RegisterReference(&Cams[ActiveCam].CamTargetEntity);
+		}else if(m_uiTransitionState != 0 && m_bStartInterScript && m_iTypeOfSwitch == INTERPOLATION){
+			ReqMode = m_iModeToGoTo;
+			StartTransitionWhenNotFinishedInter(ReqMode);
+			pTargetEntity->RegisterReference(&pTargetEntity);
+			Cams[ActiveCam].CamTargetEntity->RegisterReference(&Cams[ActiveCam].CamTargetEntity);
+		}else if(m_bStartInterScript && m_iTypeOfSwitch == JUMP_CUT || jumpCutTo1stPrs){
+			m_uiTransitionState = 0;
+			m_vecDoingSpecialInterPolation = false;
+			if(m_bEnable1rstPersonCamCntrlsScript && ReqMode == CCam::MODE_1STPERSON)
+				Cams[ActiveCam].Mode = ReqMode;
+			else if(useWeaponMode)
+				Cams[ActiveCam].Mode = PlayerWeaponMode.Mode;
+			else
+				Cams[ActiveCam].Mode = m_iModeToGoTo;
+			m_bJust_Switched = true;
+			Cams[ActiveCam].ResetStatics = true;
+			Cams[ActiveCam].m_cvecCamFixedModeVector = m_vecFixedModeVector;
+			Cams[ActiveCam].CamTargetEntity = pTargetEntity;
+			Cams[ActiveCam].m_cvecCamFixedModeSource = m_vecFixedModeSource;
+			Cams[ActiveCam].m_cvecCamFixedModeUpOffSet = m_vecFixedModeUpOffSet;
+			Cams[ActiveCam].m_bCamLookingAtVector = m_bLookingAtVector;
+			Cams[ActiveCam].m_vecLastAboveWaterCamPosition = Cams[(ActiveCam+1)%2].m_vecLastAboveWaterCamPosition;
+			m_bJust_Switched = true;
+			pTargetEntity->RegisterReference(&pTargetEntity);
+			Cams[ActiveCam].CamTargetEntity->RegisterReference(&Cams[ActiveCam].CamTargetEntity);
+			CarZoomValueSmooth = CarZoomValue;
+			m_fPedZoomValueSmooth = m_fPedZoomValue;
+		}
+	}
+
+	m_bStartInterScript = false;
+
+	if(Cams[ActiveCam].CamTargetEntity == nil)
+		Cams[ActiveCam].CamTargetEntity = pTargetEntity;
+
+	// Ped visibility
+	if((Cams[ActiveCam].Mode == CCam::MODE_1STPERSON ||
+	    Cams[ActiveCam].Mode == CCam::MODE_SNIPER ||
+	    Cams[ActiveCam].Mode == CCam::MODE_M16_1STPERSON ||
+	    Cams[ActiveCam].Mode == CCam::MODE_ROCKETLAUNCHER ||
+	    Cams[ActiveCam].Mode == CCam::MODE_HELICANNON_1STPERSON ||
+	    Cams[ActiveCam].Mode == CCam::MODE_CAMERA) && pTargetEntity->IsPed() ||
+	   Cams[ActiveCam].Mode == CCam::MODE_FLYBY)
+		FindPlayerPed()->bIsVisible = false;
+	else
+		FindPlayerPed()->bIsVisible = true;
+
+	bool switchedFromObbe = false;
+	if(!canUseObbeCam && WhoIsInControlOfTheCamera == CAMCONTROL_OBBE){
+		RestoreWithJumpCut();
+		switchedFromObbe = true;
+		SetCameraDirectlyBehindForFollowPed_CamOnAString();
+	}
+
+	if(PrevMode != Cams[ActiveCam].Mode || switchedFromObbe ||
+	   Cams[ActiveCam].Mode == CCam::MODE_FOLLOWPED || Cams[ActiveCam].Mode == CCam::MODE_CAM_ON_A_STRING)
+		if(CPad::GetPad(0)->CycleCameraModeJustDown() &&
+		   !CReplay::IsPlayingBack() &&
+		   (m_bLookingAtPlayer || WhoIsInControlOfTheCamera == CAMCONTROL_OBBE) &&
+		   !m_WideScreenOn &&
+		   (WhoIsInControlOfTheCamera != CAMCONTROL_OBBE || bSwitchedToObbeCam))
+			DMAudio.PlayFrontEndSound(SOUND_HUD, 0);
+}
+
+// What a mess!
+void
+CCamera::UpdateTargetEntity(void)
+{
+	bool enteringCar = false;
+	bool obbeCam = false;
+
+	m_bPlayerWasOnBike = false;
+	if(pTargetEntity && pTargetEntity->IsVehicle() && ((CVehicle*)pTargetEntity)->IsBike())
+		m_bPlayerWasOnBike = true;
+
+	if(WhoIsInControlOfTheCamera == CAMCONTROL_OBBE){
+		obbeCam = true;
+		if(m_iModeObbeCamIsInForCar == OBBE_COPCAR_WHEEL || m_iModeObbeCamIsInForCar == OBBE_COPCAR){
+			if(FindPlayerPed()->GetPedState() != PED_ARRESTED)
+				obbeCam = false;
+			if(FindPlayerVehicle() == nil)
+				pTargetEntity = FindPlayerPed();
+		}
+	}
+
+	if((m_bLookingAtPlayer || obbeCam) && m_uiTransitionState == 0 ||
+	   pTargetEntity == nil ||
+	   m_bTargetJustBeenOnTrain){
+		if(FindPlayerVehicle())
+			pTargetEntity = FindPlayerVehicle();
+		else{
+			pTargetEntity = FindPlayerPed();
+			// this keeps the camera on the player while entering cars
+			if(PLAYER->GetPedState() == PED_ENTER_CAR ||
+			   PLAYER->GetPedState() == PED_CARJACK ||
+			   PLAYER->GetPedState() == PED_OPEN_DOOR)
+				enteringCar = true;
+
+			if(!enteringCar)
+				if(Cams[ActiveCam].CamTargetEntity != pTargetEntity)
+					Cams[ActiveCam].CamTargetEntity = pTargetEntity;
+		}
+
+		bool cantOpen = true;
+		if(PLAYER){
+			if(PLAYER->m_pMyVehicle){
+				if(FindPlayerPed()->m_pMyVehicle->CanPedOpenLocks(PLAYER))
+					cantOpen = false;
+			}else if(FindPlayerPed()->m_carInObjective &&
+			         (FindPlayerPed()->GetPedState() == PED_ENTER_CAR ||
+			          FindPlayerPed()->GetPedState() == PED_CARJACK ||
+			          FindPlayerPed()->GetPedState() == PED_OPEN_DOOR)){
+				if(FindPlayerPed()->m_carInObjective->CanPedOpenLocks(FindPlayerPed()))
+					cantOpen = false;
+			}
+		}
+
+		if(PLAYER->GetPedState() == PED_ENTER_CAR && !cantOpen){
+			if(!enteringCar && CarZoomIndicator != CAM_ZOOM_1STPRS){
+				pTargetEntity = PLAYER->m_pMyVehicle;
+				if(PLAYER->m_pMyVehicle == nil)
+					pTargetEntity = PLAYER;
+			}
+		}
+
+		if((PLAYER->GetPedState() == PED_CARJACK || PLAYER->GetPedState() == PED_OPEN_DOOR) && !cantOpen){
+			if(!enteringCar && CarZoomIndicator != CAM_ZOOM_1STPRS)
+				pTargetEntity = PLAYER->m_pMyVehicle;
+			if(PLAYER->m_pMyVehicle == nil)
+				pTargetEntity = PLAYER;
+		}
+
+		if(PLAYER->GetPedState() == PED_EXIT_CAR)
+			pTargetEntity = FindPlayerPed();
+		if(PLAYER->GetPedState() == PED_DRAG_FROM_CAR)
+			pTargetEntity = FindPlayerPed();
+		if(pTargetEntity->IsVehicle() && CarZoomIndicator == CAM_ZOOM_1STPRS && FindPlayerPed()->GetPedState() == PED_ARRESTED)
+			pTargetEntity = FindPlayerPed();
+	}
+}
+
+const float SOUND_DIST = 20.0f;
+
+void
+CCamera::UpdateSoundDistances(void)
+{
+	CVector center, end;
+	CEntity *entity;
+	CColPoint colPoint;
+	float f;
+	int n;
+
+	if((Cams[ActiveCam].Mode == CCam::MODE_1STPERSON ||
+	    Cams[ActiveCam].Mode == CCam::MODE_SNIPER ||
+	    Cams[ActiveCam].Mode == CCam::MODE_SNIPER_RUNABOUT ||
+	    Cams[ActiveCam].Mode == CCam::MODE_ROCKETLAUNCHER_RUNABOUT ||
+	    Cams[ActiveCam].Mode == CCam::MODE_1STPERSON_RUNABOUT ||
+	    Cams[ActiveCam].Mode == CCam::MODE_M16_1STPERSON_RUNABOUT ||
+	    Cams[ActiveCam].Mode == CCam::MODE_FIGHT_CAM_RUNABOUT ||
+	    Cams[ActiveCam].Mode == CCam::MODE_HELICANNON_1STPERSON ||
+	    Cams[ActiveCam].Mode == CCam::MODE_CAMERA ||
+	    Cams[ActiveCam].Mode == CCam::MODE_M16_1STPERSON ||
+	    Cams[ActiveCam].Mode == CCam::MODE_ROCKETLAUNCHER) &&
+	   pTargetEntity->IsPed())
+		center = GetPosition() + 0.5f*GetForward();
+	else
+		center = GetPosition() + 5.0f*GetForward();
+
+	// check up
+	n = CTimer::GetFrameCounter() % 12;
+	if(n == 0){
+		SoundDistUpAsReadOld = SoundDistUpAsRead;
+		if(CWorld::ProcessVerticalLine(center, center.z+SOUND_DIST, colPoint, entity, true, false, false, false, true, false, nil))
+			SoundDistUpAsRead = colPoint.point.z - center.z;
+		else
+			SoundDistUpAsRead = SOUND_DIST;
+	}
+	f = (n + 1) / 6.0f;
+	SoundDistUp = (1.0f-f)*SoundDistUpAsReadOld + f*SoundDistUpAsRead;
+}
+
+void
+CCamera::InitialiseCameraForDebugMode(void)
+{
+	if(FindPlayerVehicle())
+		Cams[2].Source = FindPlayerVehicle()->GetPosition();
+	else if(FindPlayerPed())
+		Cams[2].Source = FindPlayerPed()->GetPosition();
+	Cams[2].Alpha = 0.0f;
+	Cams[2].Beta = 0.0f;
+	Cams[2].Mode = CCam::MODE_DEBUG;
+}
+
+void
+CCamera::CamShake(float strength, float x, float y, float z)
+{
+	CVector Dist = Cams[ActiveCam].Source - CVector(x, y, z);
+	// a bit complicated...
+	float dist2d = Sqrt(SQR(Dist.x) + SQR(Dist.y));
+	float dist3d = Sqrt(SQR(dist2d) + SQR(Dist.z));
+	if(dist3d > 100.0f) dist3d = 100.0f;
+	if(dist3d < 0.0f) dist3d = 0.0f;
+	float mult = 1.0f - dist3d/100.0f;
+
+	float curForce = mult*(m_fCamShakeForce - (CTimer::GetTimeInMilliseconds() - m_uiCamShakeStart)/1000.0f);
+	strength = mult*strength;
+	if(clamp(curForce, 0.0f, 2.0f) < strength){
+		m_fCamShakeForce = strength;
+		m_uiCamShakeStart = CTimer::GetTimeInMilliseconds();
+	}
+}
+
+// This seems to be CCamera::CamShake(float) on PS2
+void
+CamShakeNoPos(CCamera *cam, float strength)
+{
+	float curForce = cam->m_fCamShakeForce - (CTimer::GetTimeInMilliseconds() - cam->m_uiCamShakeStart)/1000.0f;
+	if(clamp(curForce, 0.0f, 2.0f) < strength){
+		cam->m_fCamShakeForce = strength;
+		cam->m_uiCamShakeStart = CTimer::GetTimeInMilliseconds();
+	}
+}
+
+bool bAvoidTest1 = false;
+bool bAvoidTest2 = false;	// unused
+bool bAvoidTest3 = false;	// unused
+float fRangePlayerRadius = 0.5f;
+float fCloseNearClipLimit = 0.15f;
+float fAvoidTweakFOV = 1.15f;
+float fAvoidProbTimerDamp = 0.9f;
+
+void
+CCamera::AvoidTheGeometry(const CVector &Source, const CVector &TargetPos, CVector &NewSource, float FOV)
+{
+	float Beta = 0.0f;
+	float Alpha = 0.0f;
+
+	CVector vDist = TargetPos - Source;
+	m_vecClearGeometryVec = CVector(0.0f, 0.0f, 0.0f);
+	float fDist = vDist.Magnitude();
+	float fDistOnGround = vDist.Magnitude2D();
+	if(vDist.x == 0.0f && vDist.y == 0.0f)
+		Beta = CGeneral::GetATanOfXY(GetForward().x, GetForward().y);
+	else
+		Beta = CGeneral::GetATanOfXY(vDist.x, vDist.y);
+	if(fDistOnGround != 0.0f || vDist.z != 0.0f)
+		Alpha = CGeneral::GetATanOfXY(fDistOnGround, vDist.z);
+	CVector Front(Cos(Alpha)*Cos(Beta), Cos(Alpha)*Sin(Beta), Sin(Alpha));
+	NewSource = TargetPos - Front*fDist;
+	Front.Normalise();
+
+	// Clip camera source
+	CColPoint point;
+	CEntity *entity = nil;
+	CWorld::pIgnoreEntity = pTargetEntity;
+	if(CWorld::ProcessLineOfSight(TargetPos, NewSource, point, entity, true, false, false, true, false, false, true)){
+		CVector ClipPoint1 = point.point;
+		NewSource = point.point;
+		if(!bAvoidTest1){
+			if(CWorld::ProcessLineOfSight(NewSource, TargetPos, point, entity, false, true, true, true, false, false, true)){
+				if((NewSource - point.point).Magnitude() < RwCameraGetNearClipPlane(Scene.camera))
+					NewSource = point.point;
+				else if((NewSource - ClipPoint1).Magnitude() < RwCameraGetNearClipPlane(Scene.camera))
+					NewSource = ClipPoint1;
+			}
+		}
+	}
+	CWorld::pIgnoreEntity = nil;
+
+
+	vDist = TargetPos - NewSource;
+	fDist = vDist.Magnitude();
+	if(FindPlayerPed())
+		if(fDist - fRangePlayerRadius < RwCameraGetNearClipPlane(Scene.camera))
+			RwCameraSetNearClipPlane(Scene.camera, Max(fDist - fRangePlayerRadius, fCloseNearClipLimit));
+
+
+	static float fClearGeomAmount;
+	static float fClearGeomAmountSpeed;
+	float Near = RwCameraGetNearClipPlane(Scene.camera);
+	float ViewPlaneHeight = Tan(DEGTORAD(FOV) / 2.0f);
+	float ViewPlaneWidth = ViewPlaneHeight * CDraw::CalculateAspectRatio() * fAvoidTweakFOV;
+	CVector Center = NewSource + Front*Near;
+	float fClearGeomTarget = 0.0f;
+	if(CWorld::TestSphereAgainstWorld(Center, ViewPlaneWidth, nil, true, false, false, true, false, true)){
+		CVector CamToCol = gaTempSphereColPoints[0].point - NewSource;
+		float FrontDist = DotProduct(CamToCol, Front);
+		CVector CenterToCol = gaTempSphereColPoints[0].point - Center;
+		if(FrontDist < DEFAULT_NEAR && FrontDist > fCloseNearClipLimit){
+			if(FrontDist < RwCameraGetNearClipPlane(Scene.camera))
+				RwCameraSetNearClipPlane(Scene.camera, FrontDist);
+		}else if(FrontDist < fCloseNearClipLimit)
+			RwCameraSetNearClipPlane(Scene.camera, fCloseNearClipLimit);
+
+		float ColDepth = ViewPlaneWidth - CenterToCol.Magnitude();	// amount of radius in collision
+		CenterToCol.Normalise();
+		CVector Normal = gaTempSphereColPoints[0].normal;
+		Normal.Normalise();
+		if(-DotProduct(CenterToCol, Normal) < 0.0f)
+			Normal = -Normal;	// always push away from col surface
+		float DistToMove = DotProduct(-ColDepth*CenterToCol, Normal);
+		m_vecClearGeometryVec = DistToMove*Normal;	// move source so this point is out of collision
+
+		if(pTargetEntity && pTargetEntity->IsPed() && RwCameraGetNearClipPlane(Scene.camera) < 2.0f*fCloseNearClipLimit){
+			float TargetNormalDir = DotProduct(Normal, pTargetEntity->GetForward());
+			if(TargetNormalDir < 0.0f){
+				// target looking towards collision
+				if(m_fAvoidTheGeometryProbsTimer < 0.0f)
+					m_fAvoidTheGeometryProbsTimer = 0.0f;
+				m_fAvoidTheGeometryProbsTimer += CTimer::GetTimeStep();
+			}else if(TargetNormalDir > 0.5f){
+				// target looking away from collision
+				if(m_fAvoidTheGeometryProbsTimer > 0.0f)
+					m_fAvoidTheGeometryProbsTimer = 0.0f;
+				m_fAvoidTheGeometryProbsTimer -= CTimer::GetTimeStep();
+			}
+
+			if(m_nAvoidTheGeometryProbsDirn == 0){
+				if(CrossProduct(pTargetEntity->GetPosition() - NewSource, Normal).z > 0.0f)
+					m_nAvoidTheGeometryProbsDirn = -1;
+				else
+					m_nAvoidTheGeometryProbsDirn = 1;
+			}
+		}
+
+		fClearGeomTarget = 1.0f;
+	}
+
+	m_fAvoidTheGeometryProbsTimer *= Pow(fAvoidProbTimerDamp, CTimer::GetTimeStep());
+	WellBufferMe(fClearGeomTarget, &fClearGeomAmount, &fClearGeomAmountSpeed, 0.2f, 0.05f, false);
+	m_vecClearGeometryVec *= fClearGeomAmount;
+	m_bMoveCamToAvoidGeom = true;
+}
+
+void
+CCamera::GetArrPosForVehicleType(int apperance, int &index)
+{
+	switch(apperance){
+	case VEHICLE_APPEARANCE_CAR: index = 0; break;
+	case VEHICLE_APPEARANCE_BIKE: index = 1; break;
+	case VEHICLE_APPEARANCE_HELI: index = 2; break;
+	case VEHICLE_APPEARANCE_PLANE: index = 3; break;
+	case VEHICLE_APPEARANCE_BOAT: index = 4; break;
+	}
+}
+
+void
+CCamera::GetScreenRect(CRect &rect)
+{
+	rect.left = 0.0f;
+	rect.right = SCREEN_WIDTH;
+	if(m_WideScreenOn
+#ifdef CUTSCENE_BORDERS_SWITCH
+		&& CMenuManager::m_PrefsCutsceneBorders
+#endif
+		){
+		float borderSize = (SCREEN_HEIGHT / 2) * (m_ScreenReductionPercentage / 100.f);
+		rect.top = borderSize - SCREEN_SCALE_Y(22.f);
+		rect.bottom = SCREEN_HEIGHT - borderSize - SCREEN_SCALE_Y(14.f);
+	}else{
+		rect.top = 0.0f;
+		rect.bottom = SCREEN_HEIGHT;
+	}
+}
+
+
+void
+CCamera::TakeControl(CEntity *target, int16 mode, int16 typeOfSwitch, int32 controller)
+{
+	bool doSwitch = true;
+	if(controller == CAMCONTROL_OBBE && WhoIsInControlOfTheCamera == CAMCONTROL_SCRIPT)
+		doSwitch = false;
+	if(doSwitch){
+		WhoIsInControlOfTheCamera = controller;
+		if(target){
+			if(mode == CCam::MODE_NONE){
+				// Why are we checking the old entity?
+				if(pTargetEntity->IsPed())
+					mode = CCam::MODE_FOLLOWPED;
+				else if(pTargetEntity->IsVehicle())
+					mode = CCam::MODE_CAM_ON_A_STRING;
+			}
+		}else if(FindPlayerVehicle())
+			target = FindPlayerVehicle();
+		else
+			target = PLAYER;
+
+		m_bLookingAtVector = false;
+		pTargetEntity = target;
+		m_iModeToGoTo = mode;
+		m_iTypeOfSwitch = typeOfSwitch;
+		m_bLookingAtPlayer = false;
+		m_bStartInterScript = true;
+	}
+}
+
+void
+CCamera::TakeControlNoEntity(const CVector &position, int16 typeOfSwitch, int32 controller)
+{
+	bool doSwitch = true;
+	if(controller == CAMCONTROL_OBBE && WhoIsInControlOfTheCamera == CAMCONTROL_SCRIPT)
+		doSwitch = false;
+	if(doSwitch){
+		WhoIsInControlOfTheCamera = controller;
+		m_bLookingAtVector = true;
+		m_bLookingAtPlayer = false;
+		m_iModeToGoTo = CCam::MODE_FIXED;
+		m_vecFixedModeVector = position;
+		m_iTypeOfSwitch = typeOfSwitch;
+		m_bStartInterScript = true;
+	}
+}
+
+void
+CCamera::TakeControlWithSpline(int16 typeOfSwitch)
+{
+	m_iModeToGoTo = CCam::MODE_FLYBY;
+	m_bLookingAtPlayer = false;
+	m_bLookingAtVector = false;
+	m_bcutsceneFinished = false;
+	m_iTypeOfSwitch = typeOfSwitch;
+	m_bStartInterScript = true;
+};
+
+void
+CCamera::Restore(void)
+{
+	m_bLookingAtPlayer = true;
+	m_bLookingAtVector = false;
+	m_iTypeOfSwitch = INTERPOLATION;
+	m_bUseNearClipScript = false;
+	m_iModeObbeCamIsInForCar = OBBE_INVALID;
+	m_fPositionAlongSpline = 0.0;
+	m_bStartingSpline = false;
+	m_bScriptParametersSetForInterPol = false;
+	WhoIsInControlOfTheCamera = CAMCONTROL_GAME;
+
+	if(FindPlayerVehicle()){
+		m_iModeToGoTo = CCam::MODE_CAM_ON_A_STRING;
+		pTargetEntity = FindPlayerVehicle();
+	}else{
+		m_iModeToGoTo = CCam::MODE_FOLLOWPED;
+		pTargetEntity = PLAYER;
+	}
+
+	if(PLAYER->GetPedState() == PED_ENTER_CAR ||
+	   PLAYER->GetPedState() == PED_CARJACK ||
+	   PLAYER->GetPedState() == PED_OPEN_DOOR){
+		m_iModeToGoTo = CCam::MODE_CAM_ON_A_STRING;
+		pTargetEntity = PLAYER->m_pSeekTarget;
+	}
+	if(PLAYER->GetPedState() == PED_EXIT_CAR){
+		m_iModeToGoTo = CCam::MODE_FOLLOWPED;
+		pTargetEntity = PLAYER;
+	}
+
+	m_bEnable1rstPersonCamCntrlsScript = false;
+	m_bAllow1rstPersonWeaponsCamera = false;
+	m_bUseScriptZoomValuePed = false;
+	m_bUseScriptZoomValueCar = false;
+	m_bStartInterScript = true;
+	m_bCameraJustRestored = true;
+	m_fAvoidTheGeometryProbsTimer = 0.0f;
+}
+
+void
+CCamera::RestoreWithJumpCut(void)
+{
+	m_bRestoreByJumpCut = true;
+	m_bLookingAtPlayer = true;
+	m_bLookingAtVector = false;
+	m_iTypeOfSwitch = JUMP_CUT;
+	m_bUseNearClipScript = false;
+	m_iModeObbeCamIsInForCar = OBBE_INVALID;
+	m_fPositionAlongSpline = 0.0;
+	m_bStartingSpline = false;
+	m_bScriptParametersSetForInterPol = false;
+	WhoIsInControlOfTheCamera = CAMCONTROL_GAME;
+	m_bCameraJustRestored = true;
+	m_bEnable1rstPersonCamCntrlsScript = false;
+	m_bAllow1rstPersonWeaponsCamera = false;
+
+	if(FindPlayerVehicle()){
+		m_iModeToGoTo = CCam::MODE_CAM_ON_A_STRING;
+		pTargetEntity = FindPlayerVehicle();
+	}else{
+		m_iModeToGoTo = CCam::MODE_FOLLOWPED;
+		pTargetEntity = PLAYER;
+	}
+
+	if(PLAYER->GetPedState() == PED_ENTER_CAR ||
+	   PLAYER->GetPedState() == PED_CARJACK ||
+	   PLAYER->GetPedState() == PED_OPEN_DOOR){
+		m_iModeToGoTo = CCam::MODE_CAM_ON_A_STRING;
+		pTargetEntity = PLAYER->m_pSeekTarget;
+	}
+	if(PLAYER->GetPedState() == PED_EXIT_CAR){
+		m_iModeToGoTo = CCam::MODE_FOLLOWPED;
+		pTargetEntity = PLAYER;
+	}
+
+	m_bUseScriptZoomValuePed = false;
+	m_bUseScriptZoomValueCar = false;
+}
+
+void
+CCamera::SetCamPositionForFixedMode(const CVector &Source, const CVector &UpOffSet)
+{
+	m_vecFixedModeSource = Source;
+	m_vecFixedModeUpOffSet = UpOffSet;
+	m_bGarageFixedCamPositionSet = false;
+}
+
+
+void
+CCamera::StartTransition(int16 newMode)
+{
+	bool switchFromFixedSyphon = false;
+	bool switchSyphonMode = false;
+	bool switchPedMode = false;
+	bool switchPedToCar = false;
+	bool switchFromFight = false;
+	bool switchBikeToPed = false;
+	bool switchFromFixed = false;
+	bool switch1stPersonToVehicle = false;
+	float betaOffset, targetBeta, camBeta, deltaBeta;
+	int door;
+	bool vehicleVertical;
+
+	m_bItsOkToLookJustAtThePlayer = false;
+	m_fFractionInterToStopMoving = 0.25f;
+	m_fFractionInterToStopCatchUp = 0.75f;
+
+	if(Cams[ActiveCam].Mode == CCam::MODE_SYPHON_CRIM_IN_FRONT ||
+	   Cams[ActiveCam].Mode == CCam::MODE_FOLLOWPED ||
+	   Cams[ActiveCam].Mode == CCam::MODE_SYPHON ||
+	   Cams[ActiveCam].Mode == CCam::MODE_SPECIAL_FIXED_FOR_SYPHON){
+		if(newMode == CCam::MODE_SYPHON_CRIM_IN_FRONT ||
+		   newMode == CCam::MODE_FOLLOWPED ||
+		   newMode == CCam::MODE_SYPHON ||
+		   newMode == CCam::MODE_SPECIAL_FIXED_FOR_SYPHON)
+			switchPedMode = true;
+		if(newMode == CCam::MODE_CAM_ON_A_STRING)
+			switchPedToCar = true;
+	}
+
+	if(Cams[ActiveCam].Mode == CCam::MODE_SPECIAL_FIXED_FOR_SYPHON)
+		switchFromFixedSyphon = true;
+	if(Cams[ActiveCam].Mode == CCam::MODE_CAM_ON_A_STRING && newMode == CCam::MODE_FOLLOWPED && m_bPlayerWasOnBike)
+		switchBikeToPed = true;
+	if(Cams[ActiveCam].Mode == CCam::MODE_SYPHON_CRIM_IN_FRONT && newMode == CCam::MODE_SYPHON)
+		switchSyphonMode = true;
+	if(Cams[ActiveCam].Mode == CCam::MODE_FIGHT_CAM && newMode == CCam::MODE_FOLLOWPED)
+		switchFromFight = true;
+	if(Cams[ActiveCam].Mode == CCam::MODE_FIXED)
+		switchFromFixed = true;
+
+	m_bUseTransitionBeta = false;
+
+	if((Cams[ActiveCam].Mode == CCam::MODE_SNIPER ||
+	    Cams[ActiveCam].Mode == CCam::MODE_ROCKETLAUNCHER ||
+	    Cams[ActiveCam].Mode == CCam::MODE_M16_1STPERSON ||
+	    Cams[ActiveCam].Mode == CCam::MODE_SNIPER_RUNABOUT ||
+	    Cams[ActiveCam].Mode == CCam::MODE_ROCKETLAUNCHER_RUNABOUT ||
+	    Cams[ActiveCam].Mode == CCam::MODE_M16_1STPERSON_RUNABOUT ||
+	    Cams[ActiveCam].Mode == CCam::MODE_FIGHT_CAM_RUNABOUT ||
+	    Cams[ActiveCam].Mode == CCam::MODE_HELICANNON_1STPERSON ||
+	    Cams[ActiveCam].Mode == CCam::MODE_CAMERA ||
+	    Cams[ActiveCam].Mode == CCam::MODE_1STPERSON_RUNABOUT) &&
+	   pTargetEntity->IsPed()){
+		float angle = CGeneral::GetATanOfXY(Cams[ActiveCam].Front.x, Cams[ActiveCam].Front.y) - HALFPI;
+		((CPed*)pTargetEntity)->m_fRotationCur = angle;
+		((CPed*)pTargetEntity)->m_fRotationDest = angle;
+	}
+
+	Cams[ActiveCam].m_cvecCamFixedModeVector = m_vecFixedModeVector;
+	Cams[ActiveCam].CamTargetEntity = pTargetEntity;
+	Cams[ActiveCam].m_cvecCamFixedModeSource = m_vecFixedModeSource;
+	Cams[ActiveCam].m_cvecCamFixedModeUpOffSet = m_vecFixedModeUpOffSet;
+	Cams[ActiveCam].m_bCamLookingAtVector = m_bLookingAtVector;
+
+	if(newMode == CCam::MODE_SNIPER ||
+	   newMode == CCam::MODE_ROCKETLAUNCHER ||
+	   newMode == CCam::MODE_M16_1STPERSON ||
+	   newMode == CCam::MODE_SNIPER_RUNABOUT ||
+	   newMode == CCam::MODE_ROCKETLAUNCHER_RUNABOUT ||
+	   newMode == CCam::MODE_1STPERSON_RUNABOUT ||
+	   newMode == CCam::MODE_M16_1STPERSON_RUNABOUT ||
+	   newMode == CCam::MODE_FIGHT_CAM_RUNABOUT ||
+	   newMode == CCam::MODE_HELICANNON_1STPERSON ||
+	   newMode == CCam::MODE_CAMERA)
+		Cams[ActiveCam].Alpha = 0.0f;
+
+	switch(Cams[ActiveCam].Mode)
+	case CCam::MODE_SNIPER_RUNABOUT:
+	case CCam::MODE_ROCKETLAUNCHER_RUNABOUT:
+	case CCam::MODE_1STPERSON_RUNABOUT:
+	case CCam::MODE_M16_1STPERSON_RUNABOUT:
+	case CCam::MODE_FIGHT_CAM_RUNABOUT:
+	case CCam::MODE_CAMERA:
+		if(newMode == CCam::MODE_CAM_ON_A_STRING || newMode == CCam::MODE_BEHINDBOAT)
+			switch1stPersonToVehicle = true;
+
+	switch(newMode){
+	case CCam::MODE_BEHINDCAR:
+		Cams[ActiveCam].BetaSpeed = 0.0f;
+		break;
+
+	case CCam::MODE_BEHINDBOAT:
+		Cams[ActiveCam].BetaSpeed = 0.0f;
+		break;
+
+	case CCam::MODE_FOLLOWPED:
+		// Getting out of vehicle normally
+		betaOffset = DEGTORAD(55.0f);
+		if(m_bJustCameOutOfGarage){
+			m_bUseTransitionBeta = true;
+			if(Cams[ActiveCam].Front.x != 0.0f || Cams[ActiveCam].Front.y != 0.0f)
+				Cams[ActiveCam].m_fTransitionBeta = CGeneral::GetATanOfXY(Cams[ActiveCam].Front.x, Cams[ActiveCam].Front.y) + PI;
+			else
+				Cams[ActiveCam].m_fTransitionBeta = 0.0f;
+		}
+		if(m_bTargetJustCameOffTrain)
+			m_bCamDirectlyInFront = true;
+		if(Cams[ActiveCam].Mode != CCam::MODE_CAM_ON_A_STRING)
+			break;
+		m_bUseTransitionBeta = true;
+		vehicleVertical = false;
+		if(((CPed*)pTargetEntity)->m_carInObjective &&
+		   ((CPed*)pTargetEntity)->m_carInObjective->GetForward().x == 0.0f &&
+		   ((CPed*)pTargetEntity)->m_carInObjective->GetForward().y == 0.0f)
+			vehicleVertical = true;
+		if(vehicleVertical){
+			Cams[ActiveCam].m_fTransitionBeta = 0.0f;
+			break;
+		}
+		camBeta = CGeneral::GetATanOfXY(Cams[ActiveCam].Front.x, Cams[ActiveCam].Front.y);
+		if(((CPed*)pTargetEntity)->m_carInObjective)
+			targetBeta = CGeneral::GetATanOfXY(((CPed*)pTargetEntity)->m_carInObjective->GetForward().x, ((CPed*)pTargetEntity)->m_carInObjective->GetForward().y);
+		else
+			targetBeta = camBeta;
+		deltaBeta = targetBeta - camBeta;
+		while(deltaBeta >= PI) deltaBeta -= 2*PI;
+		while(deltaBeta < -PI) deltaBeta += 2*PI;
+		deltaBeta = Abs(deltaBeta);
+
+		door = FindPlayerPed()->m_vehDoor;
+		if(deltaBeta > HALFPI){
+			if(((CPed*)pTargetEntity)->m_carInObjective){
+				if(((CPed*)pTargetEntity)->m_carInObjective->IsUpsideDown()){
+					if(door == CAR_DOOR_LF || door == CAR_DOOR_LR)
+						betaOffset = -DEGTORAD(95.0f);
+				}else{
+					if(door == CAR_DOOR_RF || door == CAR_DOOR_RR)
+						betaOffset = -DEGTORAD(95.0f);
+				}
+			}
+			Cams[ActiveCam].m_fTransitionBeta = targetBeta + betaOffset;
+		}else{
+			if(((CPed*)pTargetEntity)->m_carInObjective){
+				if(((CPed*)pTargetEntity)->m_carInObjective->IsUpsideDown()){
+					if(door == CAR_DOOR_RF || door == CAR_DOOR_RR)
+						betaOffset = -DEGTORAD(55.0f);
+					else if(door == CAR_DOOR_LF || door == CAR_DOOR_LR)
+						betaOffset = DEGTORAD(95.0f);
+				}else{
+					if(door == CAR_DOOR_LF || door == CAR_DOOR_LR)
+						betaOffset = -DEGTORAD(55.0f);
+					else if(door == CAR_DOOR_RF || door == CAR_DOOR_RR)
+						betaOffset = DEGTORAD(95.0f);
+				}
+			}
+			Cams[ActiveCam].m_fTransitionBeta = targetBeta + betaOffset + PI;
+		}
+		break;
+
+	case CCam::MODE_SNIPER:
+	case CCam::MODE_ROCKETLAUNCHER:
+	case CCam::MODE_M16_1STPERSON:
+	case CCam::MODE_SNIPER_RUNABOUT:
+	case CCam::MODE_ROCKETLAUNCHER_RUNABOUT:
+	case CCam::MODE_1STPERSON_RUNABOUT:
+	case CCam::MODE_M16_1STPERSON_RUNABOUT:
+	case CCam::MODE_FIGHT_CAM_RUNABOUT:
+	case CCam::MODE_HELICANNON_1STPERSON:
+	case CCam::MODE_CAMERA:
+		if(FindPlayerVehicle())
+			Cams[ActiveCam].Beta = Atan2(FindPlayerVehicle()->GetForward().x, FindPlayerVehicle()->GetForward().y);
+		else
+			Cams[ActiveCam].Beta = Atan2(PLAYER->GetForward().x, PLAYER->GetForward().y);
+		break;
+
+	case CCam::MODE_SYPHON:
+		Cams[ActiveCam].Alpha = 0.0f;
+		Cams[ActiveCam].AlphaSpeed = 0.0f;
+		break;
+
+	case CCam::MODE_CAM_ON_A_STRING:
+		// Get into vehicle
+		betaOffset = DEGTORAD(57.0f);
+		if(!m_bLookingAtPlayer || m_bJustCameOutOfGarage)
+			break;
+		m_bUseTransitionBeta = true;
+		Cams[ActiveCam].m_fTransitionBeta = CGeneral::GetATanOfXY(Cams[ActiveCam].Front.x, Cams[ActiveCam].Front.y);
+		break;
+
+	case CCam::MODE_PED_DEAD_BABY:
+		Cams[ActiveCam].Alpha = DEGTORAD(15.0f);
+		break;
+
+	case CCam::MODE_FIGHT_CAM:
+		Cams[ActiveCam].Beta = 0.0f;
+		Cams[ActiveCam].BetaSpeed = 0.0f;
+		Cams[ActiveCam].Alpha = 0.0f;
+		Cams[ActiveCam].AlphaSpeed = 0.0f;
+		break;
+	}
+
+	Cams[ActiveCam].Init();
+	Cams[ActiveCam].Mode = newMode;
+
+	m_uiTransitionDuration = 1350;
+	if(switchSyphonMode)
+		m_uiTransitionDuration = 1800;
+	else if(switchFromFight)
+		m_uiTransitionDuration = 750;
+	else if(switchPedToCar){
+		m_fFractionInterToStopMoving = 0.1f;
+		m_fFractionInterToStopCatchUp = 0.9f;
+		m_uiTransitionDuration = 750;
+	}else if(switchFromFixedSyphon){
+		m_fFractionInterToStopMoving = 0.0f;
+		m_fFractionInterToStopCatchUp = 1.0f;
+		m_uiTransitionDuration = 600;
+	}else if(switchFromFixed){
+		m_fFractionInterToStopMoving = 0.05f;
+		m_fFractionInterToStopCatchUp = 0.95f;
+	}else if(switchBikeToPed){
+		m_uiTransitionDuration = 800;
+	}else if(switch1stPersonToVehicle){
+		m_fFractionInterToStopMoving = 0.0f;
+		m_fFractionInterToStopCatchUp = 1.0f;
+		m_uiTransitionDuration = 1;
+	}else if(switchPedMode){
+		m_fFractionInterToStopMoving = 0.5f;
+		m_fFractionInterToStopCatchUp = 0.5f;
+		m_uiTransitionDuration = 350;
+	}else
+		m_uiTransitionDuration = 1350;	// already set above
+	m_uiTransitionState = 1;
+	m_uiTimeTransitionStart = CTimer::GetTimeInMilliseconds();
+	m_uiTransitionJUSTStarted = 1;
+	if(m_vecDoingSpecialInterPolation){
+		m_cvecStartingSourceForInterPol = SourceDuringInter;
+		m_cvecStartingTargetForInterPol = TargetDuringInter;
+		m_cvecStartingUpForInterPol = UpDuringInter;
+		m_fStartingAlphaForInterPol = m_fAlphaDuringInterPol;
+		m_fStartingBetaForInterPol = m_fBetaDuringInterPol;
+	}else{
+		m_cvecStartingSourceForInterPol = Cams[ActiveCam].Source;
+		m_cvecStartingTargetForInterPol = Cams[ActiveCam].m_cvecTargetCoorsForFudgeInter;
+		m_cvecStartingUpForInterPol = Cams[ActiveCam].Up;
+		m_fStartingAlphaForInterPol = Cams[ActiveCam].m_fTrueAlpha;
+		m_fStartingBetaForInterPol = Cams[ActiveCam].m_fTrueBeta;
+	}
+	Cams[ActiveCam].m_bCamLookingAtVector = m_bLookingAtVector;
+	Cams[ActiveCam].m_cvecCamFixedModeVector = m_vecFixedModeVector;
+	Cams[ActiveCam].m_cvecCamFixedModeSource = m_vecFixedModeSource;
+	Cams[ActiveCam].m_cvecCamFixedModeUpOffSet = m_vecFixedModeUpOffSet;
+	Cams[ActiveCam].Mode = newMode;	// already done above
+	Cams[ActiveCam].CamTargetEntity = pTargetEntity;
+	m_uiTransitionState = 1;	// these three already done above
+	m_uiTimeTransitionStart = CTimer::GetTimeInMilliseconds();
+	m_uiTransitionJUSTStarted = 1;
+	m_fStartingFOVForInterPol = Cams[ActiveCam].FOV;
+	m_cvecSourceSpeedAtStartInter = Cams[ActiveCam].m_cvecSourceSpeedOverOneFrame;
+	m_cvecTargetSpeedAtStartInter = Cams[ActiveCam].m_cvecTargetSpeedOverOneFrame;
+	m_cvecUpSpeedAtStartInter = Cams[ActiveCam].m_cvecUpOverOneFrame;
+	m_fAlphaSpeedAtStartInter = Cams[ActiveCam].m_fAlphaSpeedOverOneFrame;
+	m_fBetaSpeedAtStartInter = Cams[ActiveCam].m_fBetaSpeedOverOneFrame;
+	m_fFOVSpeedAtStartInter = Cams[ActiveCam].m_fFovSpeedOverOneFrame;
+	Cams[ActiveCam].ResetStatics = true;
+	if(m_bLookingAtPlayer){
+		if(switchPedMode)
+			m_uiTransitionDurationTargetCoors = 350;
+		else
+			m_uiTransitionDurationTargetCoors = 600;
+		m_fFractionInterToStopMovingTarget = 0.0f;
+		m_fFractionInterToStopCatchUpTarget = 1.0f;
+	}else{
+		if(m_bScriptParametersSetForInterPol){
+			m_fFractionInterToStopMoving = m_fScriptPercentageInterToStopMoving;
+			m_fFractionInterToStopCatchUp = m_fScriptPercentageInterToCatchUp;
+			m_uiTransitionDuration = m_fScriptTimeForInterPolation;
+		}
+		m_uiTransitionDurationTargetCoors = m_uiTransitionDuration;
+		m_fFractionInterToStopMovingTarget = m_fFractionInterToStopMoving;
+		m_fFractionInterToStopCatchUpTarget = m_fFractionInterToStopCatchUp;
+	}
+}
+
+void
+CCamera::StartTransitionWhenNotFinishedInter(int16 mode)
+{
+	m_vecDoingSpecialInterPolation = true;
+	StartTransition(mode);
+}
+
+void
+CCamera::StoreValuesDuringInterPol(CVector &source, CVector &target, CVector &up, float &FOV)
+{
+	SourceDuringInter = source;
+	TargetDuringInter = target;
+	UpDuringInter = up;
+	FOVDuringInter = FOV;
+	CVector Dist = source - TargetDuringInter;
+	float DistOnGround = Dist.Magnitude2D();
+	m_fBetaDuringInterPol = CGeneral::GetATanOfXY(Dist.x, Dist.y);
+	m_fAlphaDuringInterPol = CGeneral::GetATanOfXY(DistOnGround, Dist.z);
+}
+
+
+
+void
+CCamera::SetWideScreenOn(void)
+{
+	m_WideScreenOn = true;
+}
+
+void
+CCamera::SetWideScreenOff(void)
+{
+	m_bWantsToSwitchWidescreenOff = m_WideScreenOn;
+}
+
+void
+CCamera::ProcessWideScreenOn(void)
+{
+	if(m_bWantsToSwitchWidescreenOff){
+		m_bWantsToSwitchWidescreenOff = false;
+		m_WideScreenOn = false;
+		m_ScreenReductionPercentage = 0.0f;
+		m_fFOV_Wide_Screen = 0.0f;
+		m_fWideScreenReductionAmount = 0.0f;
+	}else{
+		m_fFOV_Wide_Screen = 0.3f*Cams[ActiveCam].FOV;
+		m_fWideScreenReductionAmount = 1.0f;
+		m_ScreenReductionPercentage = 30.0f;
+	}
+}
+
+void
+CCamera::DrawBordersForWideScreen(void)
+{
+	float bottom, top;
+	if (m_WideScreenOn) {
+		float borderSize = (SCREEN_HEIGHT / 2) * (m_ScreenReductionPercentage / 100.f);
+		top = borderSize - SCREEN_SCALE_Y(22.f);
+		bottom = SCREEN_HEIGHT - borderSize - SCREEN_SCALE_Y(14.f);
+	} else {
+		top = 0.f;
+		bottom = SCREEN_HEIGHT;
+	}
+
+	if(m_BlurType == MOTION_BLUR_NONE || m_BlurType == MOTION_BLUR_LIGHT_SCENE)
+		SetMotionBlurAlpha(80);
+
+	// top border
+	CSprite2d::DrawRect(CRect(0.0f, 0.0f, SCREEN_WIDTH, top), CRGBA(0, 0, 0, 255));
+
+	// bottom border
+	CSprite2d::DrawRect(CRect(0.0f, bottom, SCREEN_WIDTH, SCREEN_HEIGHT), CRGBA(0, 0, 0, 255));
+}
+
+
+
+bool
+CCamera::IsItTimeForNewcam(int32 obbeMode, int32 time)
+{
+	CVehicle *veh;
+	uint32 t = time;	// no annoying compiler warnings
+	CVector fwd;
+
+	if(obbeMode < 0)
+		return true;
+	switch(obbeMode){
+	case OBBE_WHEEL:
+		veh = FindPlayerVehicle();
+		if(veh){
+			if(veh->IsBoat() && pTargetEntity->GetModelIndex() != MI_SKIMMER)
+				return true;
+			if(veh->GetModelIndex() == MI_RHINO)
+				return true;
+			if(!CWorld::GetIsLineOfSightClear(pTargetEntity->GetPosition(), Cams[ActiveCam].Source, true, false, false, false, false, false, false))
+				return true;
+		}
+		if(CTimer::GetTimeInMilliseconds() > t+5000)
+			return true;
+		SetNearClipScript(0.6f);
+		return false;
+	case OBBE_1:
+		if(FindPlayerVehicle() && FindPlayerVehicle()->IsBoat() && pTargetEntity->GetModelIndex() != MI_SKIMMER)
+			return true;
+		if(!CWorld::GetIsLineOfSightClear(FindPlayerCoors(), m_vecFixedModeSource, true, false, false, false, false, false, false))
+			return true;
+
+		fwd = FindPlayerCoors() - m_vecFixedModeSource;
+		fwd.z = 0.0f;
+
+		// too far and driving away from cam
+		if(fwd.Magnitude() > 40.0f && DotProduct(FindPlayerSpeed(), fwd) > 0.0f)
+			return true;
+		// too close
+		if(fwd.Magnitude() < 1.6f)
+			return true;
+		return false;
+	case OBBE_2:
+		if(FindPlayerVehicle() && FindPlayerVehicle()->IsBoat() && pTargetEntity->GetModelIndex() != MI_SKIMMER)
+			return true;
+		if(!CWorld::GetIsLineOfSightClear(FindPlayerCoors(), m_vecFixedModeSource, true, false, false, false, false, false, false))
+			return true;
+
+		fwd = FindPlayerCoors() - m_vecFixedModeSource;
+		fwd.z = 0.0f;
+
+		if(fwd.Magnitude() < 2.0f)
+			// very close, fix near clip
+			SetNearClipScript(Max(fwd.Magnitude()*0.5f, 0.05f));
+		// too far and driving away from cam
+		if(fwd.Magnitude() > 29.0f && DotProduct(FindPlayerSpeed(), fwd) > 0.0f)
+			return true;
+		// too close
+		if(fwd.Magnitude() < 2.0f)
+			return true;
+		return false;
+	case OBBE_3:
+		if(!CWorld::GetIsLineOfSightClear(FindPlayerCoors(), m_vecFixedModeSource, true, false, false, false, false, false, false))
+			return true;
+
+		fwd = FindPlayerCoors() - m_vecFixedModeSource;
+		fwd.z = 0.0f;
+
+		// too far and driving away from cam
+		if(fwd.Magnitude() > 48.0f && DotProduct(FindPlayerSpeed(), fwd) > 0.0f)
+			return true;
+		return false;
+	case OBBE_1STPERSON:
+		return CTimer::GetTimeInMilliseconds() > t+3000;
+	case OBBE_5:
+		if(FindPlayerVehicle() && FindPlayerVehicle()->IsBoat() && pTargetEntity->GetModelIndex() != MI_SKIMMER)
+			return true;
+		if(!CWorld::GetIsLineOfSightClear(FindPlayerCoors(), m_vecFixedModeSource, true, false, false, false, false, false, false))
+			return true;
+
+		fwd = FindPlayerCoors() - m_vecFixedModeSource;
+		fwd.z = 0.0f;
+
+		// too far and driving away from cam
+		if(fwd.Magnitude() > 38.0f && DotProduct(FindPlayerSpeed(), fwd) > 0.0f)
+			return true;
+		return false;
+	case OBBE_ONSTRING:
+		return CTimer::GetTimeInMilliseconds() > t+3000;
+	case OBBE_COPCAR:
+		return CTimer::GetTimeInMilliseconds() > t+2000 && !FindPlayerVehicle()->GetIsOnScreen();
+	case OBBE_COPCAR_WHEEL:
+		if(FindPlayerVehicle() && FindPlayerVehicle()->IsBoat())
+			return true;
+		if(!CWorld::GetIsLineOfSightClear(pTargetEntity->GetPosition(), Cams[ActiveCam].Source, true, false, false, false, false, false, false))
+			return true;
+		if(CTimer::GetTimeInMilliseconds() > t+1000)
+			return true;
+		SetNearClipScript(0.6f);
+		return false;
+
+	// Ped modes
+	case OBBE_9:
+		if(!CWorld::GetIsLineOfSightClear(FindPlayerCoors(), m_vecFixedModeSource, true, false, false, false, false, false, false))
+			return true;
+
+		fwd = FindPlayerCoors() - m_vecFixedModeSource;
+		fwd.z = 0.0f;
+
+		// too far and driving away from cam
+		if(fwd.Magnitude() > 20.0f && DotProduct(FindPlayerSpeed(), fwd) > 0.0f)
+			return true;
+		return false;
+	case OBBE_10:
+		if(!CWorld::GetIsLineOfSightClear(FindPlayerCoors(), m_vecFixedModeSource, true, false, false, false, false, false, false))
+			return true;
+
+		fwd = FindPlayerCoors() - m_vecFixedModeSource;
+		fwd.z = 0.0f;
+
+		// too far and driving away from cam
+		if(fwd.Magnitude() > 8.0f && DotProduct(FindPlayerSpeed(), fwd) > 0.0f)
+			return true;
+		return false;
+	case OBBE_11:
+		if(!CWorld::GetIsLineOfSightClear(FindPlayerCoors(), m_vecFixedModeSource, true, false, false, false, false, false, false))
+			return true;
+
+		fwd = FindPlayerCoors() - m_vecFixedModeSource;
+		fwd.z = 0.0f;
+
+		// too far and driving away from cam
+		if(fwd.Magnitude() > 25.0f && DotProduct(FindPlayerSpeed(), fwd) > 0.0f)
+			return true;
+		return false;
+	case OBBE_12:
+		if(!CWorld::GetIsLineOfSightClear(FindPlayerCoors(), m_vecFixedModeSource, true, false, false, false, false, false, false))
+			return true;
+
+		fwd = FindPlayerCoors() - m_vecFixedModeSource;
+		fwd.z = 0.0f;
+
+		// too far and driving away from cam
+		if(fwd.Magnitude() > 8.0f && DotProduct(FindPlayerSpeed(), fwd) > 0.0f)
+			return true;
+		return false;
+	case OBBE_13:
+		return CTimer::GetTimeInMilliseconds() > t+5000;
+
+	// Heli modes
+	case OBBE_14:
+		if(FindPlayerVehicle())
+			if(!CWorld::GetIsLineOfSightClear(pTargetEntity->GetPosition(), Cams[ActiveCam].Source, true, false, false, false, false, false, false))
+				return true;
+		return CTimer::GetTimeInMilliseconds() > t+8000;
+	case OBBE_15:
+		if(FindPlayerVehicle()){
+			if(!CWorld::GetIsLineOfSightClear(FindPlayerCoors(), m_vecFixedModeSource, true, false, false, false, false, false, false))
+				return true;
+			fwd = FindPlayerCoors() - m_vecFixedModeSource;
+			fwd.z = 0.0f;
+
+			// too far and driving away from cam
+			if(fwd.Magnitude() > 44.0f && DotProduct(FindPlayerSpeed(), fwd) > 0.0f)
+				return true;
+			// too close
+			if(fwd.Magnitude() < 2.0f)
+				return true;
+		}
+		return false;
+	case OBBE_16:
+		if(FindPlayerVehicle()){
+			if(!CWorld::GetIsLineOfSightClear(FindPlayerCoors(), m_vecFixedModeSource, true, false, false, false, false, false, false))
+				return true;
+			fwd = FindPlayerCoors() - m_vecFixedModeSource;
+			fwd.z = 0.0f;
+
+			// too far and driving away from cam
+			if(fwd.Magnitude() > 50.0f && DotProduct(FindPlayerSpeed(), fwd) > 0.0f)
+				return true;
+			// too close
+			if(fwd.Magnitude() < 3.0f)
+				return true;
+		}
+		return false;
+	case OBBE_17:
+		if(FindPlayerVehicle()){
+			if(!CWorld::GetIsLineOfSightClear(FindPlayerCoors(), m_vecFixedModeSource, true, false, false, false, false, false, false))
+				return true;
+			fwd = FindPlayerCoors() - m_vecFixedModeSource;
+			fwd.z = 0.0f;
+
+			// too far
+			if(fwd.Magnitude() > 50.0f)
+				return true;
+			// too close
+			if(fwd.Magnitude() < 2.0f)
+				return true;
+		}
+		return false;
+	case OBBE_18:
+		if(FindPlayerVehicle()){
+			if(!CWorld::GetIsLineOfSightClear(FindPlayerCoors(), m_vecFixedModeSource, true, false, false, false, false, false, false))
+				return true;
+			fwd = FindPlayerCoors() - m_vecFixedModeSource;
+
+			// too far
+			if(fwd.Magnitude() > 57.0f)
+				return true;
+			// too close
+			if(fwd.Magnitude() < 1.0f)
+				return true;
+		}
+		return false;
+	case OBBE_19:
+		if(FindPlayerVehicle()){
+			if(!CWorld::GetIsLineOfSightClear(FindPlayerCoors(), m_vecFixedModeSource, true, false, false, false, false, false, false))
+				return true;
+			fwd = FindPlayerCoors() - m_vecFixedModeSource;
+			fwd.z = 0.0f;
+
+			// too far
+			if(fwd.Magnitude() > 36.0f)
+				return true;
+			// too close
+			if(fwd.Magnitude() < 2.0f)
+				return true;
+		}
+		return false;
+	case OBBE_ONSTRING_HELI:
+		return CTimer::GetTimeInMilliseconds() > t+5000;
+
+	default:
+		return false;
+	}
+}
+
+bool
+CCamera::TryToStartNewCamMode(int obbeMode)
+{
+	CVehicle *veh;
+	CVector target, camPos, playerSpeed, fwd, fwd2;
+	float angle;
+	float ground;
+	bool foundGround;
+	int i;
+
+	if(obbeMode < 0)
+		return true;
+	switch(obbeMode){
+	case OBBE_WHEEL:
+		veh = FindPlayerVehicle();
+		if(veh == nil || (veh->IsBoat() && pTargetEntity->GetModelIndex() != MI_SKIMMER) || veh->GetModelIndex() == MI_RHINO)
+			return false;
+		target = Multiply3x3(FindPlayerVehicle()->GetMatrix(), CVector(-1.4f, -2.3f, 0.3f));
+		target += FindPlayerVehicle()->GetPosition();
+		if(!CWorld::GetIsLineOfSightClear(veh->GetPosition(), target, true, false, false, false, false, false, false))
+			return false;
+		TakeControl(veh, CCam::MODE_WHEELCAM, JUMP_CUT, CAMCONTROL_OBBE);
+		return true;
+	case OBBE_1:
+		camPos = FindPlayerCoors();
+		playerSpeed = FindPlayerSpeed();
+		playerSpeed.z = 0.0f;
+		playerSpeed.Normalise();
+		camPos += 20.0f*playerSpeed;
+		camPos += 3.0f*CVector(playerSpeed.y, -playerSpeed.x, 0.0f);
+		if(FindPlayerVehicle() && FindPlayerVehicle()->IsBoat() && pTargetEntity->GetModelIndex() != MI_SKIMMER)
+			return false;
+
+		ground = CWorld::FindGroundZFor3DCoord(camPos.x, camPos.y, camPos.z+5.0f, &foundGround);
+		if(foundGround)
+			camPos.z = ground + 1.5f;
+		else{
+			ground = CWorld::FindRoofZFor3DCoord(camPos.x, camPos.y, camPos.z-5.0f, &foundGround);
+			if(foundGround)
+				camPos.z = ground + 1.5f;
+		}
+		if(!CWorld::GetIsLineOfSightClear(FindPlayerCoors(), camPos, true, false, false, false, false, false, false))
+			return false;
+
+		fwd = FindPlayerCoors() - camPos;
+		fwd.z = 0.0f;
+		// too far and driving away from cam
+		if(fwd.Magnitude() > 40.0f && DotProduct(FindPlayerSpeed(), fwd) > 0.0f)
+			return false;
+		// too close
+		if(fwd.Magnitude() < 2.5f)
+			return true;
+
+		SetCamPositionForFixedMode(camPos, CVector(0.0f, 0.0f, 0.0f));
+		TakeControl(FindPlayerEntity(), CCam::MODE_FIXED, JUMP_CUT, CAMCONTROL_OBBE);
+		return true;
+	case OBBE_2:
+		if(FindPlayerVehicle() && FindPlayerVehicle()->IsBoat() && pTargetEntity->GetModelIndex() != MI_SKIMMER)
+			return false;
+		camPos = FindPlayerCoors();
+		playerSpeed = FindPlayerSpeed();
+		playerSpeed.z = 0.0f;
+		playerSpeed.Normalise();
+		camPos += 16.0f*playerSpeed;
+		camPos += 2.5f*CVector(playerSpeed.y, -playerSpeed.x, 0.0f);
+
+		ground = CWorld::FindGroundZFor3DCoord(camPos.x, camPos.y, camPos.z+5.0f, &foundGround);
+		if(foundGround)
+			camPos.z = ground + 0.5f;
+		else{
+			ground = CWorld::FindRoofZFor3DCoord(camPos.x, camPos.y, camPos.z-5.0f, &foundGround);
+			if(foundGround)
+				camPos.z = ground + 0.5f;
+		}
+		if(!CWorld::GetIsLineOfSightClear(FindPlayerCoors(), camPos, true, false, false, false, false, false, false))
+			return false;
+
+		fwd = FindPlayerCoors() - camPos;
+		fwd.z = 0.0f;
+		// too far and driving away from cam
+		if(fwd.Magnitude() > 29.0f && DotProduct(FindPlayerSpeed(), fwd) > 0.0f)
+			return false;
+		// too close
+		if(fwd.Magnitude() < 2.0f)
+			return true;
+
+		SetCamPositionForFixedMode(camPos, CVector(0.0f, 0.0f, 0.0f));
+		TakeControl(FindPlayerEntity(), CCam::MODE_FIXED, JUMP_CUT, CAMCONTROL_OBBE);
+		return true;
+	case OBBE_3:
+		camPos = FindPlayerCoors();
+		playerSpeed = FindPlayerSpeed();
+		playerSpeed.z = 0.0f;
+		playerSpeed.Normalise();
+		camPos += 30.0f*playerSpeed;
+		camPos += 8.0f*CVector(playerSpeed.y, -playerSpeed.x, 0.0f);
+
+		if(!CWorld::GetIsLineOfSightClear(FindPlayerCoors(), camPos, true, false, false, false, false, false, false))
+			return false;
+
+		SetCamPositionForFixedMode(camPos, CVector(0.0f, 0.0f, 0.0f));
+		TakeControl(FindPlayerEntity(), CCam::MODE_FIXED, JUMP_CUT, CAMCONTROL_OBBE);
+		return true;
+	case OBBE_1STPERSON:
+		TakeControl(FindPlayerEntity(), CCam::MODE_FIXED, JUMP_CUT, CAMCONTROL_OBBE);
+		return true;
+	case OBBE_5:
+		camPos = FindPlayerCoors();
+		playerSpeed = FindPlayerSpeed();
+		playerSpeed.z = 0.0f;
+		playerSpeed.Normalise();
+		camPos += 30.0f*playerSpeed;
+		camPos += 6.0f*CVector(playerSpeed.y, -playerSpeed.x, 0.0f);
+
+		ground = CWorld::FindGroundZFor3DCoord(camPos.x, camPos.y, camPos.z+5.0f, &foundGround);
+		if(foundGround)
+			camPos.z = ground + 3.5f;
+		else{
+			ground = CWorld::FindRoofZFor3DCoord(camPos.x, camPos.y, camPos.z-5.0f, &foundGround);
+			if(foundGround)
+				camPos.z = ground + 3.5f;
+		}
+		if(!CWorld::GetIsLineOfSightClear(FindPlayerCoors(), camPos, true, false, false, false, false, false, false))
+			return false;
+
+		SetCamPositionForFixedMode(camPos, CVector(0.0f, 0.0f, 0.0f));
+		TakeControl(FindPlayerEntity(), CCam::MODE_FIXED, JUMP_CUT, CAMCONTROL_OBBE);
+		return true;
+	case OBBE_ONSTRING:
+		TakeControl(FindPlayerEntity(), CCam::MODE_CAM_ON_A_STRING, JUMP_CUT, CAMCONTROL_OBBE);
+		return true;
+	case OBBE_COPCAR:
+#ifdef FIX_BUGS
+		if (CReplay::IsPlayingBack())
+			return false;
+#endif
+		if(FindPlayerPed()->m_pWanted->GetWantedLevel() < 1)
+			return false;
+		if(FindPlayerVehicle() == nil)
+			return false;
+		if(FindPlayerVehicle() && FindPlayerVehicle()->IsBoat() && pTargetEntity->GetModelIndex() != MI_SKIMMER)
+			return false;
+		i = CPools::GetVehiclePool()->GetSize();
+		while(--i >= 0){
+			veh = CPools::GetVehiclePool()->GetSlot(i);
+			if(veh && veh->IsCar() && veh != FindPlayerVehicle() && veh->bIsLawEnforcer){
+				float dx = veh->GetPosition().x - FindPlayerCoors().x;
+				float dy = veh->GetPosition().y - FindPlayerCoors().y;
+				float dist = (veh->GetPosition() - FindPlayerCoors()).Magnitude();
+				if(dist < 30.0f){
+					if(dx*FindPlayerVehicle()->GetForward().x + dy*FindPlayerVehicle()->GetForward().y < 0.0f &&
+					   veh->GetForward().x*FindPlayerVehicle()->GetForward().x + veh->GetForward().y*FindPlayerVehicle()->GetForward().y > 0.8f){
+						TakeControl(veh, CCam::MODE_CAM_ON_A_STRING, JUMP_CUT, CAMCONTROL_OBBE);
+						return true;
+					}
+				}
+			}
+		}
+		return false;
+	case OBBE_COPCAR_WHEEL:
+#ifdef FIX_BUGS
+		if (CReplay::IsPlayingBack())
+			return false;
+#endif
+		if(FindPlayerPed()->m_pWanted->GetWantedLevel() < 1)
+			return false;
+		if(FindPlayerVehicle() == nil)
+			return false;
+		if(FindPlayerVehicle() && FindPlayerVehicle()->IsBoat() && pTargetEntity->GetModelIndex() != MI_SKIMMER)
+			return false;
+		i = CPools::GetVehiclePool()->GetSize();
+		while(--i >= 0){
+			veh = CPools::GetVehiclePool()->GetSlot(i);
+			if(veh && veh->IsCar() && veh != FindPlayerVehicle() && veh->bIsLawEnforcer){
+				float dx = veh->GetPosition().x - FindPlayerCoors().x;
+				float dy = veh->GetPosition().y - FindPlayerCoors().y;
+				float dist = (veh->GetPosition() - FindPlayerCoors()).Magnitude();
+				if(dist < 30.0f){
+					if(dx*FindPlayerVehicle()->GetForward().x + dy*FindPlayerVehicle()->GetForward().y < 0.0f &&
+					   veh->GetForward().x*FindPlayerVehicle()->GetForward().x + veh->GetForward().y*FindPlayerVehicle()->GetForward().y > 0.8f){
+						target = Multiply3x3(veh->GetMatrix(), CVector(-1.4f, -2.3f, 0.3f));
+						target += veh->GetPosition();
+						if(!CWorld::GetIsLineOfSightClear(veh->GetPosition(), target, true, false, false, false, false, false, false))
+							return false;
+						TakeControl(veh, CCam::MODE_WHEELCAM, JUMP_CUT, CAMCONTROL_OBBE);
+						return true;
+					}
+				}
+			}
+		}
+		return false;
+
+	case OBBE_9:
+		camPos = FindPlayerCoors();
+		playerSpeed = FindPlayerSpeed();
+		playerSpeed.z = 0.0f;
+		playerSpeed.Normalise();
+		camPos += 15.0f*playerSpeed;
+		camPos += CVector(2.0f, 1.0f, 0.0f);
+
+		ground = CWorld::FindGroundZFor3DCoord(camPos.x, camPos.y, camPos.z+5.0f, &foundGround);
+		if(foundGround)
+			camPos.z = ground + 0.5f;
+		else{
+			ground = CWorld::FindRoofZFor3DCoord(camPos.x, camPos.y, camPos.z-5.0f, &foundGround);
+			if(foundGround)
+				camPos.z = ground + 0.5f;
+		}
+		if(!CWorld::GetIsLineOfSightClear(FindPlayerCoors(), camPos, true, false, false, false, false, false, false))
+			return false;
+
+		SetCamPositionForFixedMode(camPos, CVector(0.0f, 0.0f, 0.0f));
+		TakeControl(FindPlayerEntity(), CCam::MODE_FIXED, JUMP_CUT, CAMCONTROL_OBBE);
+		return true;
+	case OBBE_10:
+		camPos = FindPlayerCoors();
+		playerSpeed = FindPlayerSpeed();
+		playerSpeed.z = 0.0f;
+		playerSpeed.Normalise();
+		camPos += 5.0f*playerSpeed;
+		camPos += CVector(2.0f, 1.0f, 0.5f);
+
+		if(!CWorld::GetIsLineOfSightClear(FindPlayerCoors(), camPos, true, false, false, false, false, false, false))
+			return false;
+
+		SetCamPositionForFixedMode(camPos, CVector(0.0f, 0.0f, 0.0f));
+		TakeControl(FindPlayerEntity(), CCam::MODE_FIXED, JUMP_CUT, CAMCONTROL_OBBE);
+		return true;
+	case OBBE_11:
+		camPos = FindPlayerCoors();
+		playerSpeed = FindPlayerSpeed();
+		playerSpeed.z = 0.0f;
+		playerSpeed.Normalise();
+		camPos += 20.0f*playerSpeed;
+		camPos += CVector(2.0f, 1.0f, 20.0f);
+
+		if(!CWorld::GetIsLineOfSightClear(FindPlayerCoors(), camPos, true, false, false, false, false, false, false))
+			return false;
+
+		SetCamPositionForFixedMode(camPos, CVector(0.0f, 0.0f, 0.0f));
+		TakeControl(FindPlayerEntity(), CCam::MODE_FIXED, JUMP_CUT, CAMCONTROL_OBBE);
+		return true;
+	case OBBE_12:
+		camPos = FindPlayerCoors();
+		playerSpeed = FindPlayerSpeed();
+		playerSpeed.z = 0.0f;
+		playerSpeed.Normalise();
+		camPos += 5.0f*playerSpeed;
+		camPos += CVector(2.0f, 1.0f, 10.5f);
+
+		if(!CWorld::GetIsLineOfSightClear(FindPlayerCoors(), camPos, true, false, false, false, false, false, false))
+			return false;
+
+		SetCamPositionForFixedMode(camPos, CVector(0.0f, 0.0f, 0.0f));
+		TakeControl(FindPlayerEntity(), CCam::MODE_FIXED, JUMP_CUT, CAMCONTROL_OBBE);
+		return true;
+	case OBBE_13:
+#ifdef FIX_BUGS
+		TakeControl(FindPlayerEntity(), CCam::MODE_TOP_DOWN_PED, JUMP_CUT, CAMCONTROL_OBBE);
+#else
+		TakeControl(FindPlayerEntity(), CCam::MODE_TOPDOWN, JUMP_CUT, CAMCONTROL_OBBE);
+#endif
+		return true;
+
+	// Heli modes
+	case OBBE_14:
+		veh = FindPlayerVehicle();
+		if(veh == nil)
+			return false;
+		target = Multiply3x3(FindPlayerVehicle()->GetMatrix(), CVector(-1.4f, -2.3f, 0.3f));
+		target += FindPlayerVehicle()->GetPosition();
+		if(!veh->IsBoat() && !CWorld::GetIsLineOfSightClear(veh->GetPosition(), target, true, false, false, false, false, false, false))
+			return false;
+		TakeControl(veh, CCam::MODE_WHEELCAM, JUMP_CUT, CAMCONTROL_OBBE);
+		return true;
+	case OBBE_15:
+		if(FindPlayerVehicle() == nil)
+			return false;
+		camPos = FindPlayerCoors();
+		playerSpeed = FindPlayerSpeed();
+		playerSpeed.z = 0.0f;
+		playerSpeed.Normalise();
+		camPos += 34.0f*playerSpeed;
+		camPos.z = FindPlayerCoors().z + 0.5f;
+		if(FindPlayerVehicle()->IsBoat())
+			camPos.z += 1.0f;
+
+		if(!CWorld::GetIsLineOfSightClear(FindPlayerCoors(), camPos, true, false, false, false, false, false, false))
+			return false;
+
+		fwd = FindPlayerCoors() - camPos;
+		fwd2 = FindPlayerCoors() - camPos;
+		fwd2.z = 0.0f;
+		// too far and driving away from cam
+		if(fwd.Magnitude() > 44.0f && DotProduct(FindPlayerSpeed(), fwd2) > 0.0f)
+			return false;
+		// too close
+		if(fwd.Magnitude() < 3.0f)
+			return true;
+
+		SetCamPositionForFixedMode(camPos, CVector(0.0f, 0.0f, 0.0f));
+		TakeControl(FindPlayerEntity(), CCam::MODE_FIXED, JUMP_CUT, CAMCONTROL_OBBE);
+		return true;
+	case OBBE_16:
+		if(FindPlayerVehicle() == nil)
+			return false;
+		camPos = FindPlayerCoors();
+		playerSpeed = FindPlayerSpeed();
+		playerSpeed.z = 0.0f;
+		playerSpeed.Normalise();
+		angle = CGeneral::GetATanOfXY(playerSpeed.x, playerSpeed.y) + DEGTORAD(60.0f);
+		playerSpeed += CVector(Cos(angle), Sin(angle), 0.0f);
+		playerSpeed.Normalise();
+		camPos += 30.0f*playerSpeed;
+		camPos.z = FindPlayerCoors().z - 5.5f;
+
+		foundGround = false;
+		ground = CWorld::FindRoofZFor3DCoord(camPos.x, camPos.y, camPos.z+5.0f, &foundGround);
+		if(foundGround)
+			camPos.z = ground + 0.5f;
+		else if(CWaterLevel::GetWaterLevelNoWaves(camPos.x, camPos.y, camPos.z, &ground)){
+			float waterOffset = 1.0f;
+			if(FindPlayerVehicle() && FindPlayerVehicle()->IsBoat())
+				waterOffset = -2.0f;
+			if(camPos.z < ground + waterOffset)
+				camPos.z = ground + waterOffset;
+		}
+		if(!CWorld::GetIsLineOfSightClear(FindPlayerCoors(), camPos, true, false, false, false, false, false, false))
+			return false;
+
+		fwd = FindPlayerCoors() - camPos;
+		// too far
+		if(fwd.Magnitude() > 50.0f)
+			return false;
+		// too close
+		if(fwd.Magnitude() < 3.0f)
+			return true;
+
+		SetCamPositionForFixedMode(camPos, CVector(0.0f, 0.0f, 0.0f));
+		TakeControl(FindPlayerEntity(), CCam::MODE_FIXED, JUMP_CUT, CAMCONTROL_OBBE);
+		return true;
+	case OBBE_17:
+		if(FindPlayerVehicle() == nil)
+			return false;
+		camPos = FindPlayerCoors();
+		playerSpeed = FindPlayerSpeed();
+		playerSpeed.z = 0.0f;
+		playerSpeed.Normalise();
+		angle = CGeneral::GetATanOfXY(playerSpeed.x, playerSpeed.y) + DEGTORAD(190.0f);
+		playerSpeed += CVector(Cos(angle), Sin(angle), 0.0f);
+		playerSpeed.Normalise();
+		camPos += 25.0f*playerSpeed;
+		camPos.z = FindPlayerCoors().z - 1.0f;
+
+		foundGround = false;
+		ground = CWorld::FindRoofZFor3DCoord(camPos.x, camPos.y, camPos.z+5.0f, &foundGround);
+		if(foundGround)
+			camPos.z = ground + 0.5f;
+		else if(CWaterLevel::GetWaterLevelNoWaves(camPos.x, camPos.y, camPos.z, &ground)){
+			float waterOffset = 1.0f;
+			if(FindPlayerVehicle() && FindPlayerVehicle()->IsBoat())
+				waterOffset = -2.0f;
+			if(camPos.z < ground + waterOffset)
+				camPos.z = ground + waterOffset;
+		}
+		if(!CWorld::GetIsLineOfSightClear(FindPlayerCoors(), camPos, true, false, false, false, false, false, false))
+			return false;
+
+		fwd = FindPlayerCoors() - camPos;
+		fwd2 = FindPlayerCoors() - camPos;
+		fwd2.z = 0.0f;
+		// too far and driving away from cam
+		if(fwd.Magnitude() > 50.0f && DotProduct(FindPlayerSpeed(), fwd2) > 0.0f)
+			return false;
+		// too close
+		if(fwd.Magnitude() < 2.0f)
+			return true;
+
+		SetCamPositionForFixedMode(camPos, CVector(0.0f, 0.0f, 0.0f));
+		TakeControl(FindPlayerEntity(), CCam::MODE_FIXED, JUMP_CUT, CAMCONTROL_OBBE);
+		return true;
+	case OBBE_18:
+		camPos = FindPlayerCoors();
+		if(FindPlayerVehicle() && FindPlayerVehicle()->IsBoat())
+			camPos.z += 23.0f;
+		else
+			camPos.z -= 23.0f;
+		playerSpeed = FindPlayerSpeed();
+		angle = CGeneral::GetATanOfXY(playerSpeed.x, playerSpeed.y) + DEGTORAD(145.0f);
+		playerSpeed += CVector(Cos(angle), Sin(angle), 0.0f);
+		playerSpeed.Normalise();
+		camPos += 15.0f*playerSpeed;
+
+		foundGround = false;
+		ground = CWorld::FindGroundZFor3DCoord(camPos.x, camPos.y, camPos.z+5.0f, &foundGround);
+#ifdef FIX_BUGS
+		if(foundGround)
+#else
+		if(ground == true)
+#endif
+		{
+			if(camPos.z < ground)
+				camPos.z = ground + 0.5f;
+		}else if(CWaterLevel::GetWaterLevelNoWaves(camPos.x, camPos.y, camPos.z, &ground)){
+			float waterOffset = 1.0f;
+			if(FindPlayerVehicle() && FindPlayerVehicle()->IsBoat())
+				waterOffset = -2.0f;
+			if(camPos.z < ground + waterOffset)
+				camPos.z = ground + waterOffset;
+		}
+		if(!CWorld::GetIsLineOfSightClear(FindPlayerCoors(), camPos, true, false, false, false, false, false, false))
+			return false;
+
+		fwd = FindPlayerCoors() - camPos;
+		// too far
+		if(fwd.Magnitude() > 57.0f)
+			return false;
+		// too close
+		if(fwd.Magnitude() < 1.0f)
+			return true;
+
+		SetCamPositionForFixedMode(camPos, CVector(0.0f, 0.0f, 0.0f));
+		TakeControl(FindPlayerEntity(), CCam::MODE_FIXED, JUMP_CUT, CAMCONTROL_OBBE);
+		return true;
+	case OBBE_19:
+		camPos = FindPlayerCoors();
+		if(FindPlayerVehicle() && FindPlayerVehicle()->IsBoat())
+			camPos.z += 4.0f;
+		else
+			camPos.z -= 1.0f;
+		playerSpeed = FindPlayerSpeed();
+		angle = CGeneral::GetATanOfXY(playerSpeed.x, playerSpeed.y) + DEGTORAD(28.0f);
+		playerSpeed += CVector(Cos(angle), Sin(angle), 0.0f);
+		playerSpeed.Normalise();
+		camPos += 12.5f*playerSpeed;
+
+		foundGround = false;
+		ground = CWorld::FindGroundZFor3DCoord(camPos.x, camPos.y, camPos.z+5.0f, &foundGround);
+#ifdef FIX_BUGS
+		if(foundGround)
+#else
+		if(ground == true)
+#endif
+		{
+			if(camPos.z < ground)
+				camPos.z = ground + 0.5f;
+		}else if(CWaterLevel::GetWaterLevelNoWaves(camPos.x, camPos.y, camPos.z, &ground)){
+			float waterOffset = 1.0f;
+			if(FindPlayerVehicle() && FindPlayerVehicle()->IsBoat())
+				waterOffset = -2.0f;
+			if(camPos.z < ground + waterOffset)
+				camPos.z = ground + waterOffset;
+		}
+		if(!CWorld::GetIsLineOfSightClear(FindPlayerCoors(), camPos, true, false, false, false, false, false, false))
+			return false;
+
+		fwd = FindPlayerCoors() - camPos;
+		// too far
+		if(fwd.Magnitude() > 36.0f)
+			return false;
+		// too close
+		if(fwd.Magnitude() < 2.0f)
+			return true;
+
+		SetCamPositionForFixedMode(camPos, CVector(0.0f, 0.0f, 0.0f));
+		TakeControl(FindPlayerEntity(), CCam::MODE_FIXED, JUMP_CUT, CAMCONTROL_OBBE);
+		return true;
+	case OBBE_ONSTRING_HELI:
+		TakeControl(FindPlayerEntity(), CCam::MODE_CAM_ON_A_STRING, JUMP_CUT, CAMCONTROL_OBBE);
+		return true;
+	default:
+		return false;
+	}
+}
+
+int32 SequenceOfCarCams[16] = {
+	OBBE_WHEEL, OBBE_COPCAR, OBBE_3, OBBE_1, OBBE_3, OBBE_COPCAR_WHEEL,
+	OBBE_2, OBBE_3, OBBE_COPCAR_WHEEL, OBBE_COPCAR, OBBE_2, OBBE_3,
+	OBBE_5, OBBE_3,
+	OBBE_ONSTRING	// actually unused...
+};
+
+void
+CCamera::ProcessObbeCinemaCameraCar(void)
+{
+	static int OldMode = -1;
+	static int32 TimeForNext = 0;
+	int i = 0;
+
+	if(!bDidWeProcessAnyCinemaCam){
+		OldMode = -1;
+		bSwitchedToObbeCam = true;
+	}
+
+	if(!bDidWeProcessAnyCinemaCam || IsItTimeForNewcam(SequenceOfCarCams[OldMode], TimeForNext)){
+		// This is very strange code...
+		for(OldMode = (OldMode+1) % 14;
+		    !TryToStartNewCamMode(SequenceOfCarCams[OldMode]) && i <= 14;
+		    OldMode = (OldMode+1) % 14)
+			i++;
+		TimeForNext = CTimer::GetTimeInMilliseconds();
+		if(i >= 14){
+			OldMode = 14;
+			TryToStartNewCamMode(SequenceOfCarCams[14]);
+		}
+	}
+
+	m_iModeObbeCamIsInForCar = OldMode;
+	bDidWeProcessAnyCinemaCam = true;
+}
+
+int32 SequenceOfHeliCams[6] = { OBBE_14, OBBE_15, OBBE_16, OBBE_17, OBBE_18, OBBE_19 };
+
+void
+CCamera::ProcessObbeCinemaCameraHeli(void)
+{
+	static int OldMode = -1;
+	static int32 TimeForNext = 0;
+	int i = 0;
+
+	if(!bDidWeProcessAnyCinemaCam){
+		OldMode = -1;
+		bSwitchedToObbeCam = true;
+	}
+
+	if(!bDidWeProcessAnyCinemaCam || IsItTimeForNewcam(SequenceOfHeliCams[OldMode], TimeForNext)){
+		// This is very strange code...
+		for(OldMode = (OldMode+1) % 6;
+		    !TryToStartNewCamMode(SequenceOfCarCams[OldMode]) && i <= 6;
+		    OldMode = (OldMode+1) % 6)
+			i++;
+		if(i >= 6){
+			OldMode = 6;
+			if(Cams[ActiveCam].Mode != CCam::MODE_CAM_ON_A_STRING){
+				TryToStartNewCamMode(OBBE_ONSTRING_HELI);
+				TimeForNext = CTimer::GetTimeInMilliseconds();
+			}
+		}else
+			TimeForNext = CTimer::GetTimeInMilliseconds();
+	}
+
+	m_iModeObbeCamIsInForCar = OldMode;
+	bDidWeProcessAnyCinemaCam = true;
+}
+
+int32 SequenceOfPedCams[5] = { OBBE_9, OBBE_10, OBBE_11, OBBE_12, OBBE_13 };
+
+void
+CCamera::ProcessObbeCinemaCameraPed(void)
+{
+	// static bool bObbePedProcessed = false;	// unused
+	static int PedOldMode = -1;
+	static int32 PedTimeForNext = 0;
+
+	if(!bDidWeProcessAnyCinemaCam)
+		PedOldMode = -1;
+
+	if(!bDidWeProcessAnyCinemaCam || IsItTimeForNewcam(SequenceOfPedCams[PedOldMode], PedTimeForNext)){
+		for(PedOldMode = (PedOldMode+1) % 5;
+		    !TryToStartNewCamMode(SequenceOfPedCams[PedOldMode]);
+		    PedOldMode = (PedOldMode+1) % 5);
+		PedTimeForNext = CTimer::GetTimeInMilliseconds();
+	}
+	bDidWeProcessAnyCinemaCam = true;
+}
+
+void
+CCamera::DontProcessObbeCinemaCamera(void)
+{
+	bDidWeProcessAnyCinemaCam = false;
+}
+
+#ifdef GTA_TRAIN
+void
+CCamera::LoadTrainCamNodes(char const *name)
+{
+	CFileMgr::SetDir("data");
+
+	char token[16] = { 0 };
+	char filename[16] = { 0 };
+	uint8 *buf;
+	ssize_t bufpos = 0;
+	int field = 0;
+	int tokpos = 0;
+	char c;
+	int i;
+	ssize_t len;
+
+	strcpy(filename, name);
+	len = (int)strlen(filename);
+	filename[len] = '.';
+	filename[len+1] = 'd';
+	filename[len+2] = 'a';
+	filename[len+3] = 't';
+
+	m_uiNumberOfTrainCamNodes = 0;
+
+	buf = new uint8[20000];
+	len = CFileMgr::LoadFile(filename, buf, 20000, "r");
+
+	for(i = 0; i < MAX_NUM_OF_NODES; i++){
+		m_arrTrainCamNode[i].m_cvecPointToLookAt = CVector(0.0f, 0.0f, 0.0f);
+		m_arrTrainCamNode[i].m_cvecMinPointInRange = CVector(0.0f, 0.0f, 0.0f);
+		m_arrTrainCamNode[i].m_cvecMaxPointInRange = CVector(0.0f, 0.0f, 0.0f);
+		m_arrTrainCamNode[i].m_fDesiredFOV = 0.0f;
+		m_arrTrainCamNode[i].m_fNearClip = 0.0f;
+	}
+
+	while(bufpos <= len){
+		c = buf[bufpos];
+		switch(c){
+		case '-':
+		case '.':
+		case '0': case '1': case '2': case '3': case '4':
+		case '5': case '6': case '7': case '8': case '9':
+//		case '10': case '11': case '12': case '13':	// ahem...
+			token[tokpos++] = c;
+			bufpos++;
+			break;
+
+		case ',':
+		case ';':	// game has the code for this duplicated but we handle both under the same case
+			switch((field+14)%14){
+			case 0:
+				m_arrTrainCamNode[m_uiNumberOfTrainCamNodes].m_cvecCamPosition.x = atof(token);
+				break;
+			case 1:
+				m_arrTrainCamNode[m_uiNumberOfTrainCamNodes].m_cvecCamPosition.y = atof(token);
+				break;
+			case 2:
+				m_arrTrainCamNode[m_uiNumberOfTrainCamNodes].m_cvecCamPosition.z = atof(token);
+				break;
+			case 3:
+				m_arrTrainCamNode[m_uiNumberOfTrainCamNodes].m_cvecPointToLookAt.x = atof(token);
+				break;
+			case 4:
+				m_arrTrainCamNode[m_uiNumberOfTrainCamNodes].m_cvecPointToLookAt.y = atof(token);
+				break;
+			case 5:
+				m_arrTrainCamNode[m_uiNumberOfTrainCamNodes].m_cvecPointToLookAt.z = atof(token);
+				break;
+			case 6:
+				m_arrTrainCamNode[m_uiNumberOfTrainCamNodes].m_cvecMinPointInRange.x = atof(token);
+				break;
+			case 7:
+				m_arrTrainCamNode[m_uiNumberOfTrainCamNodes].m_cvecMinPointInRange.y = atof(token);
+				break;
+			case 8:
+				m_arrTrainCamNode[m_uiNumberOfTrainCamNodes].m_cvecMinPointInRange.z = atof(token);
+				break;
+			case 9:
+				m_arrTrainCamNode[m_uiNumberOfTrainCamNodes].m_cvecMaxPointInRange.x = atof(token);
+				break;
+			case 10:
+				m_arrTrainCamNode[m_uiNumberOfTrainCamNodes].m_cvecMaxPointInRange.y = atof(token);
+				break;
+			case 11:
+				m_arrTrainCamNode[m_uiNumberOfTrainCamNodes].m_cvecMaxPointInRange.z = atof(token);
+				break;
+			case 12:
+				m_arrTrainCamNode[m_uiNumberOfTrainCamNodes].m_fDesiredFOV = atof(token);
+				break;
+			case 13:
+				m_arrTrainCamNode[m_uiNumberOfTrainCamNodes].m_fNearClip = atof(token);
+				m_uiNumberOfTrainCamNodes++;
+				break;
+			}
+			field++;
+			bufpos++;
+			memset(token, 0, sizeof(token));
+			tokpos = 0;
+			break;
+
+		default:
+			bufpos++;
+			break;
+		}
+	}
+
+	delete[] buf;
+	CFileMgr::SetDir("");
+}
+
+void
+CCamera::Process_Train_Camera_Control(void)
+{
+	bool found = false;
+	CTrain *target = (CTrain*)pTargetEntity;
+	m_bUseSpecialFovTrain = true;
+	static bool OKtoGoBackToNodeCam = true;	// only ever set to true
+	uint32 i;
+
+	if(target->m_nTrackId == TRACK_ELTRAIN && !m_bAboveGroundTrainNodesLoaded){
+		m_bAboveGroundTrainNodesLoaded = true;
+		m_bBelowGroundTrainNodesLoaded = false;
+		LoadTrainCamNodes("Train");
+		m_uiTimeLastChange = CTimer::GetTimeInMilliseconds();
+		OKtoGoBackToNodeCam = true;
+		m_iCurrentTrainCamNode = 0;
+	}
+	if(target->m_nTrackId == TRACK_SUBWAY && !m_bBelowGroundTrainNodesLoaded){
+		m_bBelowGroundTrainNodesLoaded = true;
+		m_bAboveGroundTrainNodesLoaded = false;
+		LoadTrainCamNodes("Train2");
+		m_uiTimeLastChange = CTimer::GetTimeInMilliseconds();
+		OKtoGoBackToNodeCam = true;
+		m_iCurrentTrainCamNode = 0;
+	}
+
+	m_bTargetJustBeenOnTrain = true;
+	uint32 node = m_iCurrentTrainCamNode;
+	for(i = 0; i < m_uiNumberOfTrainCamNodes && !found; i++){
+		if(target->IsWithinArea(m_arrTrainCamNode[node].m_cvecMinPointInRange.x,
+		                        m_arrTrainCamNode[node].m_cvecMinPointInRange.y,
+		                        m_arrTrainCamNode[node].m_cvecMinPointInRange.z,
+		                        m_arrTrainCamNode[node].m_cvecMaxPointInRange.x,
+		                        m_arrTrainCamNode[node].m_cvecMaxPointInRange.y,
+		                        m_arrTrainCamNode[node].m_cvecMaxPointInRange.z)){
+			m_iCurrentTrainCamNode = node;
+			found = true;
+		}
+		node++;
+		if(node >= m_uiNumberOfTrainCamNodes)
+			node = 0;
+	}
+#ifdef FIX_BUGS
+	// Not really a bug but be nice and respect the debug mode
+	if(DebugCamMode){
+		TakeControl(target, DebugCamMode, JUMP_CUT, CAMCONTROL_SCRIPT);
+		return;
+	}
+#endif
+
+	if(found){
+		SetWideScreenOn();
+		if(DotProduct(((CTrain*)pTargetEntity)->GetMoveSpeed(), pTargetEntity->GetForward()) < 0.001f){
+			TakeControl(FindPlayerPed(), CCam::MODE_FOLLOWPED, JUMP_CUT, CAMCONTROL_SCRIPT);
+			if(target->Doors[0].IsFullyOpen())
+				SetWideScreenOff();
+		}else{
+			SetCamPositionForFixedMode(m_arrTrainCamNode[m_iCurrentTrainCamNode].m_cvecCamPosition, CVector(0.0f, 0.0f, 0.0f));
+			if(m_arrTrainCamNode[m_iCurrentTrainCamNode].m_cvecPointToLookAt.x == 999.0f &&
+			   m_arrTrainCamNode[m_iCurrentTrainCamNode].m_cvecPointToLookAt.y == 999.0f &&
+			   m_arrTrainCamNode[m_iCurrentTrainCamNode].m_cvecPointToLookAt.z == 999.0f)
+				TakeControl(target, CCam::MODE_FIXED, JUMP_CUT, CAMCONTROL_SCRIPT);
+			else
+				TakeControlNoEntity(m_arrTrainCamNode[m_iCurrentTrainCamNode].m_cvecPointToLookAt, JUMP_CUT, CAMCONTROL_SCRIPT);
+			RwCameraSetNearClipPlane(Scene.camera, m_arrTrainCamNode[m_iCurrentTrainCamNode].m_fNearClip);
+		}
+	}else{
+		if(DotProduct(((CTrain*)pTargetEntity)->GetMoveSpeed(), pTargetEntity->GetForward()) < 0.001f){
+			TakeControl(FindPlayerPed(), CCam::MODE_FOLLOWPED, JUMP_CUT, CAMCONTROL_SCRIPT);
+			if(target->Doors[0].IsFullyOpen())
+				SetWideScreenOff();
+		}
+	}
+}
+#endif
+
+
+void
+CCamera::LoadPathSplines(int file)
+{
+	bool reading = true;
+	char c, token[32] = { 0 };
+	int i, j, n;
+
+	n = 0;
+
+	DeleteCutSceneCamDataMemory();
+	for(i = 0; i < MAX_NUM_OF_SPLINETYPES; i++)
+		m_arrPathArray[i].m_arr_PathData = new float[CCamPathSplines::MAXPATHLENGTH];
+
+//	Why is this gone?
+//	for(i = 0; i < MAX_NUM_OF_SPLINETYPES; i++)
+//		for(j = 0; j < CCamPathSplines::MAXPATHLENGTH; j++)
+//			m_arrPathArray[i].m_arr_PathData[j] = 0.0f;
+
+	m_bStartingSpline = false;
+
+	i = 0;
+	j = 0;
+	while(reading){
+		CFileMgr::Read(file, &c, 1);
+		switch(c){
+		case '\0':
+			reading = false;
+			break;
+
+		case '+': case '-': case '.':
+		case '0': case '1': case '2': case '3': case '4':
+		case '5': case '6': case '7': case '8': case '9':
+		case 'e': case 'E':
+			token[n++] = c;
+			break;
+
+		case ',':
+#ifdef FIX_BUGS
+			if(i < MAX_NUM_OF_SPLINETYPES && j < CCamPathSplines::MAXPATHLENGTH)
+#endif
+			m_arrPathArray[i].m_arr_PathData[j] = atof(token);
+			j++;
+			memset(token, 0, 32);
+			n = 0;
+			break;
+
+		case ';':
+#ifdef FIX_BUGS
+			if(i < MAX_NUM_OF_SPLINETYPES && j < CCamPathSplines::MAXPATHLENGTH)
+#endif
+			m_arrPathArray[i].m_arr_PathData[j] = atof(token);
+			i++;
+			j = 0;
+			if (i == MAX_NUM_OF_SPLINETYPES)
+				reading = false;
+			memset(token, 0, 32);
+			n = 0;
+		}
+	}
+}
+
+void
+CCamera::DeleteCutSceneCamDataMemory(void)
+{
+	int i;
+	for(i = 0; i < MAX_NUM_OF_SPLINETYPES; i++)
+		if(m_arrPathArray[i].m_arr_PathData){
+			delete[] m_arrPathArray[i].m_arr_PathData;
+			m_arrPathArray[i].m_arr_PathData = nil;
+		}
+}
+
+void
+CCamera::FinishCutscene(void)
+{
+	SetPercentAlongCutScene(100.0f);
+	m_fPositionAlongSpline = 1.0f;
+	m_bcutsceneFinished = true;
+}
+
+uint32
+CCamera::GetCutSceneFinishTime(void)
+{
+	int cam = ActiveCam;
+	if (Cams[cam].Mode == CCam::MODE_FLYBY)
+		return Cams[cam].m_uiFinishTime;
+	cam = (cam + 1) % 2;
+	if (Cams[cam].Mode == CCam::MODE_FLYBY)
+		return Cams[cam].m_uiFinishTime;
+
+	return 0;
+}
+
+void
+CCamera::SetCamCutSceneOffSet(const CVector &pos)
+{
+	m_vecCutSceneOffset = pos;
+};
+
+void
+CCamera::SetPercentAlongCutScene(float percent)
+{
+	if(Cams[ActiveCam].Mode == CCam::MODE_FLYBY)
+		Cams[ActiveCam].m_fTimeElapsedFloat = percent/100.0f * Cams[ActiveCam].m_uiFinishTime;
+	else if(Cams[(ActiveCam+1)%2].Mode == CCam::MODE_FLYBY)
+		Cams[(ActiveCam+1)%2].m_fTimeElapsedFloat = percent/100.0f * Cams[(ActiveCam+1)%2].m_uiFinishTime;
+}
+
+void
+CCamera::SetParametersForScriptInterpolation(float stopMoving, float catchUp, int32 time)
+{
+	m_fScriptPercentageInterToStopMoving = stopMoving * 0.01f;
+	m_fScriptPercentageInterToCatchUp = catchUp * 0.01f;
+	m_fScriptTimeForInterPolation = time;
+	m_bScriptParametersSetForInterPol = true;
+}
+
+void
+CCamera::SetZoomValueFollowPedScript(int16 dist)
+{
+	switch (dist) {
+	case 0: m_fPedZoomValueScript = 0.25f; break;
+	case 1: m_fPedZoomValueScript = 1.5f; break;
+	case 2: m_fPedZoomValueScript = 2.9f; break;
+	default: break;
+	}
+
+	m_bUseScriptZoomValuePed = true;
+}
+
+void
+CCamera::SetZoomValueCamStringScript(int16 dist)
+{
+	if (Cams[ActiveCam].CamTargetEntity->IsVehicle()) {
+		int vehApp = ((CVehicle*)Cams[ActiveCam].CamTargetEntity)->GetVehicleAppearance();
+		int vehArrPos = 0;
+		GetArrPosForVehicleType(vehApp, vehArrPos);
+
+#ifdef FREE_CAM
+		if (bFreeCam) {
+			switch (dist) {
+			case 0: m_fCarZoomValueScript = LCS_ZOOM_ONE_DISTANCE[vehArrPos]; break;
+			case 1: m_fCarZoomValueScript = LCS_ZOOM_TWO_DISTANCE[vehArrPos]; break;
+			case 2: m_fCarZoomValueScript = LCS_ZOOM_THREE_DISTANCE[vehArrPos]; break;
+			default: break;
+			}
+		}
+		else
+#endif
+		{
+			switch (dist) {
+			case 0: m_fCarZoomValueScript = ZOOM_ONE_DISTANCE[vehArrPos]; break;
+			case 1: m_fCarZoomValueScript = ZOOM_TWO_DISTANCE[vehArrPos]; break;
+			case 2: m_fCarZoomValueScript = ZOOM_THREE_DISTANCE[vehArrPos]; break;
+			default: break;
+			}
+		}
+
+		m_bUseScriptZoomValueCar = true;
+	} else {
+		switch (dist) {
+		case 0: m_fPedZoomValueScript = 0.25f; break;
+		case 1: m_fPedZoomValueScript = 1.5f; break;
+		case 2: m_fPedZoomValueScript = 2.9f; break;
+		default: break;
+		}
+
+		m_bUseScriptZoomValuePed = true;
+	}
+}
+
+void
+CCamera::SetNearClipScript(float clip)
+{
+	m_fNearClipScript = clip;
+	m_bUseNearClipScript = true;
+}
+
+
+
+void
+CCamera::ProcessFade(void)
+{
+	if(m_bFading){
+		if(m_iFadingDirection == FADE_IN){
+			if(m_fTimeToFadeOut != 0.0f)
+				m_fFLOATingFade -= CTimer::GetTimeStepInSeconds() * 255.0f / m_fTimeToFadeOut;
+			else
+				m_fFLOATingFade = 0.0f;
+			if (m_fFLOATingFade <= 0.0f) {
+				m_bFading = false;
+				m_fFLOATingFade = 0.0f;
+			}
+		}else if(m_iFadingDirection == FADE_OUT){
+			if(m_fTimeToFadeOut != 0.0f)
+				m_fFLOATingFade += CTimer::GetTimeStepInSeconds() * 255.0f / m_fTimeToFadeOut;
+			else
+				m_fFLOATingFade = 255.0f;
+			if (m_fFLOATingFade >= 255.0f) {
+				m_bFading = false;
+				m_fFLOATingFade = 255.0f;
+			}
+		}
+		CDraw::FadeValue = m_fFLOATingFade;
+	}
+}
+
+void
+CCamera::ProcessMusicFade(void)
+{
+	if(m_bMusicFading){
+		if(m_iMusicFadingDirection == FADE_IN){
+			if(m_fTimeToFadeMusic == 0.0f)
+				m_fFLOATingFadeMusic = 0.0f;
+			else
+				m_fFLOATingFadeMusic -= 255.0f*CTimer::GetTimeStepInSeconds()/m_fTimeToFadeMusic;
+			if(m_fFLOATingFadeMusic <= 0.0f){
+				m_bMusicFading = false;
+				m_fFLOATingFadeMusic = 0.0f;
+			}
+		}else if(m_iMusicFadingDirection == FADE_OUT){
+			if(m_fTimeToFadeMusic == 0.0f)
+				m_fFLOATingFadeMusic = 255.0f;
+			else
+				m_fFLOATingFadeMusic += 255.0f*CTimer::GetTimeStepInSeconds()/m_fTimeToFadeMusic;
+			if(m_fFLOATingFadeMusic >= 255.0f){
+				m_bMusicFading = false;
+				m_fFLOATingFadeMusic = 255.0f;
+			}
+		}
+		DMAudio.SetEffectsFadeVol(127 - m_fFLOATingFadeMusic/255.0f * 127);
+		DMAudio.SetMusicFadeVol(127 - m_fFLOATingFadeMusic/255.0f * 127);
+	}
+}
+
+void
+CCamera::Fade(float timeout, int16 direction)
+{
+	m_bFading = true;
+	m_iFadingDirection = direction;
+	m_fTimeToFadeOut = timeout;
+	m_uiFadeTimeStarted = CTimer::GetTimeInMilliseconds();
+	if(!m_bIgnoreFadingStuffForMusic){
+		m_bMusicFading = true;
+		m_iMusicFadingDirection = direction;
+		m_fTimeToFadeMusic = timeout;
+		m_uiFadeTimeStartedMusic = CTimer::GetTimeInMilliseconds();
+	}
+}
+
+void
+CCamera::SetFadeColour(uint8 r, uint8 g, uint8 b)
+{
+	m_FadeTargetIsSplashScreen = r == 2 && g == 2 && b == 2;
+	CDraw::FadeRed = r;
+	CDraw::FadeGreen = g;
+	CDraw::FadeBlue = b;
+}
+
+bool
+CCamera::GetFading(void)
+{
+	return m_bFading;
+}
+
+int
+CCamera::GetFadingDirection(void)
+{
+	if(m_bFading)
+		return m_iFadingDirection == FADE_IN ? FADE_IN : FADE_OUT;
+	else
+		return FADE_NONE;
+}
+
+int
+CCamera::GetScreenFadeStatus(void)
+{
+	if(m_fFLOATingFade == 0.0f)
+		return FADE_0;
+	if(m_fFLOATingFade == 255.0f)
+		return FADE_2;
+	return FADE_1;
+}
+
+
+
+void
+CCamera::RenderMotionBlur(void)
+{
+	if(m_BlurType == 0)
+		return;
+
+	CMBlur::MotionBlurRender(m_pRwCamera,
+		m_BlurRed, m_BlurGreen, m_BlurBlue,
+		m_motionBlur, m_BlurType, m_imotionBlurAddAlpha);
+}
+
+void
+CCamera::SetMotionBlur(int r, int g, int b, int a, int type)
+{
+	m_BlurRed = r;
+	m_BlurGreen = g;
+	m_BlurBlue = b;
+	m_motionBlur = a;
+	m_BlurType = type;
+}
+
+void
+CCamera::SetMotionBlurAlpha(int a)
+{
+	m_imotionBlurAddAlpha = a;
+}
+
+
+
+int
+CCamera::GetLookDirection(void)
+{
+	if(Cams[ActiveCam].Mode == CCam::MODE_CAM_ON_A_STRING ||
+	   Cams[ActiveCam].Mode == CCam::MODE_1STPERSON ||
+	   Cams[ActiveCam].Mode == CCam::MODE_BEHINDBOAT ||
+	   Cams[ActiveCam].Mode == CCam::MODE_FOLLOWPED)
+		return Cams[ActiveCam].DirectionWasLooking;
+	return LOOKING_FORWARD;
+}
+
+bool
+CCamera::GetLookingForwardFirstPerson(void)
+{
+	return Cams[ActiveCam].Mode == CCam::MODE_1STPERSON &&
+		Cams[ActiveCam].DirectionWasLooking == LOOKING_FORWARD;
+}
+
+bool
+CCamera::GetLookingLRBFirstPerson(void)
+{
+	return Cams[ActiveCam].Mode == CCam::MODE_1STPERSON && Cams[ActiveCam].DirectionWasLooking != LOOKING_FORWARD;
+}
+
+void
+CCamera::SetCameraDirectlyBehindForFollowPed_CamOnAString(void)
+{
+	m_bCamDirectlyBehind = true;
+	CPlayerPed *player = FindPlayerPed();
+	if (player)
+		m_PedOrientForBehindOrInFront = CGeneral::GetATanOfXY(player->GetForward().x, player->GetForward().y);
+}
+
+void
+CCamera::SetCameraDirectlyInFrontForFollowPed_CamOnAString(void)
+{
+	m_bCamDirectlyInFront = true;
+	CPlayerPed *player = FindPlayerPed();
+	if (player)
+		m_PedOrientForBehindOrInFront = CGeneral::GetATanOfXY(player->GetForward().x, player->GetForward().y);
+}
+
+void
+CCamera::SetNewPlayerWeaponMode(int16 mode, int16 minZoom, int16 maxZoom)
+{
+	SetMotionBlur(CTimeCycle::GetBlurRed(), CTimeCycle::GetBlurGreen(), CTimeCycle::GetBlurBlue(), m_motionBlur, MOTION_BLUR_LIGHT_SCENE);
+	PlayerWeaponMode.Mode = mode;
+	PlayerWeaponMode.MaxZoom = maxZoom;
+	PlayerWeaponMode.MinZoom = minZoom;
+	PlayerWeaponMode.Duration = 0.0f;
+}
+
+void
+CCamera::ClearPlayerWeaponMode(void)
+{
+	SetMotionBlur(CTimeCycle::GetBlurRed(), CTimeCycle::GetBlurGreen(), CTimeCycle::GetBlurBlue(), m_motionBlur, MOTION_BLUR_LIGHT_SCENE);
+	PlayerWeaponMode.Mode = 0;
+	PlayerWeaponMode.MaxZoom = 1;
+	PlayerWeaponMode.MinZoom = -1;
+	PlayerWeaponMode.Duration = 0.0f;
+}
+
+void
+CCamera::UpdateAimingCoors(CVector const &coors)
+{
+	m_cvecAimingTargetCoors = coors;
+}
+
+bool
+CCamera::Find3rdPersonCamTargetVector(float dist, CVector pos, CVector &source, CVector &target)
+{
+	if(CPad::GetPad(0)->GetLookBehindForPed()){
+		source = pos;
+		target = dist*Cams[ActiveCam].CamTargetEntity->GetForward() + source;
+		return false;
+	}else{
+		float angleX = DEGTORAD((m_f3rdPersonCHairMultX-0.5f) * 1.8f * 0.5f * Cams[ActiveCam].FOV * CDraw::GetAspectRatio());
+		float angleY = DEGTORAD((0.5f-m_f3rdPersonCHairMultY) * 1.8f * 0.5f * Cams[ActiveCam].FOV);
+		source = Cams[ActiveCam].Source;
+		target = Cams[ActiveCam].Front;
+		target += Cams[ActiveCam].Up * Tan(angleY);
+		target += CrossProduct(Cams[ActiveCam].Front, Cams[ActiveCam].Up) * Tan(angleX);
+		target.Normalise();
+		source += DotProduct(pos - source, target)*target;
+		target = dist*target + source;
+		return true;
+	}
+}
+
+float
+CCamera::Find3rdPersonQuickAimPitch(void)
+{
+	float clampedFrontZ = clamp(Cams[ActiveCam].Front.z, -1.0f, 1.0f);
+
+	float rot = Asin(clampedFrontZ);
+
+	return -(DEGTORAD(((0.5f - m_f3rdPersonCHairMultY) * 1.8f * 0.5f * Cams[ActiveCam].FOV)) + rot);
+}
+
+bool
+CCamera::Using1stPersonWeaponMode(void)
+{
+	switch(PlayerWeaponMode.Mode)
+	case CCam::MODE_SNIPER:
+	case CCam::MODE_M16_1STPERSON:
+	case CCam::MODE_ROCKETLAUNCHER:
+	case CCam::MODE_HELICANNON_1STPERSON:
+	case CCam::MODE_CAMERA:
+		return true;
+	return false;
+}
+
+
+void
+CCamera::SetRwCamera(RwCamera *cam)
+{
+	m_pRwCamera = cam;
+	m_viewMatrix.Attach(RwCameraGetViewMatrix(m_pRwCamera), false);
+	CMBlur::MotionBlurOpen(m_pRwCamera);
+}
+
+void
+CCamera::CalculateDerivedValues(void)
+{
+	m_cameraMatrix = Invert(m_matrix);
+
+	float hfov = DEGTORAD(CDraw::GetScaledFOV()/2.0f);
+	float c = Cos(hfov);
+	float s = Sin(hfov);
+
+	// right plane
+	m_vecFrustumNormals[0] = CVector(c, -s, 0.0f);
+	// left plane
+	m_vecFrustumNormals[1] = CVector(-c, -s, 0.0f);
+
+	CDraw::CalculateAspectRatio();
+	c /= SCREEN_ASPECT_RATIO;
+	s /= SCREEN_ASPECT_RATIO;
+	// bottom plane
+	m_vecFrustumNormals[2] = CVector(0.0f, -s, -c);
+	// top plane
+	m_vecFrustumNormals[3] = CVector(0.0f, -s, c);
+
+	if(GetForward().x == 0.0f && GetForward().y == 0.0f)
+		GetForward().x = 0.0001f;
+	else
+		Orientation = Atan2(GetForward().x, GetForward().y);
+
+	CamFrontXNorm = GetForward().x;
+	CamFrontYNorm = GetForward().y;
+	float l = Sqrt(SQR(CamFrontXNorm) + SQR(CamFrontYNorm));
+	if(l == 0.0f)
+		CamFrontXNorm = 1.0f;
+	else{
+		CamFrontXNorm /= l;
+		CamFrontYNorm /= l;
+	}
+}
+
+bool
+CCamera::IsPointVisible(const CVector &center, const CMatrix *mat)
+{
+#ifdef GTA_PS2
+	CVuVector c;
+	TransformPoint(c, *mat, center);
+#else
+	CVector c = center;
+	#ifdef FIX_BUGS
+		c = *mat * center;
+	#else
+		RwV3dTransformPoints(&c, &c, 1, (RwMatrix*)mat);
+	#endif
+#endif
+	if(c.y < CDraw::GetNearClipZ()) return false;
+	if(c.y > CDraw::GetFarClipZ()) return false;
+	if(c.x*m_vecFrustumNormals[0].x + c.y*m_vecFrustumNormals[0].y > 0.0f) return false;
+	if(c.x*m_vecFrustumNormals[1].x + c.y*m_vecFrustumNormals[1].y > 0.0f) return false;
+	if(c.y*m_vecFrustumNormals[2].y + c.z*m_vecFrustumNormals[2].z > 0.0f) return false;
+	if(c.y*m_vecFrustumNormals[3].y + c.z*m_vecFrustumNormals[3].z > 0.0f) return false;
+	return true;
+}
+
+bool
+CCamera::IsSphereVisible(const CVector &center, float radius, const CMatrix *mat)
+{
+#ifdef GTA_PS2
+	CVuVector c;
+	TransformPoint(c, *mat, center);
+#else
+	CVector c = center;
+	#ifdef FIX_BUGS
+		c = *mat * center;
+	#else
+		RwV3dTransformPoints(&c, &c, 1, (RwMatrix*)mat);
+	#endif
+#endif
+	if(c.y + radius < CDraw::GetNearClipZ()) return false;
+	if(c.y - radius > CDraw::GetFarClipZ()) return false;
+	if(c.x*m_vecFrustumNormals[0].x + c.y*m_vecFrustumNormals[0].y > radius) return false;
+	if(c.x*m_vecFrustumNormals[1].x + c.y*m_vecFrustumNormals[1].y > radius) return false;
+	if(c.y*m_vecFrustumNormals[2].y + c.z*m_vecFrustumNormals[2].z > radius) return false;
+	if(c.y*m_vecFrustumNormals[3].y + c.z*m_vecFrustumNormals[3].z > radius) return false;
+	return true;
+}
+
+bool
+CCamera::IsSphereVisible(const CVector &center, float radius)
+{
+	CMatrix mat = m_cameraMatrix;
+	return IsSphereVisible(center, radius, &mat);
+}
+
+bool
+#ifdef GTA_PS2
+CCamera::IsBoxVisible(CVuVector *box, const CMatrix *mat)
+#else
+CCamera::IsBoxVisible(CVector *box, const CMatrix *mat)
+#endif
+{
+	int i;
+	int frustumTests[6] = { 0 };
+#ifdef GTA_PS2
+	TransformPoints(box, 8, *mat, box);
+#else
+	#ifdef FIX_BUGS
+		for (i = 0; i < 8; i++)
+			box[i] = *mat * box[i];
+	#else
+		RwV3dTransformPoints(box, box, 8, (RwMatrix*)mat);
+	#endif
+#endif
+
+	for(i = 0; i < 8; i++){
+		if(box[i].y < CDraw::GetNearClipZ()) frustumTests[0]++;
+		if(box[i].y > CDraw::GetFarClipZ()) frustumTests[1]++;
+		if(box[i].x*m_vecFrustumNormals[0].x + box[i].y*m_vecFrustumNormals[0].y > 0.0f) frustumTests[2]++;
+		if(box[i].x*m_vecFrustumNormals[1].x + box[i].y*m_vecFrustumNormals[1].y > 0.0f) frustumTests[3]++;
+//	Why not test z?
+//		if(box[i].y*m_vecFrustumNormals[2].y + box[i].z*m_vecFrustumNormals[2].z > 0.0f) frustumTests[4]++;
+//		if(box[i].y*m_vecFrustumNormals[3].y + box[i].z*m_vecFrustumNormals[3].z > 0.0f) frustumTests[5]++;
+	}
+	for(i = 0; i < 6; i++)
+		if(frustumTests[i] == 8)
+			return false;		// Box is completely outside of one plane
+	return true;
+}
+
+
+
+CCamPathSplines::CCamPathSplines(void)
+{
+	m_arr_PathData = nil;
+}
diff --git a/src/core/Camera.h b/src/core/Camera.h
new file mode 100644
index 0000000..538ff06
--- /dev/null
+++ b/src/core/Camera.h
@@ -0,0 +1,649 @@
+#pragma once
+#include "Placeable.h"
+
+class CEntity;
+class CPed;
+class CAutomobile;
+class CGarage;
+
+extern int16 DebugCamMode;
+
+enum
+{
+	NUMBER_OF_VECTORS_FOR_AVERAGE = 2,
+	MAX_NUM_OF_SPLINETYPES = 4,
+	MAX_NUM_OF_NODES = 800	// for trains
+};
+
+#define DEFAULT_NEAR (0.9f)
+enum
+{
+	CAM_ZOOM_1STPRS,
+	CAM_ZOOM_1,
+	CAM_ZOOM_2,
+	CAM_ZOOM_3,
+	CAM_ZOOM_TOPDOWN,
+	CAM_ZOOM_CINEMATIC,
+};
+
+const float DefaultFOV = 70.0f; // beta: 80.0f
+
+class CCam
+{
+public:
+	enum
+	{
+		MODE_NONE = 0,
+		MODE_TOPDOWN,
+		MODE_GTACLASSIC,
+		MODE_BEHINDCAR,
+		MODE_FOLLOWPED,
+		MODE_AIMING,
+		MODE_DEBUG,
+		MODE_SNIPER,
+		MODE_ROCKETLAUNCHER,
+		MODE_MODELVIEW,
+		MODE_BILL,
+		MODE_SYPHON,
+		MODE_CIRCLE,
+		MODE_CHEESYZOOM,
+		MODE_WHEELCAM,
+		MODE_FIXED,
+		MODE_1STPERSON,
+		MODE_FLYBY,
+		MODE_CAM_ON_A_STRING,
+		MODE_REACTION,
+		MODE_FOLLOW_PED_WITH_BIND,
+		MODE_CHRIS,
+		MODE_BEHINDBOAT,
+		MODE_PLAYER_FALLEN_WATER,
+		MODE_CAM_ON_TRAIN_ROOF,
+		MODE_CAM_RUNNING_SIDE_TRAIN,
+		MODE_BLOOD_ON_THE_TRACKS,
+		MODE_IM_THE_PASSENGER_WOOWOO,
+		MODE_SYPHON_CRIM_IN_FRONT,
+		MODE_PED_DEAD_BABY,
+		MODE_PILLOWS_PAPS,
+		MODE_LOOK_AT_CARS,
+		MODE_ARRESTCAM_ONE,
+		MODE_ARRESTCAM_TWO,
+		MODE_M16_1STPERSON,
+		MODE_SPECIAL_FIXED_FOR_SYPHON,
+		MODE_FIGHT_CAM,
+		MODE_TOP_DOWN_PED,
+		MODE_LIGHTHOUSE,
+		MODE_SNIPER_RUNABOUT,
+		MODE_ROCKETLAUNCHER_RUNABOUT,
+		MODE_1STPERSON_RUNABOUT,
+		MODE_M16_1STPERSON_RUNABOUT,
+		MODE_FIGHT_CAM_RUNABOUT,
+		MODE_EDITOR,
+		MODE_HELICANNON_1STPERSON,
+		MODE_CAMERA,
+	};
+
+	bool    bBelowMinDist; //used for follow ped mode
+	bool    bBehindPlayerDesired; //used for follow ped mode
+	bool    m_bCamLookingAtVector;
+	bool    m_bCollisionChecksOn;
+	bool    m_bFixingBeta; //used for camera on a string
+	bool    m_bTheHeightFixerVehicleIsATrain;
+	bool    LookBehindCamWasInFront;
+	bool    LookingBehind;
+	bool    LookingLeft;
+	bool    LookingRight;
+	bool    ResetStatics; //for interpolation type stuff to work
+	bool    Rotating;
+
+	int16   Mode;                   // CameraMode
+	uint32  m_uiFinishTime;
+
+	int     m_iDoCollisionChecksOnFrameNum; 
+	int     m_iDoCollisionCheckEveryNumOfFrames;
+	int     m_iFrameNumWereAt;
+	int     m_iRunningVectorArrayPos;
+	int     m_iRunningVectorCounter;
+	int     DirectionWasLooking;
+
+	float   f_max_role_angle; //=DEGTORAD(5.0f);    
+	float   f_Roll; //used for adding a slight roll to the camera in the
+	float	f_rollSpeed;
+	float   m_fSyphonModeTargetZOffSet;
+	float   m_fAmountFractionObscured;
+	float   m_fAlphaSpeedOverOneFrame;
+	float   m_fBetaSpeedOverOneFrame;
+	float   m_fBufferedTargetBeta;
+	float   m_fBufferedTargetOrientation;
+	float   m_fBufferedTargetOrientationSpeed;
+	float   m_fCamBufferedHeight;
+	float   m_fCamBufferedHeightSpeed;
+	float   m_fCloseInPedHeightOffset;
+	float   m_fCloseInPedHeightOffsetSpeed;
+	float   m_fCloseInCarHeightOffset;
+	float   m_fCloseInCarHeightOffsetSpeed;
+	float   m_fDimensionOfHighestNearCar;       
+	float   m_fDistanceBeforeChanges;
+	float   m_fFovSpeedOverOneFrame;
+	float   m_fMinDistAwayFromCamWhenInterPolating;
+	float   m_fPedBetweenCameraHeightOffset;
+	float   m_fPlayerInFrontSyphonAngleOffSet;
+	float   m_fRadiusForDead;
+	float   m_fRealGroundDist; //used for follow ped mode
+	float   m_fTargetBeta;
+	float   m_fTimeElapsedFloat;  
+	float   m_fTilt;
+	float   m_fTiltSpeed;
+	float   m_fTransitionBeta;
+	float   m_fTrueBeta;
+	float   m_fTrueAlpha;
+	float   m_fInitialPlayerOrientation; //used for first person
+
+	float   Alpha;
+	float   AlphaSpeed;
+	float   FOV;
+	float   FOVSpeed;
+	float   Beta;
+	float   BetaSpeed;
+	float   Distance;
+	float   DistanceSpeed;
+	float   CA_MIN_DISTANCE;
+	float   CA_MAX_DISTANCE;
+	float   SpeedVar;
+
+	float m_fTargetZoomGroundOne;
+	float m_fTargetZoomGroundTwo;
+	float m_fTargetZoomGroundThree;
+	float m_fTargetZoomOneZExtra;
+	float m_fTargetZoomTwoZExtra;
+	float m_fTargetZoomThreeZExtra;
+	float m_fTargetZoomZCloseIn;
+	float m_fMinRealGroundDist;
+	float m_fTargetCloseInDist;
+
+	CVector m_cvecSourceSpeedOverOneFrame;
+	CVector m_cvecTargetSpeedOverOneFrame;
+	CVector m_cvecUpOverOneFrame;
+
+	CVector m_cvecTargetCoorsForFudgeInter;
+	CVector m_cvecCamFixedModeVector;
+	CVector m_cvecCamFixedModeSource;
+	CVector m_cvecCamFixedModeUpOffSet;
+	CVector m_vecLastAboveWaterCamPosition;  //helper for when the player has gone under the water
+	CVector m_vecBufferedPlayerBodyOffset;
+
+	// The three vectors that determine this camera for this frame
+	CVector Front;                                                  // Direction of looking in
+	CVector Source;                                                 // Coors in world space
+	CVector SourceBeforeLookBehind;
+	CVector Up;                                                     // Just that
+	CVector m_arrPreviousVectors[NUMBER_OF_VECTORS_FOR_AVERAGE];    // used to average stuff
+	CEntity *CamTargetEntity;
+
+	float       m_fCameraDistance;
+	float       m_fIdealAlpha;
+	float       m_fPlayerVelocity;
+	CAutomobile  *m_pLastCarEntered; // So interpolation works
+	CPed         *m_pLastPedLookedAt;// So interpolation works 
+	bool        m_bFirstPersonRunAboutActive;
+
+	CCam(void) { Init(); }
+	void Init(void);
+	void Process(void);
+	void ProcessSpecialHeightRoutines(void);
+	void GetVectorsReadyForRW(void);
+	CVector DoAverageOnVector(const CVector &vec);
+	void WorkOutCamHeight(const CVector &TargetCoors, float TargetOrientation, float TargetHeight);
+	bool RotCamIfInFrontCar(CVector &TargetCoors, float TargetOrientation);
+	void Cam_On_A_String_Unobscured(const CVector &TargetCoors, float BaseDist);
+	void FixCamWhenObscuredByVehicle(const CVector &TargetCoors);
+	bool GetBoatLook_L_R_HeightOffset(float &Offset);
+	void LookBehind(void);
+	void LookLeft(void);
+	void LookRight(void);
+	void ClipIfPedInFrontOfPlayer(void);
+	void KeepTrackOfTheSpeed(const CVector &source, const CVector &target, const CVector &up, const float &alpha, const float &beta, const float &fov);
+	bool Using3rdPersonMouseCam(void);
+	bool GetWeaponFirstPersonOn(void);
+	bool IsTargetInWater(const CVector &CamCoors);
+	void AvoidWallsTopDownPed(const CVector &TargetCoors, const CVector &Offset, float *Adjuster, float *AdjusterSpeed, float yDistLimit);
+	void PrintMode(void);
+
+	void Process_Debug(const CVector&, float, float, float);
+#ifdef GTA_SCENE_EDIT
+	void Process_Editor(const CVector&, float, float, float);
+#endif
+	void Process_ModelView(const CVector &CameraTarget, float, float, float);
+	void Process_FollowPed(const CVector &CameraTarget, float TargetOrientation, float, float);
+	void Process_FollowPedWithMouse(const CVector &CameraTarget, float TargetOrientation, float, float);
+	void Process_BehindCar(const CVector &CameraTarget, float TargetOrientation, float, float);
+	void Process_Cam_On_A_String(const CVector &CameraTarget, float TargetOrientation, float, float);
+	void Process_TopDown(const CVector &CameraTarget, float TargetOrientation, float SpeedVar, float TargetSpeedVar);
+	void Process_TopDownPed(const CVector &CameraTarget, float TargetOrientation, float, float);
+	void Process_Rocket(const CVector &CameraTarget, float, float, float);
+	void Process_M16_1stPerson(const CVector &CameraTarget, float, float, float);
+	void Process_1stPerson(const CVector &CameraTarget, float, float, float);
+	void Process_1rstPersonPedOnPC(const CVector &CameraTarget, float TargetOrientation, float, float);
+	void Process_Sniper(const CVector &CameraTarget, float, float, float);
+	void Process_Syphon(const CVector &CameraTarget, float, float, float);
+	void Process_Syphon_Crim_In_Front(const CVector &CameraTarget, float, float, float);
+	void Process_BehindBoat(const CVector &CameraTarget, float TargetOrientation, float, float);
+	void Process_Fight_Cam(const CVector &CameraTarget, float TargetOrientation, float, float);
+	void Process_FlyBy(const CVector&, float, float, float);
+	bool Process_WheelCam(const CVector&, float, float, float);
+	void Process_Fixed(const CVector &CameraTarget, float, float, float);
+	void Process_Player_Fallen_Water(const CVector &CameraTarget, float TargetOrientation, float, float);
+	void Process_SpecialFixedForSyphon(const CVector &CameraTarget, float, float, float);
+	void Process_LightHouse(const CVector &CameraTarget, float, float, float);
+	void ProcessPedsDeadBaby(void);
+	bool ProcessArrestCamOne(void);
+	bool ProcessArrestCamTwo(void);
+	bool GetLookAlongGroundPos(CEntity *Target, CPed *Cop, CVector &TargetCoors, CVector &SourceOut);
+	bool GetLookFromLampPostPos(CEntity *Target, CPed *Cop, CVector &TargetCoors, CVector &SourceOut);
+	bool GetLookOverShoulderPos(CEntity *Target, CPed *Cop, CVector &TargetCoors, CVector &SourceOut);
+
+	// custom stuff
+	void Process_FollowPed_Rotation(const CVector &CameraTarget, float TargetOrientation, float, float);
+	void Process_FollowCar_SA(const CVector &CameraTarget, float TargetOrientation, float, float);
+};
+
+class CCamPathSplines
+{
+public:
+	enum {MAXPATHLENGTH=800};
+//	float m_arr_PathData[MAXPATHLENGTH];
+	float *m_arr_PathData;
+	CCamPathSplines(void);
+};
+
+struct CTrainCamNode
+{
+	CVector m_cvecCamPosition;
+	CVector m_cvecPointToLookAt;
+	CVector m_cvecMinPointInRange;
+	CVector m_cvecMaxPointInRange;
+	float m_fDesiredFOV;
+	float m_fNearClip;
+};
+
+struct CQueuedMode
+{
+	int16 Mode;
+	float Duration;
+	int16 MinZoom;
+	int16 MaxZoom;
+};
+
+enum
+{
+	LOOKING_BEHIND,
+	LOOKING_LEFT,
+	LOOKING_RIGHT,
+	LOOKING_FORWARD,
+};
+
+enum
+{
+	// TODO: find better names
+	FADE_0,	// faded in
+	FADE_1,	// mid fade
+	FADE_2,	// faded out
+
+	// Direction
+	FADE_OUT = 0,
+	FADE_IN,
+	FADE_NONE
+};
+
+enum
+{
+	MOTION_BLUR_NONE = 0,
+	MOTION_BLUR_SNIPER,
+	MOTION_BLUR_LIGHT_SCENE,
+	MOTION_BLUR_SECURITY_CAM,
+	MOTION_BLUR_CUT_SCENE,
+	MOTION_BLUR_INTRO,
+	MOTION_BLUR_INTRO2,
+	MOTION_BLUR_SNIPER_ZOOM,
+	MOTION_BLUR_INTRO3,
+	MOTION_BLUR_INTRO4,
+};
+
+enum
+{
+	NONE = 0,
+	INTERPOLATION,
+	JUMP_CUT
+};
+
+enum
+{
+	CAMCONTROL_GAME,
+	CAMCONTROL_SCRIPT,
+	CAMCONTROL_OBBE
+};
+
+class CCamera : public CPlaceable
+{
+public:
+	bool m_bAboveGroundTrainNodesLoaded;
+	bool m_bBelowGroundTrainNodesLoaded;
+	bool m_bCamDirectlyBehind;
+	bool m_bCamDirectlyInFront;
+	bool m_bCameraJustRestored;
+	bool m_bcutsceneFinished;
+	bool m_bCullZoneChecksOn;
+	bool m_bFirstPersonBeingUsed;
+	bool m_bJustJumpedOutOf1stPersonBecauseOfTarget;
+	bool m_bIdleOn;
+	bool m_bInATunnelAndABigVehicle;
+	bool m_bInitialNodeFound;
+	bool m_bInitialNoNodeStaticsSet;
+	bool m_bIgnoreFadingStuffForMusic;
+	bool m_bPlayerIsInGarage;
+	bool m_bPlayerWasOnBike;
+	bool m_bJustCameOutOfGarage;
+	bool m_bJustInitalised;
+	bool m_bJust_Switched;
+	bool m_bLookingAtPlayer;
+	bool m_bLookingAtVector;
+	bool m_bMoveCamToAvoidGeom;
+	bool m_bObbeCinematicPedCamOn;
+	bool m_bObbeCinematicCarCamOn;
+	bool m_bRestoreByJumpCut;
+	bool m_bUseNearClipScript;
+	bool m_bStartInterScript;
+	bool m_bStartingSpline;
+	bool m_bTargetJustBeenOnTrain;
+	bool m_bTargetJustCameOffTrain;
+	bool m_bUseSpecialFovTrain;
+	bool m_bUseTransitionBeta;
+	bool m_bUseScriptZoomValuePed;
+	bool m_bUseScriptZoomValueCar;
+	bool m_bWaitForInterpolToFinish;
+	bool m_bItsOkToLookJustAtThePlayer;
+	bool m_bWantsToSwitchWidescreenOff;
+	bool m_WideScreenOn;
+	bool m_1rstPersonRunCloseToAWall;
+	bool m_bHeadBob;
+	bool m_bVehicleSuspenHigh;
+	bool m_bEnable1rstPersonCamCntrlsScript;
+	bool m_bAllow1rstPersonWeaponsCamera;
+	bool m_bFailedCullZoneTestPreviously;
+
+	bool m_FadeTargetIsSplashScreen;
+
+	bool WorldViewerBeingUsed;
+	uint8 ActiveCam;
+	uint32 m_uiCamShakeStart;
+	uint32 m_uiFirstPersonCamLastInputTime;
+
+	uint32 m_uiLongestTimeInMill;
+	uint32 m_uiNumberOfTrainCamNodes;
+	uint8   m_uiTransitionJUSTStarted;
+	uint8   m_uiTransitionState;        // 0:one mode 1:transition
+
+	uint32 m_uiTimeLastChange;
+	uint32 m_uiTimeWeLeftIdle_StillNoInput;
+	uint32 m_uiTimeWeEnteredIdle;
+	uint32 m_uiTimeTransitionStart;
+	uint32 m_uiTransitionDuration;
+	uint32 m_uiTransitionDurationTargetCoors;
+	int m_BlurBlue;
+	int m_BlurGreen;
+	int m_BlurRed;
+	int m_BlurType;
+
+	int m_iWorkOutSpeedThisNumFrames;
+	int m_iNumFramesSoFar;
+
+
+	int m_iCurrentTrainCamNode;
+	int m_motionBlur;
+	int m_imotionBlurAddAlpha;
+	int m_iCheckCullZoneThisNumFrames;
+	int m_iZoneCullFrameNumWereAt;
+	int WhoIsInControlOfTheCamera;
+
+	float CamFrontXNorm;
+	float CamFrontYNorm;
+#ifdef FIX_BUGS
+	int32 CarZoomIndicator;
+#else
+	float CarZoomIndicator;
+#endif
+	float CarZoomValue;
+	float CarZoomValueSmooth;
+
+	float DistanceToWater;
+	float FOVDuringInter;
+	float LODDistMultiplier;
+	float GenerationDistMultiplier;
+	float m_fAlphaSpeedAtStartInter;
+	float m_fAlphaWhenInterPol;
+	float m_fAlphaDuringInterPol;
+	float m_fBetaDuringInterPol;
+	float m_fBetaSpeedAtStartInter;
+	float m_fBetaWhenInterPol;
+	float m_fFOVWhenInterPol;
+	float m_fFOVSpeedAtStartInter;
+	float m_fStartingBetaForInterPol;
+	float m_fStartingAlphaForInterPol;
+	float m_PedOrientForBehindOrInFront;
+	float m_CameraAverageSpeed;
+	float m_CameraSpeedSoFar;
+	float m_fCamShakeForce;
+	float m_fCarZoomValueScript;
+	float m_fFovForTrain;
+	float m_fFOV_Wide_Screen;
+	float m_fNearClipScript;
+	float m_fOldBetaDiff;
+	float m_fPedZoomValue;
+
+	float m_fPedZoomValueScript;
+	float m_fPedZoomValueSmooth;
+	float m_fPositionAlongSpline;
+	float m_ScreenReductionPercentage;
+	float m_ScreenReductionSpeed;
+	float m_AlphaForPlayerAnim1rstPerson;
+	float Orientation;
+#ifdef FIX_BUGS
+	int32 PedZoomIndicator;
+#else
+	float PedZoomIndicator;
+#endif
+	float PlayerExhaustion;
+	float SoundDistUp;
+	float SoundDistUpAsRead;
+	float SoundDistUpAsReadOld;
+	float m_fAvoidTheGeometryProbsTimer;
+	int16 m_nAvoidTheGeometryProbsDirn;
+	float m_fWideScreenReductionAmount;
+	float m_fStartingFOVForInterPol;
+
+	static float m_fMouseAccelHorzntl;// acceleration multiplier for 1st person controls
+	static float m_fMouseAccelVertical;// acceleration multiplier for 1st person controls
+	static float m_f3rdPersonCHairMultX;
+	static float m_f3rdPersonCHairMultY;
+
+
+	CCam Cams[3];
+	CGarage *pToGarageWeAreIn;
+	CGarage *pToGarageWeAreInForHackAvoidFirstPerson;
+	CQueuedMode m_PlayerMode;
+	CQueuedMode PlayerWeaponMode;
+	CVector m_PreviousCameraPosition;
+	CVector m_RealPreviousCameraPosition;
+	CVector m_cvecAimingTargetCoors;
+	CVector m_vecFixedModeVector;
+	CVector m_vecFixedModeSource;
+	CVector m_vecFixedModeUpOffSet;
+	CVector m_vecCutSceneOffset;
+
+	CVector m_cvecStartingSourceForInterPol;
+	CVector m_cvecStartingTargetForInterPol;
+	CVector m_cvecStartingUpForInterPol;
+	CVector m_cvecSourceSpeedAtStartInter;
+	CVector m_cvecTargetSpeedAtStartInter;
+	CVector m_cvecUpSpeedAtStartInter;
+	CVector m_vecSourceWhenInterPol;
+	CVector m_vecTargetWhenInterPol;
+	CVector m_vecUpWhenInterPol;
+	CVector m_vecClearGeometryVec;
+	CVector m_vecGameCamPos;
+	CVector SourceDuringInter;
+	CVector TargetDuringInter;
+	CVector UpDuringInter;
+	RwCamera *m_pRwCamera;
+	CEntity *pTargetEntity;
+	CCamPathSplines m_arrPathArray[MAX_NUM_OF_SPLINETYPES];
+#ifdef GTA_TRAIN
+	CTrainCamNode m_arrTrainCamNode[MAX_NUM_OF_NODES];
+#endif
+	CMatrix m_cameraMatrix;
+	bool m_bGarageFixedCamPositionSet;
+	bool m_vecDoingSpecialInterPolation;
+	bool m_bScriptParametersSetForInterPol;
+	bool m_bFading;
+	bool m_bMusicFading;
+	CMatrix m_viewMatrix;
+	CVector m_vecFrustumNormals[4];
+	CVector m_vecOldSourceForInter;
+	CVector m_vecOldFrontForInter;
+	CVector m_vecOldUpForInter;
+	float m_vecOldFOVForInter;
+	float m_fFLOATingFade;
+	float m_fFLOATingFadeMusic;
+	float m_fTimeToFadeOut;
+	float m_fTimeToFadeMusic;
+	float m_fFractionInterToStopMoving;
+	float m_fFractionInterToStopCatchUp;
+	float m_fFractionInterToStopMovingTarget;
+	float m_fFractionInterToStopCatchUpTarget;
+	float m_fGaitSwayBuffer;
+	float m_fScriptPercentageInterToStopMoving;
+	float m_fScriptPercentageInterToCatchUp;
+
+	uint32  m_fScriptTimeForInterPolation;
+
+
+	int16   m_iFadingDirection;
+	int     m_iModeObbeCamIsInForCar;
+	int16   m_iModeToGoTo;
+	int16   m_iMusicFadingDirection;
+	int16   m_iTypeOfSwitch;
+
+	uint32 m_uiFadeTimeStarted;
+	uint32 m_uiFadeTimeStartedMusic;
+
+	static bool m_bUseMouse3rdPerson;
+#ifdef FREE_CAM
+	static bool bFreeCam;
+#endif
+
+	// High level and misc
+	CCamera(void);
+	void Init(void);
+	void Process(void);
+	void CamControl(void);
+	void UpdateTargetEntity(void);
+	void UpdateSoundDistances(void);
+	void InitialiseCameraForDebugMode(void);
+	void CamShake(float strength, float x, float y, float z);
+	bool Get_Just_Switched_Status() { return m_bJust_Switched; }
+	void AvoidTheGeometry(const CVector &Source, const CVector &TargetPos, CVector &NewSource, float FOV);
+	void GetArrPosForVehicleType(int apperance, int &index);
+	void GetScreenRect(CRect &rect);
+
+	// Who's in control
+	void TakeControl(CEntity *target, int16 mode, int16 typeOfSwitch, int32 controller);
+	void TakeControlNoEntity(const CVector &position, int16 typeOfSwitch, int32 controller);
+	void TakeControlWithSpline(int16 typeOfSwitch);
+	void Restore(void);
+	void RestoreWithJumpCut(void);
+	void SetCamPositionForFixedMode(const CVector &Source, const CVector &UppOffSet);
+
+	// Transition
+	void StartTransition(int16 mode);
+	void StartTransitionWhenNotFinishedInter(int16 mode);
+	void StoreValuesDuringInterPol(CVector &source, CVector &target, CVector &up, float &FOV);
+
+	// Widescreen borders
+	void SetWideScreenOn(void);
+	void SetWideScreenOff(void);
+	void ProcessWideScreenOn(void);
+	void DrawBordersForWideScreen(void);
+
+	// Obbe's cam
+	bool IsItTimeForNewcam(int32 obbeMode, int32 time);
+	bool TryToStartNewCamMode(int32 obbeMode);
+	void DontProcessObbeCinemaCamera(void);
+	void ProcessObbeCinemaCameraCar(void);
+	void ProcessObbeCinemaCameraHeli(void);
+	void ProcessObbeCinemaCameraPed(void);
+
+	// Train
+	void LoadTrainCamNodes(char const *name);
+	void Process_Train_Camera_Control(void);
+
+	// Script
+	void LoadPathSplines(int file);
+	void DeleteCutSceneCamDataMemory(void);
+	void FinishCutscene(void);
+	float GetPositionAlongSpline(void) { return m_fPositionAlongSpline; }
+	uint32 GetCutSceneFinishTime(void);
+	void SetCamCutSceneOffSet(const CVector &pos);
+	void SetPercentAlongCutScene(float percent);
+	void SetParametersForScriptInterpolation(float stopMoving, float catchUp, int32 time);
+	void SetZoomValueFollowPedScript(int16 dist);
+	void SetZoomValueCamStringScript(int16 dist);
+	void SetNearClipScript(float);
+
+	// Fading
+	void ProcessFade(void);
+	void ProcessMusicFade(void);
+	void Fade(float timeout, int16 direction);
+	void SetFadeColour(uint8 r, uint8 g, uint8 b);
+	bool GetFading(void);
+	int GetFadingDirection(void);
+	int GetScreenFadeStatus(void);
+
+	// Motion blur
+	void RenderMotionBlur(void);
+	void SetMotionBlur(int r, int g, int b, int a, int type);
+	void SetMotionBlurAlpha(int a);
+
+	// Player looking and aiming
+	int GetLookDirection(void);
+	bool GetLookingForwardFirstPerson(void);
+	bool GetLookingLRBFirstPerson(void);
+	void SetCameraDirectlyInFrontForFollowPed_CamOnAString(void);
+	void SetCameraDirectlyBehindForFollowPed_CamOnAString(void);
+	void SetNewPlayerWeaponMode(int16 mode, int16 minZoom, int16 maxZoom);
+	void ClearPlayerWeaponMode(void);
+	void UpdateAimingCoors(CVector const &coors);
+	bool Find3rdPersonCamTargetVector(float dist, CVector pos, CVector &source, CVector &target);
+	float Find3rdPersonQuickAimPitch(void);
+	bool Using1stPersonWeaponMode(void);
+
+	// Physical camera
+	void SetRwCamera(RwCamera *cam);
+	const CMatrix& GetCameraMatrix(void) { return m_cameraMatrix; }
+	CVector &GetGameCamPosition(void) { return m_vecGameCamPos; }
+	void CalculateDerivedValues(void);
+	bool IsPointVisible(const CVector &center, const CMatrix *mat);
+	bool IsSphereVisible(const CVector &center, float radius, const CMatrix *mat);
+	bool IsSphereVisible(const CVector &center, float radius);
+#ifdef GTA_PS2
+	bool IsBoxVisible(CVuVector *box, const CMatrix *mat);
+#else
+	bool IsBoxVisible(CVector *box, const CMatrix *mat);
+#endif
+};
+
+VALIDATE_SIZE(CCamera, 0xE9D8);
+
+extern CCamera TheCamera;
+
+void CamShakeNoPos(CCamera*, float);
+void MakeAngleLessThan180(float &Angle);
+void WellBufferMe(float Target, float *CurrentValue, float *CurrentSpeed, float MaxSpeed, float Acceleration, bool IsAngle);
diff --git a/src/core/CdStream.cpp b/src/core/CdStream.cpp
new file mode 100644
index 0000000..977f16c
--- /dev/null
+++ b/src/core/CdStream.cpp
@@ -0,0 +1,538 @@
+#ifdef _WIN32
+#define WITHWINDOWS
+#include "common.h"
+
+#include "CdStream.h"
+#include "rwcore.h"
+#include "RwHelper.h"
+#include "MemoryMgr.h"
+
+struct CdReadInfo
+{
+	uint32 nSectorOffset;
+	uint32 nSectorsToRead;
+	void *pBuffer;
+	char field_C;
+	bool bLocked;
+	bool bReading;
+	int32 nStatus;
+	HANDLE pDoneSemaphore; // used for CdStreamSync
+	HANDLE hFile;
+	OVERLAPPED Overlapped;
+};
+
+VALIDATE_SIZE(CdReadInfo, 0x30);
+
+char gCdImageNames[MAX_CDIMAGES+1][64];
+int32 gNumImages;
+int32 gNumChannels;
+
+HANDLE gImgFiles[MAX_CDIMAGES];
+
+HANDLE _gCdStreamThread;
+HANDLE gCdStreamSema; // released when we have new thing to read(so channel is set)
+DWORD _gCdStreamThreadId;
+
+CdReadInfo *gpReadInfo;
+Queue gChannelRequestQ;
+
+int32 lastPosnRead;
+
+BOOL _gbCdStreamOverlapped;
+BOOL _gbCdStreamAsync;
+DWORD _gdwCdStreamFlags;
+
+DWORD WINAPI CdStreamThread(LPVOID lpThreadParameter);
+
+void
+CdStreamInitThread(void)
+{
+	SetLastError(0);
+	
+	if ( gNumChannels > 0 )
+	{
+		for ( int32 i = 0; i < gNumChannels; i++ )
+		{
+			gpReadInfo[i].pDoneSemaphore = CreateSemaphore(nil, 0, 2, nil);
+			
+			if ( gpReadInfo[i].pDoneSemaphore == nil )
+			{
+				printf("%s: failed to create sync semaphore\n", "cdvd_stream");
+				ASSERT(0);
+				return;
+			}
+		}
+	}
+	
+	gChannelRequestQ.items = (int32 *)LocalAlloc(LMEM_ZEROINIT, sizeof(int32) * (gNumChannels + 1));
+	gChannelRequestQ.head = 0;
+	gChannelRequestQ.tail = 0;
+	gChannelRequestQ.size = gNumChannels + 1;
+	ASSERT(gChannelRequestQ.items != nil );
+	
+#ifdef FIX_BUGS
+	gCdStreamSema = CreateSemaphore(nil, 0, 5, nil);
+#else
+	gCdStreamSema = CreateSemaphore(nil, 0, 5, "CdStream");
+#endif
+	
+	if ( gCdStreamSema == nil )
+	{
+		printf("%s: failed to create stream semaphore\n", "cdvd_stream");
+		ASSERT(0);
+		return;
+	}
+	
+	_gCdStreamThread = CreateThread(nil, 64*1024/*64KB*/, CdStreamThread, nil, CREATE_SUSPENDED, &_gCdStreamThreadId);
+	
+	if ( _gCdStreamThread == nil )
+	{
+		printf("%s: failed to create streaming thread\n", "cdvd_stream");
+		ASSERT(0);
+		return;
+	}
+
+	SetThreadPriority(_gCdStreamThread, GetThreadPriority(GetCurrentThread()) - 1);
+		
+	ResumeThread(_gCdStreamThread);	
+}
+
+void
+CdStreamInit(int32 numChannels)
+{
+	DWORD SectorsPerCluster;
+	DWORD BytesPerSector;
+	DWORD NumberOfFreeClusters;
+	DWORD TotalNumberOfClusters;
+
+	GetDiskFreeSpace(nil, &SectorsPerCluster, &BytesPerSector, &NumberOfFreeClusters, &TotalNumberOfClusters);
+	
+	_gdwCdStreamFlags = 0;
+
+#ifndef FIX_BUGS // this just slows down streaming
+	if ( BytesPerSector <= CDSTREAM_SECTOR_SIZE )
+	{
+		_gdwCdStreamFlags |= FILE_FLAG_NO_BUFFERING;
+		debug("Using no buffered loading for streaming\n");
+	}
+#endif
+	
+	_gbCdStreamOverlapped = TRUE;
+
+	_gdwCdStreamFlags |= FILE_FLAG_OVERLAPPED;
+	
+	_gbCdStreamAsync = FALSE;
+	
+	void *pBuffer = (void *)RwMallocAlign(CDSTREAM_SECTOR_SIZE, BytesPerSector);
+	ASSERT( pBuffer != nil );
+	
+	SetLastError(0);
+	
+	gNumImages = 0;
+	
+	gNumChannels = numChannels;
+	
+	gpReadInfo = (CdReadInfo *)LocalAlloc(LMEM_ZEROINIT, sizeof(CdReadInfo) * numChannels);
+	ASSERT( gpReadInfo != nil );
+	
+	debug("%s: read info %p\n", "cdvd_stream", gpReadInfo);
+	
+	CdStreamAddImage("MODELS\\GTA3.IMG");
+	
+	int32 nStatus = CdStreamRead(0, pBuffer, 0, 1);
+	
+	CdStreamRemoveImages();
+	
+	if ( nStatus == STREAM_SUCCESS )
+	{
+		_gbCdStreamAsync = TRUE;
+		
+		debug("Using async loading for streaming\n");
+	}
+	else
+	{
+		_gdwCdStreamFlags &= ~FILE_FLAG_OVERLAPPED;
+		
+		_gbCdStreamOverlapped = FALSE;
+		
+		_gbCdStreamAsync = TRUE;
+		
+		debug("Using sync loading for streaming\n");
+	}
+	
+	CdStreamInitThread();
+	
+	ASSERT( pBuffer != nil );
+	RwFreeAlign(pBuffer);
+}
+
+uint32
+GetGTA3ImgSize(void)
+{
+	ASSERT( gImgFiles[0] != nil );
+	return (uint32)GetFileSize(gImgFiles[0], nil);
+}
+
+void
+CdStreamShutdown(void)
+{
+	if ( _gbCdStreamAsync )
+	{
+		LocalFree(gChannelRequestQ.items);
+		CloseHandle(gCdStreamSema);
+		CloseHandle(_gCdStreamThread);
+		
+		for ( int32 i = 0; i < gNumChannels; i++ )
+			CloseHandle(gpReadInfo[i].pDoneSemaphore);
+	}
+	
+	LocalFree(gpReadInfo);
+}
+
+
+
+int32
+CdStreamRead(int32 channel, void *buffer, uint32 offset, uint32 size)
+{
+	ASSERT( channel < gNumChannels );
+	ASSERT( buffer != nil );
+	
+	lastPosnRead = size + offset;
+	
+	ASSERT( _GET_INDEX(offset) < MAX_CDIMAGES );
+	HANDLE hImage = gImgFiles[_GET_INDEX(offset)];
+	ASSERT( hImage != nil );
+	
+	
+	CdReadInfo *pChannel = &gpReadInfo[channel];
+	ASSERT( pChannel != nil );
+	
+	pChannel->hFile = hImage;
+	
+	SetLastError(0);
+	
+	if ( _gbCdStreamAsync )
+	{
+		if ( pChannel->nSectorsToRead != 0 || pChannel->bReading )
+			return STREAM_NONE;
+		
+		pChannel->nStatus = STREAM_NONE;
+		pChannel->nSectorOffset = _GET_OFFSET(offset);
+		pChannel->nSectorsToRead = size;
+		pChannel->pBuffer = buffer;
+		pChannel->bLocked = 0;
+		
+		AddToQueue(&gChannelRequestQ, channel);
+		
+		if ( !ReleaseSemaphore(gCdStreamSema, 1, nil) )
+			printf("Signal Sema Error\n");
+		
+		return STREAM_SUCCESS;
+	}
+	
+	if ( _gbCdStreamOverlapped )
+	{
+		ASSERT( channel < gNumChannels );
+		CdReadInfo *pChannel = &gpReadInfo[channel];
+		ASSERT( pChannel != nil );
+		
+		pChannel->Overlapped.Offset = _GET_OFFSET(offset) * CDSTREAM_SECTOR_SIZE;
+		
+		if ( !ReadFile(hImage, buffer, size * CDSTREAM_SECTOR_SIZE, NULL, &pChannel->Overlapped)
+					&& GetLastError() != ERROR_IO_PENDING )
+			return STREAM_NONE;
+		else
+			return STREAM_SUCCESS;
+	}
+
+#ifdef BIG_IMG
+	LARGE_INTEGER liDistanceToMove;
+	liDistanceToMove.QuadPart = _GET_OFFSET(offset);
+	liDistanceToMove.QuadPart *= CDSTREAM_SECTOR_SIZE;
+	SetFilePointerEx(hImage, liDistanceToMove, nil, FILE_BEGIN);
+#else
+	SetFilePointer(hImage, _GET_OFFSET(offset) * CDSTREAM_SECTOR_SIZE, nil, FILE_BEGIN);
+#endif
+	
+	DWORD NumberOfBytesRead;
+	
+	if ( !ReadFile(hImage, buffer, size * CDSTREAM_SECTOR_SIZE, &NumberOfBytesRead, nil) )
+		return STREAM_NONE;
+	else
+		return STREAM_SUCCESS;
+}
+
+int32
+CdStreamGetStatus(int32 channel)
+{
+	ASSERT( channel < gNumChannels );
+	CdReadInfo *pChannel = &gpReadInfo[channel];
+	ASSERT( pChannel != nil );
+	
+	if ( _gbCdStreamAsync )
+	{
+		if ( pChannel->bReading )
+			return STREAM_READING;
+		
+		if ( pChannel->nSectorsToRead != 0 )
+			return STREAM_WAITING;
+		
+		if ( pChannel->nStatus != STREAM_NONE )
+		{
+			int32 status = pChannel->nStatus;
+			
+			pChannel->nStatus = STREAM_NONE;
+			
+			return status;
+		}
+		
+		return STREAM_NONE;
+	}
+	
+	if ( _gbCdStreamOverlapped )
+	{
+		ASSERT( pChannel->hFile != nil );
+		if ( WaitForSingleObjectEx(pChannel->hFile, 0, TRUE) == WAIT_OBJECT_0 )
+			return STREAM_NONE;
+		else
+			return STREAM_READING;
+	}
+	
+	return STREAM_NONE;
+}
+
+int32
+CdStreamGetLastPosn(void)
+{
+	return lastPosnRead;
+}
+
+// wait for channel to finish reading
+int32
+CdStreamSync(int32 channel)
+{
+	ASSERT( channel < gNumChannels );
+	CdReadInfo *pChannel = &gpReadInfo[channel];
+	ASSERT( pChannel != nil );
+	
+	if ( _gbCdStreamAsync )
+	{
+		if ( pChannel->nSectorsToRead != 0 )
+		{
+			pChannel->bLocked = true;
+
+			ASSERT( pChannel->pDoneSemaphore != nil );
+
+			// Deadlock fix 1
+#ifdef FIX_BUGS
+			// This is while loop on Posix streamer, for spurious wakeups
+			if (pChannel->bLocked && pChannel->nSectorsToRead != 0){
+				WaitForSingleObject(pChannel->pDoneSemaphore, INFINITE);
+			}
+			pChannel->bLocked = false;
+#else
+			WaitForSingleObject(pChannel->pDoneSemaphore, INFINITE);
+#endif
+		}
+
+		pChannel->bReading = false;
+		
+		return pChannel->nStatus;
+	}
+	
+	DWORD NumberOfBytesTransferred;
+
+	if ( _gbCdStreamOverlapped && pChannel->hFile )
+	{
+		ASSERT(pChannel->hFile != nil );
+		// Beware: This is blocking call (because of last parameter)
+		if ( GetOverlappedResult(pChannel->hFile, &pChannel->Overlapped, &NumberOfBytesTransferred, TRUE) )
+			return STREAM_NONE;
+		else
+			return STREAM_ERROR;
+	}
+	
+	return STREAM_NONE;
+}
+
+void
+AddToQueue(Queue *queue, int32 item)
+{
+	ASSERT( queue != nil );
+	ASSERT( queue->items != nil );
+	queue->items[queue->tail] = item;
+	
+	queue->tail = (queue->tail + 1) % queue->size;
+	
+	if ( queue->head == queue->tail )
+		debug("Queue is full\n");
+}
+
+int32 
+GetFirstInQueue(Queue *queue)
+{
+	ASSERT( queue != nil );
+	if ( queue->head == queue->tail )
+		return -1;
+
+	ASSERT( queue->items != nil );
+	return queue->items[queue->head];
+}
+
+void
+RemoveFirstInQueue(Queue *queue)
+{	
+	ASSERT( queue != nil );
+	if ( queue->head == queue->tail )
+	{
+		debug("Queue is empty\n");
+		return;
+	}
+
+	queue->head = (queue->head + 1) % queue->size;
+}
+
+DWORD
+WINAPI CdStreamThread(LPVOID lpThreadParameter)
+{
+	debug("Created cdstream thread\n");
+	
+	while ( true )
+	{
+		WaitForSingleObject(gCdStreamSema, INFINITE);
+		
+		int32 channel = GetFirstInQueue(&gChannelRequestQ);
+		ASSERT( channel < gNumChannels );
+		
+		CdReadInfo *pChannel = &gpReadInfo[channel];
+		ASSERT( pChannel != nil );
+		
+		pChannel->bReading = true;
+		
+		if ( pChannel->nStatus == STREAM_NONE )
+		{
+			if ( _gbCdStreamOverlapped )
+			{
+				pChannel->Overlapped.Offset = pChannel->nSectorOffset * CDSTREAM_SECTOR_SIZE;
+				
+				ASSERT(pChannel->hFile != nil );
+				ASSERT(pChannel->pBuffer != nil );
+				
+				DWORD NumberOfBytesTransferred;
+				
+				if ( ReadFile(pChannel->hFile,
+						pChannel->pBuffer,
+						pChannel->nSectorsToRead * CDSTREAM_SECTOR_SIZE,
+						NULL,
+						&pChannel->Overlapped) )
+				{
+					pChannel->nStatus = STREAM_NONE;
+				}
+				// Beware: This is blocking call (because of last parameter)
+				else if ( GetLastError() == ERROR_IO_PENDING
+						&& GetOverlappedResult(pChannel->hFile, &pChannel->Overlapped, &NumberOfBytesTransferred, TRUE) )
+				{
+					pChannel->nStatus = STREAM_NONE;
+				}
+				else
+				{
+					pChannel->nStatus = STREAM_ERROR;
+				}
+			}
+			else
+			{
+				ASSERT(pChannel->hFile != nil );
+				ASSERT(pChannel->pBuffer != nil );
+				
+				SetFilePointer(pChannel->hFile, pChannel->nSectorOffset * CDSTREAM_SECTOR_SIZE, nil, FILE_BEGIN);
+
+				DWORD NumberOfBytesRead;
+				if ( ReadFile(pChannel->hFile,
+						pChannel->pBuffer,
+						pChannel->nSectorsToRead * CDSTREAM_SECTOR_SIZE,
+						&NumberOfBytesRead,
+						NULL) )
+				{
+					pChannel->nStatus = STREAM_NONE;
+				}
+			}
+		}
+		
+		RemoveFirstInQueue(&gChannelRequestQ);
+		
+		pChannel->nSectorsToRead = 0;
+		
+		if ( pChannel->bLocked )
+		{
+			ASSERT( pChannel->pDoneSemaphore != nil );
+			// Deadlock fix 2
+#ifdef FIX_BUGS
+			pChannel->bLocked = 0;
+#endif
+			ReleaseSemaphore(pChannel->pDoneSemaphore, 1, NULL);
+		}
+		
+		pChannel->bReading = false;
+	}
+}
+
+bool
+CdStreamAddImage(char const *path)
+{
+	ASSERT(path != nil);
+	ASSERT(gNumImages < MAX_CDIMAGES);
+	
+	SetLastError(0);
+	
+	gImgFiles[gNumImages] = CreateFile(path,
+	                                   GENERIC_READ,
+	                                   FILE_SHARE_READ,
+	                                   nil,
+	                                   OPEN_EXISTING,
+	                                   _gdwCdStreamFlags | FILE_FLAG_RANDOM_ACCESS | FILE_ATTRIBUTE_READONLY,
+	                                   nil);
+	
+	ASSERT( gImgFiles[gNumImages] != nil );
+	if ( gImgFiles[gNumImages] == NULL )
+		return false;
+	
+	strcpy(gCdImageNames[gNumImages], path);
+	
+	gNumImages++;
+	
+	return true;
+}
+
+char *
+CdStreamGetImageName(int32 cd)
+{
+	ASSERT(cd < MAX_CDIMAGES);
+	if ( gImgFiles[cd] != nil )
+		return gCdImageNames[cd];
+	
+	return nil;
+}
+
+void
+CdStreamRemoveImages(void)
+{	
+	for ( int32 i = 0; i < gNumChannels; i++ )
+		CdStreamSync(i);
+	
+	for ( int32 i = 0; i < gNumImages; i++ )
+	{
+		SetLastError(0);
+		
+		CloseHandle(gImgFiles[i]);
+		gImgFiles[i] = nil;
+	}
+	
+	gNumImages = 0;
+}
+
+int32
+CdStreamGetNumImages(void)
+{	
+	return gNumImages;
+}
+#endif
diff --git a/src/core/CdStream.h b/src/core/CdStream.h
new file mode 100644
index 0000000..516cef4
--- /dev/null
+++ b/src/core/CdStream.h
@@ -0,0 +1,48 @@
+#pragma once
+
+#define CDSTREAM_SECTOR_SIZE 2048
+
+#define _GET_INDEX(a) (a >> 24)
+#define _GET_OFFSET(a)  (a & 0xFFFFFF)
+
+enum
+{
+	STREAM_NONE            = uint8( 0),
+	STREAM_SUCCESS         = uint8( 1),
+	STREAM_READING         = uint8(-1), // 0xFF,
+	STREAM_ERROR           = uint8(-2), // 0xFE,
+	STREAM_ERROR_NOCD      = uint8(-3), // 0xFD,
+	STREAM_ERROR_WRONGCD   = uint8(-4), // 0xFC,
+	STREAM_ERROR_OPENCD    = uint8(-5), // 0xFB,
+	STREAM_WAITING         = uint8(-6)  // 0xFA,
+};
+
+struct Queue
+{
+	int32 *items;
+	int32 head;
+	int32 tail;
+	int32 size;
+};
+
+VALIDATE_SIZE(Queue, 0x10);
+
+void CdStreamInitThread(void);
+void CdStreamInit(int32 numChannels);
+uint32 GetGTA3ImgSize(void);
+void CdStreamShutdown(void);
+int32 CdStreamRead(int32 channel, void *buffer, uint32 offset, uint32 size);
+int32 CdStreamGetStatus(int32 channel);
+int32 CdStreamGetLastPosn(void);
+int32 CdStreamSync(int32 channel);
+void AddToQueue(Queue *queue, int32 item);
+int32 GetFirstInQueue(Queue *queue);
+void RemoveFirstInQueue(Queue *queue);
+bool CdStreamAddImage(char const *path);
+char *CdStreamGetImageName(int32 cd);
+void CdStreamRemoveImages(void);
+int32 CdStreamGetNumImages(void);
+
+#ifdef FLUSHABLE_STREAMING
+extern bool flushStream[MAX_CDCHANNELS];
+#endif
diff --git a/src/core/CdStreamPosix.cpp b/src/core/CdStreamPosix.cpp
new file mode 100644
index 0000000..30fe06a
--- /dev/null
+++ b/src/core/CdStreamPosix.cpp
@@ -0,0 +1,603 @@
+#ifndef _WIN32
+#include "common.h"
+#include "crossplatform.h"
+#include <signal.h>
+#include <pthread.h>
+#include <semaphore.h>
+#include <sys/types.h>
+#include <unistd.h>
+#include <sys/time.h>
+#include <sys/statvfs.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <sys/resource.h>
+#include <stdarg.h>
+
+#ifdef __linux__
+#include <sys/syscall.h>
+#endif
+
+#include "CdStream.h"
+#include "rwcore.h"
+#include "MemoryMgr.h"
+
+#define CDDEBUG(f, ...)   debug ("%s: " f "\n", "cdvd_stream", ## __VA_ARGS__)
+#define CDTRACE(f, ...)   printf("%s: " f "\n", "cdvd_stream", ## __VA_ARGS__)
+
+#ifdef FLUSHABLE_STREAMING
+bool flushStream[MAX_CDCHANNELS];
+#endif
+
+#ifdef USE_UNNAMED_SEM
+
+#define RE3_SEM_OPEN(name, ...) re3_sem_open()
+sem_t*
+re3_sem_open(void)
+{
+	sem_t* sem = (sem_t*)malloc(sizeof(sem_t));
+	if (sem_init(sem, 0, 1) == -1) {
+		sem = SEM_FAILED;
+	}
+
+	return sem;
+}
+
+#define RE3_SEM_CLOSE(sem, format, ...) re3_sem_close(sem)
+void
+re3_sem_close(sem_t* sem)
+{
+	sem_destroy(sem);
+	free(sem);
+}
+
+#else
+
+#define RE3_SEM_OPEN re3_sem_open
+sem_t*
+re3_sem_open(const char* format, ...)
+{
+	char semName[21];
+	va_list va;
+	va_start(va, format);
+	vsprintf(semName, format, va);
+
+	return sem_open(semName, O_CREAT, 0644, 1);
+}
+
+#define RE3_SEM_CLOSE re3_sem_close
+void
+re3_sem_close(sem_t* sem, const char* format, ...)
+{
+	sem_close(sem);
+
+	char semName[21];
+	va_list va;
+	va_start(va, format);
+	vsprintf(semName, format, va);
+
+	sem_unlink(semName);
+}
+
+#endif
+
+struct CdReadInfo
+{
+	uint32 nSectorOffset;
+	uint32 nSectorsToRead;
+	void *pBuffer;
+	bool bLocked;
+	bool bReading;
+	int32 nStatus;
+#ifdef ONE_THREAD_PER_CHANNEL
+	int8 nThreadStatus; // 0: created 1:priority set up 2:abort now
+	pthread_t pChannelThread;
+	sem_t *pStartSemaphore;
+#endif
+	sem_t *pDoneSemaphore; // used for CdStreamSync
+	int32 hFile;
+};
+
+char gCdImageNames[MAX_CDIMAGES+1][64];
+int32 gNumImages;
+int32 gNumChannels;
+
+int32 gImgFiles[MAX_CDIMAGES]; // -1: error 0:unused otherwise: fd
+char *gImgNames[MAX_CDIMAGES];
+
+#ifndef ONE_THREAD_PER_CHANNEL
+pthread_t _gCdStreamThread;
+sem_t *gCdStreamSema; // released when we have new thing to read(so channel is set)
+int8 gCdStreamThreadStatus; // 0: created 1:priority set up 2:abort now
+Queue gChannelRequestQ;
+bool _gbCdStreamOverlapped;
+#endif
+
+CdReadInfo *gpReadInfo;
+
+int32 lastPosnRead;
+
+int _gdwCdStreamFlags;
+
+void *CdStreamThread(void* channelId);
+
+void
+CdStreamInitThread(void)
+{
+	int status;
+#ifndef ONE_THREAD_PER_CHANNEL
+	gChannelRequestQ.items = (int32 *)calloc(gNumChannels + 1, sizeof(int32));
+	gChannelRequestQ.head = 0;
+	gChannelRequestQ.tail = 0;
+	gChannelRequestQ.size = gNumChannels + 1;
+	ASSERT(gChannelRequestQ.items != nil );
+	gCdStreamSema = RE3_SEM_OPEN("/semaphore_cd_stream");
+
+
+	if (gCdStreamSema == SEM_FAILED) {
+		CDTRACE("failed to create stream semaphore");
+		ASSERT(0);
+		return;
+	}
+#endif
+
+	if ( gNumChannels > 0 )
+	{
+		for ( int32 i = 0; i < gNumChannels; i++ )
+		{
+			gpReadInfo[i].pDoneSemaphore = RE3_SEM_OPEN("/semaphore_done%d", i);
+
+			if (gpReadInfo[i].pDoneSemaphore == SEM_FAILED)
+			{
+				CDTRACE("failed to create sync semaphore");
+				ASSERT(0);
+				return;
+			}
+
+#ifdef ONE_THREAD_PER_CHANNEL
+			gpReadInfo[i].pStartSemaphore = RE3_SEM_OPEN("/semaphore_start%d", i);
+
+			if (gpReadInfo[i].pStartSemaphore == SEM_FAILED)
+			{
+				CDTRACE("failed to create start semaphore");
+				ASSERT(0);
+				return;
+			}
+			gpReadInfo[i].nThreadStatus = 0;
+			int *channelI = (int*)malloc(sizeof(int));
+			*channelI = i;
+			status = pthread_create(&gpReadInfo[i].pChannelThread, NULL, CdStreamThread, (void*)channelI);
+
+			if (status == -1)
+			{
+				CDTRACE("failed to create sync thread");
+				ASSERT(0);
+				return;
+			}
+#endif
+		}
+	}
+
+#ifndef ONE_THREAD_PER_CHANNEL
+	debug("Using one streaming thread for all channels\n");
+	gCdStreamThreadStatus = 0;
+	status = pthread_create(&_gCdStreamThread, NULL, CdStreamThread, nil);
+
+	if (status == -1)
+	{
+		CDTRACE("failed to create sync thread");
+		ASSERT(0);
+		return;
+	}
+#else
+	debug("Using separate streaming threads for each channel\n");
+#endif
+}
+
+void
+CdStreamInit(int32 numChannels)
+{
+	struct statvfs fsInfo;
+
+	if((statvfs("models/gta3.img", &fsInfo)) < 0)
+	{
+		CDTRACE("can't get filesystem info");
+		ASSERT(0);
+		return;
+	}
+#ifdef __linux__
+	_gdwCdStreamFlags = O_RDONLY | O_NOATIME;
+#else
+	_gdwCdStreamFlags = O_RDONLY;
+#endif
+	// People say it's slower
+/*
+	if ( fsInfo.f_bsize <= CDSTREAM_SECTOR_SIZE )
+	{
+		_gdwCdStreamFlags |= O_DIRECT;
+		debug("Using no buffered loading for streaming\n");
+	}
+*/
+	void *pBuffer = (void *)RwMallocAlign(CDSTREAM_SECTOR_SIZE, (RwUInt32)fsInfo.f_bsize);
+	ASSERT( pBuffer != nil );
+
+	gNumImages = 0;
+
+	gNumChannels = numChannels;
+	ASSERT( gNumChannels != 0 );
+
+	gpReadInfo = (CdReadInfo *)calloc(numChannels, sizeof(CdReadInfo));
+	ASSERT( gpReadInfo != nil );
+
+	CDDEBUG("read info %p", gpReadInfo);
+
+	CdStreamInitThread();
+
+	ASSERT( pBuffer != nil );
+	RwFreeAlign(pBuffer);
+}
+
+uint32
+GetGTA3ImgSize(void)
+{
+	ASSERT( gImgFiles[0] > 0 );
+	struct stat statbuf;
+
+	char path[PATH_MAX];
+	realpath(gImgNames[0], path);
+	if (stat(path, &statbuf) == -1) {
+		// Try case-insensitivity
+		char* real = casepath(gImgNames[0], false);
+		if (real)
+		{
+			realpath(real, path);
+			free(real);
+			if (stat(path, &statbuf) != -1)
+				goto ok;
+		}
+
+		CDTRACE("can't get size of gta3.img");
+		ASSERT(0);
+		return 0;
+	}
+	ok:
+	return (uint32)statbuf.st_size;
+}
+
+void
+CdStreamShutdown(void)
+{
+    // Destroying semaphores and free(gpReadInfo) will be done at threads
+#ifndef ONE_THREAD_PER_CHANNEL
+	gCdStreamThreadStatus = 2;
+	sem_post(gCdStreamSema);
+	pthread_join(_gCdStreamThread, nil);
+#else
+	for ( int32 i = 0; i < gNumChannels; i++ ) {
+		gpReadInfo[i].nThreadStatus = 2;
+		sem_post(gpReadInfo[i].pStartSemaphore);
+		pthread_join(gpReadInfo[i].pChannelThread, nil);
+	}
+#endif
+}
+
+
+int32
+CdStreamRead(int32 channel, void *buffer, uint32 offset, uint32 size)
+{
+	ASSERT( channel < gNumChannels );
+	ASSERT( buffer != nil );
+
+	lastPosnRead = size + offset;
+
+	ASSERT( _GET_INDEX(offset) < MAX_CDIMAGES );
+	int32 hImage = gImgFiles[_GET_INDEX(offset)];
+	ASSERT( hImage > 0 );
+
+	CdReadInfo *pChannel = &gpReadInfo[channel];
+	ASSERT( pChannel != nil );
+
+	if ( pChannel->nSectorsToRead != 0 || pChannel->bReading ) {
+		if (pChannel->hFile == hImage - 1 && pChannel->nSectorOffset == _GET_OFFSET(offset) && pChannel->nSectorsToRead >= size)
+			return STREAM_SUCCESS;
+#ifdef FLUSHABLE_STREAMING
+		flushStream[channel] = 1;
+		CdStreamSync(channel);
+#else
+		return STREAM_NONE;
+#endif
+	}
+
+	pChannel->hFile = hImage - 1;
+	pChannel->nStatus = STREAM_NONE;
+	pChannel->nSectorOffset = _GET_OFFSET(offset);
+	pChannel->nSectorsToRead = size;
+	pChannel->pBuffer = buffer;
+	pChannel->bLocked = 0;
+
+#ifndef ONE_THREAD_PER_CHANNEL
+	AddToQueue(&gChannelRequestQ, channel);
+	if ( sem_post(gCdStreamSema) != 0 )
+		printf("Signal Sema Error\n");
+#else
+	if ( sem_post(pChannel->pStartSemaphore) != 0 )
+		printf("Signal Sema Error\n");
+#endif
+
+	return STREAM_SUCCESS;
+}
+
+int32
+CdStreamGetStatus(int32 channel)
+{
+	ASSERT( channel < gNumChannels );
+	CdReadInfo *pChannel = &gpReadInfo[channel];
+	ASSERT( pChannel != nil );
+
+#ifdef ONE_THREAD_PER_CHANNEL
+	if (pChannel->nThreadStatus == 2)
+		return STREAM_NONE;
+#else
+	if (gCdStreamThreadStatus == 2)
+		return STREAM_NONE;
+#endif
+
+	if ( pChannel->bReading )
+		return STREAM_READING;
+
+	if ( pChannel->nSectorsToRead != 0 )
+		return STREAM_WAITING;
+
+	if ( pChannel->nStatus != STREAM_NONE )
+	{
+		int32 status = pChannel->nStatus;
+		pChannel->nStatus = STREAM_NONE;
+
+		return status;
+	}
+
+	return STREAM_NONE;
+}
+
+int32
+CdStreamGetLastPosn(void)
+{
+	return lastPosnRead;
+}
+
+// wait for channel to finish reading
+int32
+CdStreamSync(int32 channel)
+{
+	ASSERT( channel < gNumChannels );
+	CdReadInfo *pChannel = &gpReadInfo[channel];
+	ASSERT( pChannel != nil );
+
+#ifdef FLUSHABLE_STREAMING
+	if (flushStream[channel]) {
+		pChannel->nSectorsToRead = 0;
+#ifdef ONE_THREAD_PER_CHANNEL
+		pthread_kill(pChannel->pChannelThread, SIGUSR1);
+		if (pChannel->bReading) {
+			pChannel->bLocked = true;
+#else
+		if (pChannel->bReading) {
+			pChannel->bLocked = true;
+			pthread_kill(_gCdStreamThread, SIGUSR1);
+#endif
+			while (pChannel->bLocked)
+				sem_wait(pChannel->pDoneSemaphore);
+		}
+		pChannel->bReading = false;
+		flushStream[channel] = false;
+		return STREAM_NONE;
+	}
+#endif
+
+	if ( pChannel->nSectorsToRead != 0 )
+	{
+		pChannel->bLocked = true;
+		while (pChannel->bLocked && pChannel->nSectorsToRead != 0){
+			sem_wait(pChannel->pDoneSemaphore);
+		}
+		pChannel->bLocked = false;
+	}
+
+	pChannel->bReading = false;
+
+	return pChannel->nStatus;
+}
+
+void
+AddToQueue(Queue *queue, int32 item)
+{
+	ASSERT( queue != nil );
+	ASSERT( queue->items != nil );
+	queue->items[queue->tail] = item;
+
+	queue->tail = (queue->tail + 1) % queue->size;
+
+	if ( queue->head == queue->tail )
+		debug("Queue is full\n");
+}
+
+int32
+GetFirstInQueue(Queue *queue)
+{
+	ASSERT( queue != nil );
+	if ( queue->head == queue->tail )
+		return -1;
+
+	ASSERT( queue->items != nil );
+	return queue->items[queue->head];
+}
+
+void
+RemoveFirstInQueue(Queue *queue)
+{
+	ASSERT( queue != nil );
+	if ( queue->head == queue->tail )
+	{
+		debug("Queue is empty\n");
+		return;
+	}
+
+	queue->head = (queue->head + 1) % queue->size;
+}
+
+void *CdStreamThread(void *param)
+{
+	debug("Created cdstream thread\n");
+
+#ifndef ONE_THREAD_PER_CHANNEL
+	while (gCdStreamThreadStatus != 2) {
+		sem_wait(gCdStreamSema);
+
+		int32 channel = GetFirstInQueue(&gChannelRequestQ);
+		
+		// spurious wakeup
+		if (channel == -1)
+			continue;
+#else
+	int channel = *((int*)param);
+	while (gpReadInfo[channel].nThreadStatus != 2){
+		sem_wait(gpReadInfo[channel].pStartSemaphore);
+#endif
+
+		CdReadInfo *pChannel = &gpReadInfo[channel];
+		ASSERT( pChannel != nil );
+
+		// spurious wakeup or we sent interrupt signal for flushing
+		if(pChannel->nSectorsToRead == 0)
+			continue;
+
+		pChannel->bReading = true;
+
+		// Not standard POSIX :shrug:
+#ifdef __linux__
+#ifdef ONE_THREAD_PER_CHANNEL
+		if (gpReadInfo[channel].nThreadStatus == 0){
+			gpReadInfo[channel].nThreadStatus = 1;
+#else
+		if (gCdStreamThreadStatus == 0){
+			gCdStreamThreadStatus = 1;
+#endif
+			pid_t tid = syscall(SYS_gettid);
+			int ret = setpriority(PRIO_PROCESS, tid, getpriority(PRIO_PROCESS, getpid()) + 1);
+		}
+#endif
+		if ( pChannel->nStatus == STREAM_NONE )
+		{
+			ASSERT(pChannel->hFile >= 0);
+			ASSERT(pChannel->pBuffer != nil );
+
+			lseek(pChannel->hFile, (size_t)pChannel->nSectorOffset * (size_t)CDSTREAM_SECTOR_SIZE, SEEK_SET);
+			if (read(pChannel->hFile, pChannel->pBuffer, pChannel->nSectorsToRead * CDSTREAM_SECTOR_SIZE) == -1) {
+				// pChannel->nSectorsToRead == 0 at this point means we wanted to flush channel
+				// STREAM_WAITING is a little hack to make CStreaming not process this data
+				pChannel->nStatus = pChannel->nSectorsToRead == 0 ? STREAM_WAITING : STREAM_ERROR;
+			} else {
+				pChannel->nStatus = STREAM_NONE;
+			}
+		}
+
+#ifndef ONE_THREAD_PER_CHANNEL
+		RemoveFirstInQueue(&gChannelRequestQ);
+#endif
+
+		pChannel->nSectorsToRead = 0;
+		if ( pChannel->bLocked )
+		{
+			pChannel->bLocked = 0;
+			sem_post(pChannel->pDoneSemaphore);
+		}
+		pChannel->bReading = false;
+	}
+	char semName[20];
+#ifndef ONE_THREAD_PER_CHANNEL
+	for ( int32 i = 0; i < gNumChannels; i++ )
+	{
+		RE3_SEM_CLOSE(gpReadInfo[i].pDoneSemaphore, "/semaphore_done%d", i);
+	}
+	RE3_SEM_CLOSE(gCdStreamSema, "/semaphore_cd_stream");
+	free(gChannelRequestQ.items);
+#else
+	RE3_SEM_CLOSE(gpReadInfo[channel].pStartSemaphore, "/semaphore_start%d", channel);
+
+	RE3_SEM_CLOSE(gpReadInfo[channel].pDoneSemaphore, "/semaphore_done%d", channel);
+#endif
+	if (gpReadInfo)
+		free(gpReadInfo);
+	gpReadInfo = nil;
+	pthread_exit(nil);
+}
+
+bool
+CdStreamAddImage(char const *path)
+{
+	ASSERT(path != nil);
+	ASSERT(gNumImages < MAX_CDIMAGES);
+
+	gImgFiles[gNumImages] = open(path, _gdwCdStreamFlags);
+
+	// Fix case sensitivity and backslashes.
+	if (gImgFiles[gNumImages] == -1) {
+		char* real = casepath(path, false);
+		if (real)
+		{
+			gImgFiles[gNumImages] = open(real, _gdwCdStreamFlags);
+			free(real);
+		}
+	}
+
+	if ( gImgFiles[gNumImages] == -1 ) {
+		assert(false);
+		return false;
+	}
+
+	gImgNames[gNumImages] = strdup(path);
+	gImgFiles[gNumImages]++; // because -1: error 0: not used
+
+	strcpy(gCdImageNames[gNumImages], path);
+
+	gNumImages++;
+
+	return true;
+}
+
+char *
+CdStreamGetImageName(int32 cd)
+{
+	ASSERT(cd < MAX_CDIMAGES);
+	if ( gImgFiles[cd] > 0)
+		return gCdImageNames[cd];
+
+	return nil;
+}
+
+void
+CdStreamRemoveImages(void)
+{
+	for ( int32 i = 0; i < gNumChannels; i++ ) {
+#ifdef FLUSHABLE_STREAMING
+		flushStream[i] = 1;
+#endif
+		CdStreamSync(i);
+	}
+
+	for ( int32 i = 0; i < gNumImages; i++ )
+	{
+		close(gImgFiles[i] - 1);
+		free(gImgNames[i]);
+		gImgFiles[i] = 0;
+	}
+
+	gNumImages = 0;
+}
+
+int32
+CdStreamGetNumImages(void)
+{
+	return gNumImages;
+}
+#endif
diff --git a/src/core/Clock.cpp b/src/core/Clock.cpp
new file mode 100644
index 0000000..a329834
--- /dev/null
+++ b/src/core/Clock.cpp
@@ -0,0 +1,136 @@
+#include "common.h"
+
+#include "Timer.h"
+#include "Pad.h"
+#include "Clock.h"
+#include "Stats.h"
+#include "VarConsole.h"
+
+_TODO("gbFastTime");
+bool gbFastTime;
+
+uint8  CClock::ms_nGameClockHours;
+uint8  CClock::ms_nGameClockMinutes;
+uint16 CClock::ms_nGameClockSeconds;
+uint8  CClock::ms_Stored_nGameClockHours;
+uint8  CClock::ms_Stored_nGameClockMinutes;
+uint16 CClock::ms_Stored_nGameClockSeconds;
+uint32 CClock::ms_nMillisecondsPerGameMinute;
+uint32  CClock::ms_nLastClockTick;
+bool   CClock::ms_bClockHasBeenStored;
+
+#ifndef MASTER
+bool gbFreezeTime;
+#endif
+
+void
+CClock::Initialise(uint32 scale)
+{
+	debug("Initialising CClock...\n");
+	ms_nGameClockHours = 12;
+	ms_nGameClockMinutes = 0;
+	ms_nGameClockSeconds = 0;
+	ms_nMillisecondsPerGameMinute = scale;
+	ms_nLastClockTick = CTimer::GetTimeInMilliseconds();
+	ms_bClockHasBeenStored = false;
+	debug("CClock ready\n");
+#ifndef MASTER
+	VarConsole.Add("Time (hour of day)", &ms_nGameClockHours, 1, 0, 23, true);
+	VarConsole.Add("Freeze time", &gbFreezeTime, true);
+#endif
+}
+
+void
+CClock::Update(void)
+{
+	if(CPad::GetPad(1)->GetRightShoulder1())
+	{
+		ms_nGameClockMinutes += 8;
+		ms_nLastClockTick = CTimer::GetTimeInMilliseconds();
+		
+		if(ms_nGameClockMinutes >= 60)
+		{
+			ms_nGameClockHours++;
+			ms_nGameClockMinutes = 0;
+			if(ms_nGameClockHours >= 24)
+				ms_nGameClockHours = 0;
+		}
+		
+	}
+#ifndef MASTER
+	else if (gbFreezeTime)
+		ms_nLastClockTick = CTimer::GetTimeInMilliseconds();
+#endif
+	else if(CTimer::GetTimeInMilliseconds() - ms_nLastClockTick > ms_nMillisecondsPerGameMinute || gbFastTime)
+	{
+		ms_nGameClockMinutes++;
+		ms_nLastClockTick += ms_nMillisecondsPerGameMinute;
+		
+		if ( gbFastTime )
+			ms_nLastClockTick = CTimer::GetTimeInMilliseconds();
+		
+		if(ms_nGameClockMinutes >= 60)
+		{
+			ms_nGameClockHours++;
+			ms_nGameClockMinutes = 0;
+			if(ms_nGameClockHours >= 24)
+			{
+				CStats::DaysPassed++;
+				ms_nGameClockHours = 0;
+			}
+		}
+	}
+	ms_nGameClockSeconds = 60 * (CTimer::GetTimeInMilliseconds() - ms_nLastClockTick) / ms_nMillisecondsPerGameMinute;
+}
+
+void
+CClock::SetGameClock(uint8 h, uint8 m)
+{
+	while (m >= 60) {
+		m -= 60;
+		h++;
+	}
+	ms_nGameClockMinutes = m;
+	while (h >= 24)
+		h -= 24;
+	ms_nGameClockHours = h;
+	ms_nGameClockSeconds = 0;
+	ms_nLastClockTick = CTimer::GetTimeInMilliseconds();
+}
+
+int32
+CClock::GetGameClockMinutesUntil(uint8 h, uint8 m)
+{
+	int32 now, then;
+	now = ms_nGameClockHours*60 + ms_nGameClockMinutes;
+	then = h*60 + m;
+	if(then < now)
+		then += 24*60;
+	return then-now;
+}
+
+bool
+CClock::GetIsTimeInRange(uint8 h1, uint8 h2)
+{
+	if(h1 > h2)
+		return ms_nGameClockHours >= h1 || ms_nGameClockHours < h2;
+	else
+		return ms_nGameClockHours >= h1 && ms_nGameClockHours < h2;
+}
+
+void
+CClock::StoreClock(void)
+{
+	ms_Stored_nGameClockHours = ms_nGameClockHours;
+	ms_Stored_nGameClockMinutes = ms_nGameClockMinutes;
+	ms_Stored_nGameClockSeconds = ms_nGameClockSeconds;
+	ms_bClockHasBeenStored = true;
+}
+
+void
+CClock::RestoreClock(void)
+{
+	ms_nGameClockHours = ms_Stored_nGameClockHours;
+	ms_nGameClockMinutes = ms_Stored_nGameClockMinutes;
+	ms_nGameClockSeconds = ms_Stored_nGameClockSeconds;
+}
diff --git a/src/core/Clock.h b/src/core/Clock.h
new file mode 100644
index 0000000..a611cd5
--- /dev/null
+++ b/src/core/Clock.h
@@ -0,0 +1,31 @@
+#pragma once
+
+class CClock
+{
+public:
+	static uint8  ms_nGameClockHours;
+	static uint8  ms_nGameClockMinutes;
+	static uint16 ms_nGameClockSeconds;
+	static uint8  ms_Stored_nGameClockHours;
+	static uint8  ms_Stored_nGameClockMinutes;
+	static uint16 ms_Stored_nGameClockSeconds;
+	static uint32 ms_nMillisecondsPerGameMinute;
+	static uint32 ms_nLastClockTick;
+	static bool   ms_bClockHasBeenStored;
+
+	static void Initialise(uint32 scale);
+	static void Update(void);
+	static void SetGameClock(uint8 h, uint8 m);
+	static int32 GetGameClockMinutesUntil(uint8 h, uint8 m);
+	static bool GetIsTimeInRange(uint8 h1, uint8 h2);
+	static void StoreClock(void);
+	static void RestoreClock(void);
+
+	static uint8 GetHours(void) { return ms_nGameClockHours; }
+	static uint8 GetMinutes(void) { return ms_nGameClockMinutes; }
+	static int16 GetSeconds(void) { return ms_nGameClockSeconds; }
+
+
+	static uint8 &GetHoursRef(void) { return ms_nGameClockHours; }
+	static uint8 &GetMinutesRef(void) { return ms_nGameClockMinutes; }
+};
diff --git a/src/core/ControllerConfig.cpp b/src/core/ControllerConfig.cpp
new file mode 100644
index 0000000..72d3113
--- /dev/null
+++ b/src/core/ControllerConfig.cpp
@@ -0,0 +1,2904 @@
+#define WITHDINPUT
+#include "common.h"
+#include "platform.h"
+#include "crossplatform.h"
+#include "ControllerConfig.h"
+#include "Pad.h"
+#include "FileMgr.h"
+#include "Text.h"
+#include "Font.h"
+#include "Messages.h"
+#include "Frontend.h"
+#include "Ped.h"
+#include "PlayerPed.h"
+#include "Vehicle.h"
+#include "World.h"
+#include "ModelIndices.h"
+#include "Camera.h"
+#include "GenericGameStorage.h"
+
+CControllerConfigManager ControlsManager;
+
+CControllerConfigManager::CControllerConfigManager()
+{
+	m_bFirstCapture    = false;
+	m_bMouseAssociated = false;
+
+	MakeControllerActionsBlank();
+	InitDefaultControlConfiguration();
+	InitialiseControllerActionNameArray();
+}
+
+void CControllerConfigManager::MakeControllerActionsBlank()
+{
+#ifdef LOAD_INI_SETTINGS
+	ms_padButtonsInited = 0;
+#endif
+	for (int32 i = 0; i < MAX_CONTROLLERTYPES; i++)
+	{
+		for (int32 j = 0; j < MAX_CONTROLLERACTIONS; j++)
+		{
+			ClearSettingsAssociatedWithAction((e_ControllerAction)j, (eControllerType)i);
+		}
+	}
+}
+
+#ifdef RW_GL3
+int MapIdToButtonId(int mapId) {
+	switch (mapId) {
+		case GLFW_GAMEPAD_BUTTON_A: // Cross
+			return 2;
+		case GLFW_GAMEPAD_BUTTON_B: // Circle
+			return 1;
+		case GLFW_GAMEPAD_BUTTON_X: // Square
+			return 3;
+		case GLFW_GAMEPAD_BUTTON_Y: // Triangle
+			return 4;
+		case GLFW_GAMEPAD_BUTTON_LEFT_BUMPER:
+			return 7;
+		case GLFW_GAMEPAD_BUTTON_RIGHT_BUMPER:
+			return 8;
+		case GLFW_GAMEPAD_BUTTON_BACK:
+			return 9;
+		case GLFW_GAMEPAD_BUTTON_START:
+			return 12;
+		case GLFW_GAMEPAD_BUTTON_LEFT_THUMB:
+			return 10;
+		case GLFW_GAMEPAD_BUTTON_RIGHT_THUMB:
+			return 11;
+		case GLFW_GAMEPAD_BUTTON_DPAD_UP:
+			return 13;
+		case GLFW_GAMEPAD_BUTTON_DPAD_RIGHT:
+			return 14;
+		case GLFW_GAMEPAD_BUTTON_DPAD_DOWN:
+			return 15;
+		case GLFW_GAMEPAD_BUTTON_DPAD_LEFT:
+			return 16;
+		// GLFW sends those as axes, so I added them here manually.
+		case 15: // Left trigger
+			return 5;
+		case 16: // Right trigger
+			return 6;
+		default:
+			return 0;
+	}
+}
+#endif
+
+int32 CControllerConfigManager::GetJoyButtonJustDown()
+{
+#ifdef __DINPUT_INCLUDED__
+#ifdef FIX_BUGS
+	for (int32 i = 0; i < MAX_BUTTONS; i++)
+#else
+	for (int32 i = 0; i < JOY_BUTTONS; i++)
+#endif
+	{
+		if (m_NewState.rgbButtons[i] & 0x80 && !(m_OldState.rgbButtons[i] & 0x80))
+			return i + 1;
+	}
+#elif defined RW_GL3
+	if (m_NewState.isGamepad) {
+		for (int32 i = 0; i < MAX_BUTTONS; i++) {
+			if (m_NewState.mappedButtons[i] && !(m_OldState.mappedButtons[i]))
+				return MapIdToButtonId(i);
+		}
+	} else {
+		for (int32 i = 0; i < Min(m_NewState.numButtons, MAX_BUTTONS); i++) {
+			if (m_NewState.buttons[i] && !(m_OldState.buttons[i]))
+				return i + 1;
+		}
+	}
+#endif
+	return 0;
+}
+
+void CControllerConfigManager::SaveSettings(int32 file)
+{
+	if (file)
+	{
+		for (int32 i = 0; i < MAX_CONTROLLERTYPES; i++)
+		{
+			for (int32 j = 0; j < MAX_CONTROLLERACTIONS; j++)
+			{
+				CFileMgr::Write(file, (char *)&ControlsManager.m_aSettings[j][i], sizeof(tControllerConfigBind));
+			}
+		}
+	}
+}
+
+void CControllerConfigManager::LoadSettings(int32 file)
+{
+	bool bValid = true;
+	int nVersion = 0;
+#ifdef BIND_VEHICLE_FIREWEAPON
+	bool skipVehicleFireWeapon = false;
+#endif
+
+	if (file)
+	{
+		char buff[29];
+		CFileMgr::Read(file, buff, sizeof(buff));
+
+		if (!strncmp(buff, TopLineEmptyFile, sizeof(TopLineEmptyFile)-1))
+			bValid = false;
+		else {
+			CFileMgr::Seek(file, 0, 0);
+			CFileMgr::Read(file, (char*)&nVersion, sizeof(nVersion));
+		}
+	}
+
+	if (bValid && nVersion >= 3)
+	{
+		ControlsManager.MakeControllerActionsBlank();
+#ifdef BIND_VEHICLE_FIREWEAPON
+		skipVehicleFireWeapon = nVersion < 4;
+		// Set the default settings of VEHICLE_FIREWEAPON
+		if (skipVehicleFireWeapon) {
+			SetControllerKeyAssociatedWithAction(VEHICLE_FIREWEAPON, rsPADINS, KEYBOARD);
+			SetControllerKeyAssociatedWithAction(VEHICLE_FIREWEAPON, rsLCTRL, OPTIONAL_EXTRA);
+			if (m_bMouseAssociated)
+				SetMouseButtonAssociatedWithAction(VEHICLE_FIREWEAPON, 1);
+		}
+#endif
+
+		for (int32 i = 0; i < MAX_CONTROLLERTYPES; i++)
+		{
+			for (int32 j = 0; j < MAX_CONTROLLERACTIONS; j++)
+			{
+#ifdef BIND_VEHICLE_FIREWEAPON
+				// Skip file read
+				if (skipVehicleFireWeapon && j == VEHICLE_FIREWEAPON)
+					continue;
+#endif
+				CFileMgr::Read(file, (char *)&ControlsManager.m_aSettings[j][i], sizeof(tControllerConfigBind));
+			}
+		}
+	}
+}
+
+void CControllerConfigManager::InitDefaultControlConfiguration()
+{
+	SetControllerKeyAssociatedWithAction    (VEHICLE_LOOKLEFT,                    rsPADEND,   KEYBOARD);
+	SetControllerKeyAssociatedWithAction    (VEHICLE_LOOKLEFT,                    'Q',        OPTIONAL_EXTRA);
+										    						              
+	SetControllerKeyAssociatedWithAction    (VEHICLE_LOOKRIGHT,                   rsPADDOWN,  KEYBOARD);
+	SetControllerKeyAssociatedWithAction    (VEHICLE_LOOKRIGHT,                   'E',        OPTIONAL_EXTRA);
+																              
+	if ( _dwOperatingSystemVersion == OS_WIN98 )											              
+		SetControllerKeyAssociatedWithAction(VEHICLE_HORN,                        rsSHIFT,    OPTIONAL_EXTRA); // BUG: must be KEYBOARD ?											              
+	else		
+	{
+		SetControllerKeyAssociatedWithAction(VEHICLE_HORN,                        rsLSHIFT,   OPTIONAL_EXTRA);
+		SetControllerKeyAssociatedWithAction(VEHICLE_HORN,                        rsRSHIFT,   KEYBOARD);
+	}													              
+																	              
+	SetControllerKeyAssociatedWithAction    (VEHICLE_HANDBRAKE,                   rsRCTRL,    KEYBOARD);
+	SetControllerKeyAssociatedWithAction    (VEHICLE_HANDBRAKE,                   ' ',        OPTIONAL_EXTRA);
+															                      
+	SetControllerKeyAssociatedWithAction    (VEHICLE_ENTER_EXIT,                  rsENTER,    KEYBOARD);
+	SetControllerKeyAssociatedWithAction    (VEHICLE_ENTER_EXIT,                  'F',        OPTIONAL_EXTRA);
+										    					                  
+	SetControllerKeyAssociatedWithAction    (VEHICLE_ACCELERATE,                  rsUP,       KEYBOARD);
+	SetControllerKeyAssociatedWithAction    (VEHICLE_ACCELERATE,                  'W',        OPTIONAL_EXTRA);
+																		          
+	SetControllerKeyAssociatedWithAction    (VEHICLE_CHANGE_RADIO_STATION,        rsINS,      KEYBOARD);
+	SetControllerKeyAssociatedWithAction    (VEHICLE_CHANGE_RADIO_STATION,        'R',        OPTIONAL_EXTRA);
+																		          
+	SetControllerKeyAssociatedWithAction    (VEHICLE_BRAKE,                       rsDOWN,     KEYBOARD);
+	SetControllerKeyAssociatedWithAction    (VEHICLE_BRAKE,                       'S',        OPTIONAL_EXTRA);
+																		          
+	SetControllerKeyAssociatedWithAction    (TOGGLE_SUBMISSIONS,                  rsPLUS,     KEYBOARD);
+	SetControllerKeyAssociatedWithAction    (TOGGLE_SUBMISSIONS,                  rsCAPSLK,   OPTIONAL_EXTRA);
+																		          
+	SetControllerKeyAssociatedWithAction    (GO_LEFT,                             rsLEFT,     KEYBOARD);
+	SetControllerKeyAssociatedWithAction    (GO_LEFT,                             'A',        OPTIONAL_EXTRA);
+																		          
+	SetControllerKeyAssociatedWithAction    (GO_RIGHT,                            rsRIGHT,    KEYBOARD);
+	SetControllerKeyAssociatedWithAction    (GO_RIGHT,                            'D',        OPTIONAL_EXTRA);
+																		          
+	SetControllerKeyAssociatedWithAction    (GO_FORWARD,                          rsUP,       KEYBOARD);
+	SetControllerKeyAssociatedWithAction    (GO_FORWARD,                          'W',        OPTIONAL_EXTRA);
+																		          
+	SetControllerKeyAssociatedWithAction    (GO_BACK,                             rsDOWN,     KEYBOARD);
+	SetControllerKeyAssociatedWithAction    (GO_BACK,                             'S',        OPTIONAL_EXTRA);
+
+	SetControllerKeyAssociatedWithAction    (NETWORK_TALK,                        'T',        KEYBOARD);
+																		          
+	SetControllerKeyAssociatedWithAction    (PED_LOOKBEHIND,                      rsPADEND,   KEYBOARD);
+	SetControllerKeyAssociatedWithAction    (PED_LOOKBEHIND,                      rsCAPSLK,   OPTIONAL_EXTRA);
+
+	SetControllerKeyAssociatedWithAction    (PED_DUCK,                            'C',        KEYBOARD);
+																		          
+	SetControllerKeyAssociatedWithAction    (PED_FIREWEAPON,                      rsPADINS,   KEYBOARD);
+	SetControllerKeyAssociatedWithAction    (PED_FIREWEAPON,                      rsLCTRL,    OPTIONAL_EXTRA);
+#ifdef BIND_VEHICLE_FIREWEAPON
+	SetControllerKeyAssociatedWithAction    (VEHICLE_FIREWEAPON,                  rsPADINS,   KEYBOARD);
+	SetControllerKeyAssociatedWithAction    (VEHICLE_FIREWEAPON,                  rsLCTRL,    OPTIONAL_EXTRA);
+#endif
+	SetControllerKeyAssociatedWithAction    (PED_CYCLE_WEAPON_LEFT,               rsPADDEL,   KEYBOARD);
+
+	SetControllerKeyAssociatedWithAction    (PED_CYCLE_WEAPON_RIGHT,              rsPADENTER, OPTIONAL_EXTRA); // BUG: must be KEYBOARD ?
+																		          
+	SetControllerKeyAssociatedWithAction    (PED_LOCK_TARGET,                     rsDEL,      KEYBOARD);
+																		          
+	SetControllerKeyAssociatedWithAction    (PED_JUMPING,                         rsRCTRL,    KEYBOARD);
+	SetControllerKeyAssociatedWithAction    (PED_JUMPING,                         ' ',        OPTIONAL_EXTRA);
+
+	SetControllerKeyAssociatedWithAction    (PED_ANSWER_PHONE,                    rsTAB,      KEYBOARD);
+																              
+	if ( _dwOperatingSystemVersion == OS_WIN98 )											              
+		SetControllerKeyAssociatedWithAction(PED_SPRINT,                          rsSHIFT,    OPTIONAL_EXTRA); // BUG: must be KEYBOARD ?											              
+	else		
+	{
+		SetControllerKeyAssociatedWithAction(PED_SPRINT,                          rsLSHIFT,   OPTIONAL_EXTRA);
+#ifndef FIX_BUGS
+		SetControllerKeyAssociatedWithAction(PED_SPRINT,                          rsRSHIFT,   OPTIONAL_EXTRA); // BUG: must be KEYBOARD
+#else
+		SetControllerKeyAssociatedWithAction(PED_SPRINT,                          rsRSHIFT,   KEYBOARD);
+#endif
+	}
+
+	SetControllerKeyAssociatedWithAction    (PED_CYCLE_TARGET_LEFT,               '[',        KEYBOARD);
+
+	SetControllerKeyAssociatedWithAction    (PED_CYCLE_TARGET_RIGHT,              ']',        OPTIONAL_EXTRA); // BUG: must be KEYBOARD ?
+																			      
+	SetControllerKeyAssociatedWithAction    (PED_CENTER_CAMERA_BEHIND_PLAYER,     '#',        KEYBOARD);
+	
+	SetControllerKeyAssociatedWithAction    (PED_SNIPER_ZOOM_IN,                  rsPGUP,     KEYBOARD);
+	SetControllerKeyAssociatedWithAction    (PED_SNIPER_ZOOM_IN,                  'Z',        OPTIONAL_EXTRA);
+										    
+	SetControllerKeyAssociatedWithAction    (PED_SNIPER_ZOOM_OUT,                 rsPGDN,     KEYBOARD);
+	SetControllerKeyAssociatedWithAction    (PED_SNIPER_ZOOM_OUT,                 'X',        OPTIONAL_EXTRA);
+										    
+	SetControllerKeyAssociatedWithAction    (PED_1RST_PERSON_LOOK_LEFT,           rsPADLEFT,  KEYBOARD);
+
+	SetControllerKeyAssociatedWithAction    (PED_1RST_PERSON_LOOK_RIGHT,          rsPADRIGHT, KEYBOARD);
+										    
+	SetControllerKeyAssociatedWithAction    (PED_1RST_PERSON_LOOK_UP,             rsPADUP,    KEYBOARD);
+
+	SetControllerKeyAssociatedWithAction    (PED_1RST_PERSON_LOOK_DOWN,           rsPAD5,     KEYBOARD);
+										    
+	SetControllerKeyAssociatedWithAction    (VEHICLE_TURRETLEFT,                  rsPADLEFT,  KEYBOARD);
+
+	SetControllerKeyAssociatedWithAction    (VEHICLE_TURRETRIGHT,                 rsPAD5,     KEYBOARD);
+										    
+	SetControllerKeyAssociatedWithAction    (VEHICLE_TURRETUP,                    rsPADPGUP,  KEYBOARD);
+
+	SetControllerKeyAssociatedWithAction    (VEHICLE_TURRETDOWN,                  rsPADRIGHT, KEYBOARD);
+										    
+	SetControllerKeyAssociatedWithAction    (CAMERA_CHANGE_VIEW_ALL_SITUATIONS,   rsHOME,     KEYBOARD);
+	SetControllerKeyAssociatedWithAction    (CAMERA_CHANGE_VIEW_ALL_SITUATIONS,   'V',        OPTIONAL_EXTRA);
+
+	for (int32 i = 0; i < MAX_SIMS; i++)
+	{
+		m_aSimCheckers[i][KEYBOARD]       = false;
+		m_aSimCheckers[i][OPTIONAL_EXTRA] = false;
+		m_aSimCheckers[i][MOUSE]          = false;
+		m_aSimCheckers[i][JOYSTICK]       = false;
+	}
+}
+
+void CControllerConfigManager::InitDefaultControlConfigMouse(CMouseControllerState const &availableButtons)
+{
+	if (availableButtons.LMB)
+	{
+		m_bMouseAssociated = true;
+		SetMouseButtonAssociatedWithAction(PED_FIREWEAPON,               1);
+#ifdef BIND_VEHICLE_FIREWEAPON	
+		SetMouseButtonAssociatedWithAction(VEHICLE_FIREWEAPON,           1);
+#endif
+	}
+
+	if (availableButtons.RMB)
+	{
+		SetMouseButtonAssociatedWithAction(PED_LOCK_TARGET,              3);
+
+		SetMouseButtonAssociatedWithAction(VEHICLE_HANDBRAKE,            3);
+	}
+
+	if (availableButtons.MMB)
+	{
+		SetMouseButtonAssociatedWithAction(VEHICLE_LOOKBEHIND,           2);
+
+		SetMouseButtonAssociatedWithAction(PED_LOOKBEHIND,               2);
+	}
+
+	if (availableButtons.WHEELUP || availableButtons.WHEELDN)
+	{
+		SetMouseButtonAssociatedWithAction(PED_CYCLE_WEAPON_LEFT,        4);
+
+		SetMouseButtonAssociatedWithAction(PED_CYCLE_WEAPON_RIGHT,       5);
+
+		SetMouseButtonAssociatedWithAction(VEHICLE_CHANGE_RADIO_STATION, 4);
+
+		SetMouseButtonAssociatedWithAction(PED_SNIPER_ZOOM_IN, 4);
+
+		SetMouseButtonAssociatedWithAction(PED_SNIPER_ZOOM_OUT, 5);
+	}
+}
+
+#ifdef LOAD_INI_SETTINGS
+uint32 CControllerConfigManager::ms_padButtonsInited = 0;
+#endif
+
+void CControllerConfigManager::InitDefaultControlConfigJoyPad(uint32 buttons)
+{
+#ifdef XINPUT
+	// No manual bindings for you, honey.
+	return;
+#endif
+
+	m_bFirstCapture = true;
+
+	uint32 btn = buttons;
+	if (buttons > 16)
+		btn = 16;
+
+#ifdef LOAD_INI_SETTINGS
+	uint32 buttonMin = ms_padButtonsInited;
+	if (buttonMin >= btn)
+		return;
+
+	ms_padButtonsInited = btn;
+
+	#define IF_BTN_IN_RANGE(n) \
+		case n: \
+		if (n <= buttonMin) \
+			return;
+#else
+	#define IF_BTN_IN_RANGE(n) \
+		case n:
+#endif
+
+	// Now we use SDL Game Controller DB
+#if defined RW_D3D9 || defined RWLIBS
+	if (   AllValidWinJoys.m_aJoys[JOYSTICK1].m_nVendorID == 0x3427
+		&& AllValidWinJoys.m_aJoys[JOYSTICK1].m_nProductID == 0x1190)
+#else
+	if (0)
+#endif
+	{
+		//GIC USB Joystick, PS2 Gamepad ?
+
+		switch (btn)
+		{
+		IF_BTN_IN_RANGE(16)
+			SetControllerKeyAssociatedWithAction(GO_LEFT,                           16, JOYSTICK);
+		IF_BTN_IN_RANGE(15)											                        
+			SetControllerKeyAssociatedWithAction(GO_BACK,                           15, JOYSTICK);
+		IF_BTN_IN_RANGE(14)											                        
+			SetControllerKeyAssociatedWithAction(GO_RIGHT,                          14, JOYSTICK);
+		IF_BTN_IN_RANGE(13)											                        
+			SetControllerKeyAssociatedWithAction(GO_FORWARD,                        13, JOYSTICK);
+		IF_BTN_IN_RANGE(12)													                
+		IF_BTN_IN_RANGE(11)													                
+			SetControllerKeyAssociatedWithAction(PED_LOOKBEHIND,                    11, JOYSTICK);
+			SetControllerKeyAssociatedWithAction(TOGGLE_SUBMISSIONS,                11, JOYSTICK);
+		IF_BTN_IN_RANGE(10)
+			SetControllerKeyAssociatedWithAction(VEHICLE_HORN,                      10, JOYSTICK);
+			SetControllerKeyAssociatedWithAction(PED_DUCK,                          10, JOYSTICK);
+		IF_BTN_IN_RANGE(9)
+			SetControllerKeyAssociatedWithAction(CAMERA_CHANGE_VIEW_ALL_SITUATIONS,  9, JOYSTICK);
+		IF_BTN_IN_RANGE(8)
+			SetControllerKeyAssociatedWithAction(VEHICLE_HANDBRAKE,                  8, JOYSTICK);
+			SetControllerKeyAssociatedWithAction(PED_LOCK_TARGET,                    8, JOYSTICK);
+		IF_BTN_IN_RANGE(7)
+			SetControllerKeyAssociatedWithAction(PED_ANSWER_PHONE,                   7, JOYSTICK);
+			SetControllerKeyAssociatedWithAction(VEHICLE_CHANGE_RADIO_STATION,       7, JOYSTICK);
+		IF_BTN_IN_RANGE(6)
+			SetControllerKeyAssociatedWithAction(PED_CYCLE_WEAPON_RIGHT,             6, JOYSTICK);
+			SetControllerKeyAssociatedWithAction(VEHICLE_LOOKRIGHT,                  6, JOYSTICK);
+		IF_BTN_IN_RANGE(5)
+			SetControllerKeyAssociatedWithAction(PED_CYCLE_WEAPON_LEFT,              5, JOYSTICK);
+			SetControllerKeyAssociatedWithAction(VEHICLE_LOOKLEFT,                   5, JOYSTICK);
+		/*******************************************************************************************/
+		IF_BTN_IN_RANGE(4)
+			SetControllerKeyAssociatedWithAction(VEHICLE_BRAKE,                      4, JOYSTICK);
+			SetControllerKeyAssociatedWithAction(PED_JUMPING,                        4, JOYSTICK);
+			SetControllerKeyAssociatedWithAction(PED_SNIPER_ZOOM_IN,                 4, JOYSTICK);
+		IF_BTN_IN_RANGE(3)
+			SetControllerKeyAssociatedWithAction(VEHICLE_ACCELERATE,                 3, JOYSTICK);
+			SetControllerKeyAssociatedWithAction(PED_SPRINT,                         3, JOYSTICK);
+			SetControllerKeyAssociatedWithAction(PED_SNIPER_ZOOM_OUT,                3, JOYSTICK);
+		IF_BTN_IN_RANGE(2)
+			SetControllerKeyAssociatedWithAction(PED_FIREWEAPON,                     2, JOYSTICK);
+#ifdef BIND_VEHICLE_FIREWEAPON	
+			SetControllerKeyAssociatedWithAction(VEHICLE_FIREWEAPON,                 2, JOYSTICK);
+#endif
+		IF_BTN_IN_RANGE(1)
+			SetControllerKeyAssociatedWithAction(VEHICLE_ENTER_EXIT,                 1, JOYSTICK);
+		/*******************************************************************************************/
+		}
+	}
+	else
+	{
+		switch (btn)
+		{
+		IF_BTN_IN_RANGE(16)
+			SetControllerKeyAssociatedWithAction(GO_LEFT,                           16, JOYSTICK);
+		IF_BTN_IN_RANGE(15)
+			SetControllerKeyAssociatedWithAction(GO_BACK,                           15, JOYSTICK);
+		IF_BTN_IN_RANGE(14)
+			SetControllerKeyAssociatedWithAction(GO_RIGHT,                          14, JOYSTICK);
+		IF_BTN_IN_RANGE(13)
+			SetControllerKeyAssociatedWithAction(GO_FORWARD,                        13, JOYSTICK);
+		IF_BTN_IN_RANGE(12)
+		IF_BTN_IN_RANGE(11)
+			SetControllerKeyAssociatedWithAction(PED_LOOKBEHIND,                    11, JOYSTICK);
+			SetControllerKeyAssociatedWithAction(TOGGLE_SUBMISSIONS,                11, JOYSTICK);
+		IF_BTN_IN_RANGE(10)
+			SetControllerKeyAssociatedWithAction(VEHICLE_HORN,                      10, JOYSTICK);
+			SetControllerKeyAssociatedWithAction(PED_DUCK,                          10, JOYSTICK);
+		IF_BTN_IN_RANGE(9)
+			SetControllerKeyAssociatedWithAction(CAMERA_CHANGE_VIEW_ALL_SITUATIONS,  9, JOYSTICK);
+		IF_BTN_IN_RANGE(8)
+			SetControllerKeyAssociatedWithAction(VEHICLE_HANDBRAKE,                  8, JOYSTICK);
+			SetControllerKeyAssociatedWithAction(PED_LOCK_TARGET,                    8, JOYSTICK);
+		IF_BTN_IN_RANGE(7)
+			SetControllerKeyAssociatedWithAction(PED_ANSWER_PHONE,                   7, JOYSTICK);
+			SetControllerKeyAssociatedWithAction(VEHICLE_CHANGE_RADIO_STATION,       7, JOYSTICK);
+		IF_BTN_IN_RANGE(6)
+			SetControllerKeyAssociatedWithAction(PED_CYCLE_WEAPON_RIGHT,             6, JOYSTICK);
+			SetControllerKeyAssociatedWithAction(VEHICLE_LOOKRIGHT,                  6, JOYSTICK);
+		IF_BTN_IN_RANGE(5)
+			SetControllerKeyAssociatedWithAction(PED_CYCLE_WEAPON_LEFT,              5, JOYSTICK);
+			SetControllerKeyAssociatedWithAction(VEHICLE_LOOKLEFT,                   5, JOYSTICK);
+		/*******************************************************************************************/
+		IF_BTN_IN_RANGE(4)
+			SetControllerKeyAssociatedWithAction(VEHICLE_ENTER_EXIT,                 4, JOYSTICK);
+		IF_BTN_IN_RANGE(3)
+			SetControllerKeyAssociatedWithAction(VEHICLE_BRAKE,                      3, JOYSTICK);
+			SetControllerKeyAssociatedWithAction(PED_JUMPING,                        3, JOYSTICK);
+			SetControllerKeyAssociatedWithAction(PED_SNIPER_ZOOM_IN,                 3, JOYSTICK);
+		IF_BTN_IN_RANGE(2)
+			SetControllerKeyAssociatedWithAction(VEHICLE_ACCELERATE,                 2, JOYSTICK);
+			SetControllerKeyAssociatedWithAction(PED_SPRINT,                         2, JOYSTICK);
+			SetControllerKeyAssociatedWithAction(PED_SNIPER_ZOOM_OUT,                2, JOYSTICK);
+		IF_BTN_IN_RANGE(1)
+			SetControllerKeyAssociatedWithAction(PED_FIREWEAPON,                     1, JOYSTICK);
+#ifdef BIND_VEHICLE_FIREWEAPON
+			SetControllerKeyAssociatedWithAction(VEHICLE_FIREWEAPON,                 1, JOYSTICK);
+#endif
+		/*******************************************************************************************/
+		}
+	}
+}
+
+void CControllerConfigManager::InitialiseControllerActionNameArray()
+{
+	wchar buf[ACTIONNAME_LENGTH + 2];
+
+#define SETACTIONNAME(name) AsciiToUnicode(#name, buf); CMessages::WideStringCopy(m_aActionNames[name], buf, ACTIONNAME_LENGTH);
+
+	SETACTIONNAME(PED_LOOKBEHIND);
+	SETACTIONNAME(PED_CYCLE_WEAPON_LEFT);
+	SETACTIONNAME(PED_CYCLE_WEAPON_RIGHT);
+	SETACTIONNAME(PED_LOCK_TARGET);
+	SETACTIONNAME(PED_JUMPING);
+	SETACTIONNAME(PED_SPRINT);
+	SETACTIONNAME(PED_CYCLE_TARGET_LEFT);
+	SETACTIONNAME(PED_CYCLE_TARGET_RIGHT);
+	SETACTIONNAME(PED_LOCK_TARGET); // duplicate
+	SETACTIONNAME(PED_CENTER_CAMERA_BEHIND_PLAYER);
+	SETACTIONNAME(VEHICLE_LOOKBEHIND);
+	SETACTIONNAME(PED_DUCK);
+	SETACTIONNAME(PED_ANSWER_PHONE);
+	SETACTIONNAME(VEHICLE_LOOKLEFT);
+	SETACTIONNAME(VEHICLE_LOOKRIGHT);
+	SETACTIONNAME(VEHICLE_HORN);
+	SETACTIONNAME(VEHICLE_HANDBRAKE);
+	SETACTIONNAME(VEHICLE_ACCELERATE);
+	SETACTIONNAME(VEHICLE_BRAKE);
+	SETACTIONNAME(VEHICLE_CHANGE_RADIO_STATION);
+	SETACTIONNAME(TOGGLE_SUBMISSIONS);
+	SETACTIONNAME(PED_SNIPER_ZOOM_IN);
+	SETACTIONNAME(PED_SNIPER_ZOOM_OUT);
+	SETACTIONNAME(PED_1RST_PERSON_LOOK_LEFT);
+	SETACTIONNAME(PED_1RST_PERSON_LOOK_RIGHT);
+	SETACTIONNAME(PED_1RST_PERSON_LOOK_UP);
+	SETACTIONNAME(PED_1RST_PERSON_LOOK_DOWN);
+	SETACTIONNAME(SHOW_MOUSE_POINTER_TOGGLE);
+	SETACTIONNAME(CAMERA_CHANGE_VIEW_ALL_SITUATIONS);
+	SETACTIONNAME(PED_FIREWEAPON);
+#ifdef BIND_VEHICLE_FIREWEAPON
+	SETACTIONNAME(VEHICLE_FIREWEAPON);
+#endif
+	SETACTIONNAME(VEHICLE_ENTER_EXIT);
+	SETACTIONNAME(GO_LEFT);
+	SETACTIONNAME(GO_RIGHT);
+	SETACTIONNAME(GO_FORWARD);
+	SETACTIONNAME(GO_BACK);
+	SETACTIONNAME(VEHICLE_TURRETLEFT);
+	SETACTIONNAME(VEHICLE_TURRETRIGHT);
+	SETACTIONNAME(VEHICLE_TURRETUP);
+	SETACTIONNAME(VEHICLE_TURRETDOWN);
+	SETACTIONNAME(NETWORK_TALK);
+	SETACTIONNAME(TOGGLE_DPAD);
+	SETACTIONNAME(SWITCH_DEBUG_CAM_ON);
+	SETACTIONNAME(TAKE_SCREEN_SHOT);
+
+#undef SETACTIONNAME
+}
+
+void CControllerConfigManager::UpdateJoyInConfigMenus_ButtonDown(int32 button, int32 padnumber)
+{
+	if (button != 0)
+	{
+		CPad *pad = CPad::GetPad(padnumber);
+		if (pad != NULL)
+		{
+			switch (button)
+			{
+			case 16:
+				pad->PCTempJoyState.DPadLeft = 255;
+				break;
+			case 15:
+				pad->PCTempJoyState.DPadDown = 255;
+				break;
+			case 14:
+				pad->PCTempJoyState.DPadRight = 255;
+				break;
+			case 13:
+				pad->PCTempJoyState.DPadUp = 255;
+				break;
+			case 12:
+#ifndef REGISTER_START_BUTTON
+				if (padnumber == 1)
+#endif
+					pad->PCTempJoyState.Start = 255;
+				break;
+			case 11:
+				pad->PCTempJoyState.RightShock = 255;
+				break;
+			case 10:
+				pad->PCTempJoyState.LeftShock = 255;
+				break;
+			case 9:
+				pad->PCTempJoyState.Select = 255;
+				break;
+			case 8:
+				pad->PCTempJoyState.RightShoulder1 = 255;
+				break;
+			case 7:
+				pad->PCTempJoyState.LeftShoulder1 = 255;
+				break;
+			case 6:
+				pad->PCTempJoyState.RightShoulder2 = 255;
+				break;
+			case 5:
+				pad->PCTempJoyState.LeftShoulder2 = 255;
+				break;
+			}
+
+			// Now we use SDL Game Controller DB
+#if defined RW_D3D9 || defined RWLIBS
+			if (AllValidWinJoys.m_aJoys[JOYSTICK1].m_nVendorID == 0x3427
+				&& AllValidWinJoys.m_aJoys[JOYSTICK1].m_nProductID == 0x1190)
+#else
+			if (0)
+#endif
+			{
+				//GIC USB Joystick, PS2 Gamepad ?
+
+				switch (button)
+				{
+				case 4:
+					pad->PCTempJoyState.Square = 255;
+					break;
+				case 3:
+					pad->PCTempJoyState.Cross = 255;
+					break;
+				case 2:
+					pad->PCTempJoyState.Circle = 255;
+					break;
+				case 1:
+					pad->PCTempJoyState.Triangle = 255;
+					break;
+				}
+			}
+			else
+			{
+				switch (button)
+				{
+				case 4:
+					pad->PCTempJoyState.Triangle = 255;
+					break;
+				case 3:
+					pad->PCTempJoyState.Square = 255;
+					break;
+				case 2:
+					pad->PCTempJoyState.Cross = 255;
+					break;
+				case 1:
+					pad->PCTempJoyState.Circle = 255;
+					break;
+				}
+			}
+		}
+	}
+}
+
+void CControllerConfigManager::AffectControllerStateOn_ButtonDown(int32 button, eControllerType type)
+{
+	bool process = true;
+	
+	if ((type == KEYBOARD || type == OPTIONAL_EXTRA) && button == rsNULL)
+		process = false;
+	if (type == JOYSTICK && button == 0)
+		process = false;
+	if (type == MOUSE && button == 0)
+		process = false;
+
+	if (process)
+	{
+		CPad *pad = CPad::GetPad(PAD1);
+
+		bool firstPerson = false;
+		bool playerDriving = false;
+
+		if (FindPlayerVehicle() != NULL)
+		{
+			CPlayerPed *plr = FindPlayerPed();
+			if (plr != NULL)
+			{
+				if (plr->m_nPedState == PED_DRIVING)
+					playerDriving = true;
+			}
+		}
+
+		int16 mode = TheCamera.Cams[TheCamera.ActiveCam].Mode;
+		if (   mode == CCam::MODE_1STPERSON
+			|| mode == CCam::MODE_SNIPER
+			|| mode == CCam::MODE_ROCKETLAUNCHER
+			|| mode == CCam::MODE_CAMERA
+			|| mode == CCam::MODE_M16_1STPERSON)
+		{
+			firstPerson = true;
+		}
+
+		CControllerState *state;
+		
+		switch (type)
+		{
+		case KEYBOARD:
+		case OPTIONAL_EXTRA:
+			state = &CPad::GetPad(PAD1)->PCTempKeyState;
+			break;
+		case JOYSTICK:
+			state = &CPad::GetPad(PAD1)->PCTempJoyState;
+			break;
+		case MOUSE:
+			state = &CPad::GetPad(PAD1)->PCTempMouseState;
+			break;
+		default: break;
+		}
+
+		if (pad != NULL)
+		{
+			if (playerDriving)
+			{
+				AffectControllerStateOn_ButtonDown_Driving(button, type, *state);
+				AffectControllerStateOn_ButtonDown_VehicleAndThirdPersonOnly(button, type, *state);
+			}
+			else
+			{
+				AffectControllerStateOn_ButtonDown_FirstAndThirdPersonOnly(button, type, *state);
+				if (firstPerson)
+					AffectControllerStateOn_ButtonDown_FirstPersonOnly(button, type, *state);
+				else
+				{
+					AffectControllerStateOn_ButtonDown_ThirdPersonOnly(button, type, *state);
+					AffectControllerStateOn_ButtonDown_VehicleAndThirdPersonOnly(button, type, *state);
+				}
+			}
+
+			AffectControllerStateOn_ButtonDown_AllStates(button, type, *state);
+
+#ifdef REGISTER_START_BUTTON
+			if (button == 12)
+				state->Start = 255;
+#endif
+		}
+	}
+}
+
+void CControllerConfigManager::AffectControllerStateOn_ButtonDown_Driving(int32 button, eControllerType type, CControllerState &state)
+{
+#ifdef BIND_VEHICLE_FIREWEAPON
+	if (button == GetControllerKeyAssociatedWithAction(VEHICLE_FIREWEAPON, type))
+		state.Circle = 255;
+#endif
+	if (button == GetControllerKeyAssociatedWithAction(VEHICLE_LOOKBEHIND, type))
+	{
+		state.LeftShoulder2 = 255;
+		state.RightShoulder2 = 255;
+	}
+
+	if (button == GetControllerKeyAssociatedWithAction(VEHICLE_LOOKLEFT, type))
+		state.LeftShoulder2 = 255;
+	if (button == GetControllerKeyAssociatedWithAction(VEHICLE_LOOKRIGHT, type))
+		state.RightShoulder2 = 255;
+	if (button == GetControllerKeyAssociatedWithAction(VEHICLE_HORN, type))
+		state.LeftShock = 255;
+	if (button == GetControllerKeyAssociatedWithAction(VEHICLE_HANDBRAKE, type))
+		state.RightShoulder1 = 255;
+	if (button == GetControllerKeyAssociatedWithAction(VEHICLE_ACCELERATE, type))
+		state.Cross = 255;
+	if (button == GetControllerKeyAssociatedWithAction(VEHICLE_CHANGE_RADIO_STATION, type))
+		state.LeftShoulder1 = 255;
+	if (button == GetControllerKeyAssociatedWithAction(VEHICLE_BRAKE, type))
+		state.Square = 255;
+	if (button == GetControllerKeyAssociatedWithAction(TOGGLE_SUBMISSIONS, type))
+		state.RightShock = 255;
+	
+	if (button == GetControllerKeyAssociatedWithAction(VEHICLE_TURRETLEFT, type))
+	{
+		if (state.RightStickX == 128 || m_aSimCheckers[SIM_X2][type])
+		{
+			state.RightStickX = 0;
+			m_aSimCheckers[SIM_X2][type] = true;
+		}
+		else
+		{
+			state.RightStickX = -128;
+		}
+	}
+
+	if (button == GetControllerKeyAssociatedWithAction(VEHICLE_TURRETRIGHT, type))
+	{
+		if (state.RightStickX == -128 || m_aSimCheckers[SIM_X2][type])
+		{
+			state.RightStickX = 0;
+			m_aSimCheckers[SIM_X2][type] = true;
+		}
+		else
+			state.RightStickX = 128;
+	}
+	
+	bool isDodo = false;
+	if (FindPlayerVehicle() && (FindPlayerVehicle()->IsVehicle() && (
+		FindPlayerVehicle()->GetModelIndex() == MI_DODO
+#ifdef FIX_BUGS
+		|| (CVehicle::bAllDodosCheat && !FindPlayerVehicle()->IsRealHeli())
+#endif
+		)))
+	{
+		isDodo = true;
+	}
+
+	
+	if (button == GetControllerKeyAssociatedWithAction(VEHICLE_TURRETUP, type))
+	{
+		if (isDodo == true)
+		{
+			if (state.LeftStickY == -128 || m_aSimCheckers[SIM_Y1][type]) // BUG: should be SIM_Y2. SIM_Y1 it's DPAD
+			{
+				state.LeftStickY = 0;
+				m_aSimCheckers[SIM_Y2][type] = true;
+			}
+			else
+				state.LeftStickY = 128;
+		}
+
+		else if (state.RightStickY == -128 || m_aSimCheckers[SIM_Y2][type])
+		{
+			state.RightStickY = 0;
+			m_aSimCheckers[SIM_Y2][type] = true;
+		}
+		else
+		{
+			state.RightStickY = 128;
+		}
+	}
+	
+	if (button == GetControllerKeyAssociatedWithAction(VEHICLE_TURRETDOWN, type))
+	{
+		if (isDodo == true)
+		{
+			if (state.LeftStickY == 128 || m_aSimCheckers[SIM_Y1][type]) // BUG: should be SIM_Y2. SIM_Y1 it's DPAD
+			{
+				state.LeftStickY = 0;
+				m_aSimCheckers[SIM_Y2][type] = true;
+			}
+			else
+				state.LeftStickY = -128;
+		}
+
+		else if (state.RightStickY == 128 || m_aSimCheckers[SIM_Y2][type])
+		{
+			state.RightStickY = 0;
+			m_aSimCheckers[SIM_Y2][type] = true;
+		}
+		else
+			state.RightStickY = -128;
+	}
+}
+
+void CControllerConfigManager::AffectControllerStateOn_ButtonDown_FirstPersonOnly(int32 button, eControllerType type, CControllerState &state)
+{
+	if (button == GetControllerKeyAssociatedWithAction(PED_SNIPER_ZOOM_IN, type))
+		state.Square = 255;
+	if (button == GetControllerKeyAssociatedWithAction(PED_SNIPER_ZOOM_OUT, type))
+		state.Cross = 255;
+	if (button == GetControllerKeyAssociatedWithAction(PED_DUCK, type))
+		state.LeftShock = 255;
+}
+
+void CControllerConfigManager::AffectControllerStateOn_ButtonDown_ThirdPersonOnly(int32 button, eControllerType type, CControllerState &state)
+{
+	if (button == GetControllerKeyAssociatedWithAction(PED_LOOKBEHIND, type))
+		state.RightShock = 255;
+	if (button == GetControllerKeyAssociatedWithAction(PED_JUMPING, type))
+		state.Square = 255;
+	if (button == GetControllerKeyAssociatedWithAction(PED_ANSWER_PHONE, type))
+		state.LeftShoulder1 = 255;
+	if (button == GetControllerKeyAssociatedWithAction(PED_CYCLE_WEAPON_LEFT, type))
+		state.LeftShoulder2 = 255;
+	if (button == GetControllerKeyAssociatedWithAction(PED_CYCLE_WEAPON_RIGHT, type))
+		state.RightShoulder2 = 255;
+	if (button == GetControllerKeyAssociatedWithAction(PED_SPRINT, type))
+		state.Cross = 255;
+	if (button == GetControllerKeyAssociatedWithAction(PED_DUCK, type))
+		state.LeftShock = 255;
+	
+	if (FrontEndMenuManager.m_ControlMethod == CONTROL_CLASSIC)
+	{
+		if (button == GetControllerKeyAssociatedWithAction(PED_CYCLE_TARGET_LEFT, type))
+			state.LeftShoulder2 = 255;
+		if (button == GetControllerKeyAssociatedWithAction(PED_CYCLE_TARGET_RIGHT, type))
+			state.RightShoulder2 = 255;
+		if (button == GetControllerKeyAssociatedWithAction(PED_CENTER_CAMERA_BEHIND_PLAYER, type))
+			state.LeftShoulder1 = 255;
+	}
+}
+
+void CControllerConfigManager::AffectControllerStateOn_ButtonDown_FirstAndThirdPersonOnly(int32 button, eControllerType type, CControllerState &state)
+{
+	CPad *pad = CPad::GetPad(PAD1);
+
+#ifdef BIND_VEHICLE_FIREWEAPON
+	if (button == GetControllerKeyAssociatedWithAction(PED_FIREWEAPON, type))
+		state.Circle = 255;
+#endif
+	if (button == GetControllerKeyAssociatedWithAction(PED_LOCK_TARGET, type))
+		state.RightShoulder1 = 255;
+
+	if (button == GetControllerKeyAssociatedWithAction(GO_FORWARD, type))
+	{
+		if (state.DPadDown || m_aSimCheckers[SIM_Y1][type])
+		{
+			m_aSimCheckers[SIM_Y1][type] = true;
+			state.DPadDown = 0;
+			state.DPadUp = 0;
+		}
+		else
+			state.DPadUp = 255;
+	}
+
+	if (button == GetControllerKeyAssociatedWithAction(GO_BACK, type))
+	{
+		if (state.DPadUp || m_aSimCheckers[SIM_Y1][type])
+		{
+			m_aSimCheckers[SIM_Y1][type] = true;
+			state.DPadDown = 0;
+			state.DPadUp = 0;
+		}
+		else
+			state.DPadDown = 255;
+	}
+
+	if (button == GetControllerKeyAssociatedWithAction(PED_1RST_PERSON_LOOK_LEFT, type))
+	{
+		if (state.RightStickX == 128 || m_aSimCheckers[SIM_X2][type])
+		{
+			state.RightStickX = 0;
+			m_aSimCheckers[SIM_X2][type] = true;
+		}
+		else
+		{
+			state.RightStickX = -128;
+		}
+	}
+
+	if (button == GetControllerKeyAssociatedWithAction(PED_1RST_PERSON_LOOK_RIGHT, type))
+	{
+		if (state.RightStickX == -128 || m_aSimCheckers[SIM_X2][type])
+		{
+			state.RightStickX = 0;
+			m_aSimCheckers[SIM_X2][type] = true;
+		}
+		else
+			state.RightStickX = 128;
+	}
+
+	if (FrontEndMenuManager.m_ControlMethod == CONTROL_CLASSIC)
+	{
+		if (button == GetControllerKeyAssociatedWithAction(PED_1RST_PERSON_LOOK_UP, type))
+		{
+			if (state.RightStickY == -128 || m_aSimCheckers[SIM_Y2][type])
+			{
+				state.RightStickY = 0;
+				m_aSimCheckers[SIM_Y2][type] = true;
+			}
+			else
+				state.RightStickY = 128;
+		}
+
+		if (button == GetControllerKeyAssociatedWithAction(PED_1RST_PERSON_LOOK_DOWN, type))
+		{
+			if (state.RightStickY == 128 || m_aSimCheckers[SIM_Y2][type])
+			{
+				state.RightStickY = 0;
+				m_aSimCheckers[SIM_Y2][type] = true;
+			}
+			else
+				state.RightStickY = -128;
+		}
+	}
+}
+
+void CControllerConfigManager::AffectControllerStateOn_ButtonDown_AllStates(int32 button, eControllerType type, CControllerState &state)
+{
+	if (button == GetControllerKeyAssociatedWithAction(CAMERA_CHANGE_VIEW_ALL_SITUATIONS, type))
+		state.Select = 255;
+
+#ifndef BIND_VEHICLE_FIREWEAPON
+	if (button == GetControllerKeyAssociatedWithAction(PED_FIREWEAPON, type))
+		state.Circle = 255;
+#endif
+
+	if (button == GetControllerKeyAssociatedWithAction(GO_LEFT, type))
+	{
+		if (state.DPadRight || m_aSimCheckers[SIM_X1][type])
+		{
+			m_aSimCheckers[SIM_X1][type] = true;
+			state.DPadLeft = 0;
+			state.DPadRight = 0;
+		}
+		else
+			state.DPadLeft = 255;
+	}
+
+	if (button == GetControllerKeyAssociatedWithAction(GO_RIGHT, type))
+	{
+		if (state.DPadLeft || m_aSimCheckers[SIM_X1][type])
+		{
+			m_aSimCheckers[SIM_X1][type] = true;
+			state.DPadLeft = 0;
+			state.DPadRight = 0;
+		}
+		else
+			state.DPadRight = 255;
+	}
+
+	if (button == GetControllerKeyAssociatedWithAction(NETWORK_TALK, type))
+		state.NetworkTalk = 255;
+}
+
+void CControllerConfigManager::AffectControllerStateOn_ButtonDown_VehicleAndThirdPersonOnly(int32 button, eControllerType type, CControllerState &state)
+{
+	if (button == GetControllerKeyAssociatedWithAction(VEHICLE_ENTER_EXIT, type))
+		state.Triangle = 255;
+}
+
+void CControllerConfigManager::UpdateJoyInConfigMenus_ButtonUp(int32 button, int32 padnumber)
+{
+	if (button!=0)
+	{
+		CPad *pad = CPad::GetPad(padnumber);
+
+		if (pad != NULL)
+		{
+			switch (button)
+			{
+			case 16:
+				pad->PCTempJoyState.DPadLeft = 0;
+				break;
+			case 15:
+				pad->PCTempJoyState.DPadDown = 0;
+				break;
+			case 14:
+				pad->PCTempJoyState.DPadRight = 0;
+				break;
+			case 13:
+				pad->PCTempJoyState.DPadUp = 0;
+				break;
+#ifdef REGISTER_START_BUTTON
+			case 12:
+				pad->PCTempJoyState.Start = 0;
+				break;
+#endif
+			case 11:
+				pad->PCTempJoyState.RightShock = 0;
+				break;
+			case 10:
+				pad->PCTempJoyState.LeftShock = 0;
+				break;
+			case 9:
+				pad->PCTempJoyState.Select = 0;
+				break;
+			case 8:
+				pad->PCTempJoyState.RightShoulder1 = 0;
+				break;
+			case 7:
+				pad->PCTempJoyState.LeftShoulder1 = 0;
+				break;
+			case 6:
+				pad->PCTempJoyState.RightShoulder2 = 0;
+				break;
+			case 5:
+				pad->PCTempJoyState.LeftShoulder2 = 0;
+				break;
+			}
+
+			// Now we use SDL Game Controller DB
+#if defined RW_D3D9 || defined RWLIBS
+			if (AllValidWinJoys.m_aJoys[JOYSTICK1].m_nVendorID == 0x3427
+				&& AllValidWinJoys.m_aJoys[JOYSTICK1].m_nProductID == 0x1190)
+#else
+			if (0)
+#endif
+			{
+				//GIC USB Joystick, PS2 Gamepad ?
+
+				switch (button)
+				{
+				case 4:
+					pad->PCTempJoyState.Square = 0;
+					break;
+				case 3:
+					pad->PCTempJoyState.Cross = 0;
+					break;
+				case 2:
+					pad->PCTempJoyState.Circle = 0;
+					break;
+				case 1:
+					pad->PCTempJoyState.Triangle = 0;
+					break;
+				}
+			}
+			else
+			{
+				switch (button)
+				{
+				case 4:
+					pad->PCTempJoyState.Triangle = 0;
+					break;
+				case 3:
+					pad->PCTempJoyState.Square = 0;
+					break;
+				case 2:
+					pad->PCTempJoyState.Cross = 0;
+					break;
+				case 1:
+					pad->PCTempJoyState.Circle = 0;
+					break;
+				}
+			}
+		}
+	}
+}
+
+void CControllerConfigManager::AffectControllerStateOn_ButtonUp(int32 button, eControllerType type)
+{
+	bool process = true;
+
+	if ((type == KEYBOARD || type == OPTIONAL_EXTRA) && button == rsNULL)
+		process = false;
+	if (type == JOYSTICK && button == 0)
+		process = false;
+	if (type == MOUSE && button == 0)
+		process = false;
+
+	CControllerState *state;
+
+	switch (type)
+	{
+	case KEYBOARD:
+	case OPTIONAL_EXTRA:
+		state = &CPad::GetPad(PAD1)->PCTempKeyState;
+		break;
+	case MOUSE:
+		state = &CPad::GetPad(PAD1)->PCTempMouseState;
+		break;
+	case JOYSTICK:
+		state = &CPad::GetPad(PAD1)->PCTempJoyState;
+		break;
+	default: break;
+	}
+
+	if (process)
+	{
+		CPad *pad = CPad::GetPad(PAD1);
+		
+		if (pad != NULL)
+		{
+			if (FrontEndMenuManager.GetIsMenuActive())
+				AffectControllerStateOn_ButtonUp_All_Player_States(button, type, *state);
+
+#ifdef REGISTER_START_BUTTON
+			if (button == 12)
+				state->Start = 0;
+#endif
+		}
+	}
+}
+
+void CControllerConfigManager::AffectControllerStateOn_ButtonUp_All_Player_States(int32 button, eControllerType type, CControllerState &state)
+{
+	if (button == GetControllerKeyAssociatedWithAction(NETWORK_TALK, type))
+		state.NetworkTalk = 0;
+}
+
+void CControllerConfigManager::AffectPadFromKeyBoard()
+{
+	RsKeyCodes kc;
+	_InputTranslateShiftKeyUpDown(&kc);
+
+	bool processdown = false;
+	if (!CPad::m_bMapPadOneToPadTwo && !FrontEndMenuManager.GetIsMenuActive())
+		processdown = true;
+	
+	for (int32 i = 0; i < MAX_CONTROLLERACTIONS; i++)
+	{
+		int32 key = GetControllerKeyAssociatedWithAction((e_ControllerAction)i, KEYBOARD);
+		if (GetIsKeyboardKeyDown((RsKeyCodes)key) && processdown)
+			AffectControllerStateOn_ButtonDown(key, KEYBOARD);
+
+		int32 extrakey = GetControllerKeyAssociatedWithAction((e_ControllerAction)i, OPTIONAL_EXTRA);
+		if (GetIsKeyboardKeyDown((RsKeyCodes)extrakey) && processdown)
+			AffectControllerStateOn_ButtonDown(extrakey, OPTIONAL_EXTRA);
+
+		if (!GetIsKeyboardKeyDown((RsKeyCodes)key))
+			AffectControllerStateOn_ButtonUp(key, KEYBOARD);
+		else if ( !GetIsKeyboardKeyDown((RsKeyCodes)extrakey))
+			AffectControllerStateOn_ButtonUp(key, OPTIONAL_EXTRA);
+	}
+}
+
+void CControllerConfigManager::AffectPadFromMouse()
+{
+	bool processdown = false;
+	if (!CPad::m_bMapPadOneToPadTwo && !FrontEndMenuManager.GetIsMenuActive())
+		processdown = true;
+	
+	for (int32 i = 0; i < MAX_CONTROLLERACTIONS; i++)
+	{
+		int32 button = GetControllerKeyAssociatedWithAction((e_ControllerAction)i, MOUSE);
+		if (GetIsMouseButtonDown((RsKeyCodes)button) && processdown)
+			AffectControllerStateOn_ButtonDown(button, MOUSE);
+		if (GetIsMouseButtonUp((RsKeyCodes)button))
+			AffectControllerStateOn_ButtonUp(button, MOUSE);
+	}
+}
+
+void CControllerConfigManager::ClearSimButtonPressCheckers()
+{
+	for (int32 i = 0; i < MAX_SIMS; i++)
+	{
+		m_aSimCheckers[i][KEYBOARD]       = false;
+		m_aSimCheckers[i][OPTIONAL_EXTRA] = false;
+		m_aSimCheckers[i][MOUSE]          = false;
+		m_aSimCheckers[i][JOYSTICK]       = false;
+	}
+}
+
+bool CControllerConfigManager::GetIsKeyboardKeyDown(RsKeyCodes keycode)
+{
+	if (keycode < 255)
+	{
+		if (CPad::GetPad(PAD1)->GetChar(keycode))
+			return true;
+	}
+
+	for (int32 i = 0; i < 12; i++)
+	{
+		if (i + rsF1 == keycode)
+		{
+			if (CPad::GetPad(PAD1)->GetF(i))
+				return true;
+		}
+	}
+
+	switch (keycode)
+	{
+	case rsESC:
+		if (CPad::GetPad(PAD1)->GetEscape())
+			return true;
+		break;
+	case rsINS:
+		if (CPad::GetPad(PAD1)->GetInsert())
+			return true;
+		break;
+	case rsDEL:
+		if (CPad::GetPad(PAD1)->GetDelete())
+			return true;
+		break;
+	case rsHOME:
+		if (CPad::GetPad(PAD1)->GetHome())
+			return true;
+		break;
+	case rsEND:
+		if (CPad::GetPad(PAD1)->GetEnd())
+			return true;
+		break;
+	case rsPGUP:
+		if (CPad::GetPad(PAD1)->GetPageUp())
+			return true;
+		break;
+	case rsPGDN:
+		if (CPad::GetPad(PAD1)->GetPageDown())
+			return true;
+		break;
+	case rsUP:
+		if (CPad::GetPad(PAD1)->GetUp())
+			return true;
+		break;
+	case rsDOWN:
+		if (CPad::GetPad(PAD1)->GetDown())
+			return true;
+		break;
+	case rsLEFT:
+		if (CPad::GetPad(PAD1)->GetLeft())
+			return true;
+		break;
+	case rsRIGHT:
+		if (CPad::GetPad(PAD1)->GetRight())
+			return true;
+		break;
+	case rsSCROLL:
+		if (CPad::GetPad(PAD1)->GetScrollLock())
+			return true;
+		break;
+	case rsPAUSE:
+		if (CPad::GetPad(PAD1)->GetPause())
+			return true;
+		break;
+	case rsNUMLOCK:
+		if (CPad::GetPad(PAD1)->GetNumLock())
+			return true;
+		break;
+	case rsDIVIDE:
+		if (CPad::GetPad(PAD1)->GetDivide())
+			return true;
+		break;
+	case rsTIMES:
+		if (CPad::GetPad(PAD1)->GetTimes())
+			return true;
+		break;
+	case rsMINUS:
+		if (CPad::GetPad(PAD1)->GetMinus())
+			return true;
+		break;
+	case rsPLUS:
+		if (CPad::GetPad(PAD1)->GetPlus())
+			return true;
+		break;
+	case rsPADENTER:
+		if (CPad::GetPad(PAD1)->GetPadEnter())
+			return true;
+		break;
+	case rsPADDEL:
+		if (CPad::GetPad(PAD1)->GetPadDel())
+			return true;
+		break;
+	case rsPADEND:
+		if (CPad::GetPad(PAD1)->GetPad1())
+			return true;
+		break;
+	case rsPADDOWN:
+		if (CPad::GetPad(PAD1)->GetPad2())
+			return true;
+		break;
+	case rsPADPGDN:
+		if (CPad::GetPad(PAD1)->GetPad3())
+			return true;
+		break;
+	case rsPADLEFT:
+		if (CPad::GetPad(PAD1)->GetPad4())
+			return true;
+		break;
+	case rsPAD5:
+		if (CPad::GetPad(PAD1)->GetPad5())
+			return true;
+		break;
+	case rsPADRIGHT:
+		if (CPad::GetPad(PAD1)->GetPad6())
+			return true;
+		break;
+	case rsPADHOME:
+		if (CPad::GetPad(PAD1)->GetPad7())
+			return true;
+		break;
+	case rsPADUP:
+		if (CPad::GetPad(PAD1)->GetPad8())
+			return true;
+		break;
+	case rsPADPGUP:
+		if (CPad::GetPad(PAD1)->GetPad9())
+			return true;
+		break;
+	case rsPADINS:
+		if (CPad::GetPad(PAD1)->GetPad0())
+			return true;
+		break;
+	case rsBACKSP:
+		if (CPad::GetPad(PAD1)->GetBackspace())
+			return true;
+		break;
+	case rsTAB:
+		if (CPad::GetPad(PAD1)->GetTab())
+			return true;
+		break;
+	case rsCAPSLK:
+		if (CPad::GetPad(PAD1)->GetCapsLock())
+			return true;
+		break;
+	case rsENTER:
+		if (CPad::GetPad(PAD1)->GetEnter())
+			return true;
+		break;
+	case rsLSHIFT:
+		if (CPad::GetPad(PAD1)->GetLeftShift())
+			return true;
+		break;
+	case rsSHIFT:
+		if (CPad::GetPad(PAD1)->GetShift())
+			return true;
+		break;
+	case rsRSHIFT:
+		if (CPad::GetPad(PAD1)->GetRightShift())
+			return true;
+		break;
+	case rsLCTRL:
+		if (CPad::GetPad(PAD1)->GetLeftCtrl())
+			return true;
+		break;
+	case rsRCTRL:
+		if (CPad::GetPad(PAD1)->GetRightCtrl())
+			return true;
+		break;
+	case rsLALT:
+		if (CPad::GetPad(PAD1)->GetLeftAlt())
+			return true;
+		break;
+	case rsRALT:
+		if (CPad::GetPad(PAD1)->GetRightAlt())
+			return true;
+		break;
+	case rsLWIN:
+		if (CPad::GetPad(PAD1)->GetLeftWin())
+			return true;
+		break;
+	case rsRWIN:
+		if (CPad::GetPad(PAD1)->GetRightWin())
+			return true;
+		break;
+	case rsAPPS:
+		if (CPad::GetPad(PAD1)->GetApps())
+			return true;
+		break;
+	default: break;
+	}
+
+	return false;
+}
+
+bool CControllerConfigManager::GetIsKeyboardKeyJustDown(RsKeyCodes keycode)
+{
+	if (keycode < 255)
+	{
+		if (CPad::GetPad(PAD1)->GetCharJustDown(keycode))
+			return true;
+	}
+
+	for (int32 i = 0; i < 12; i++)
+	{
+		if (i + rsF1 == keycode)
+		{
+			if (CPad::GetPad(PAD1)->GetFJustDown(i))
+				return true;
+		}
+	}
+
+	switch (keycode)
+	{
+	case rsESC:
+		if (CPad::GetPad(PAD1)->GetEscapeJustDown())
+			return true;
+		break;
+	case rsINS:
+		if (CPad::GetPad(PAD1)->GetInsertJustDown())
+			return true;
+		break;
+	case rsDEL:
+		if (CPad::GetPad(PAD1)->GetDeleteJustDown())
+			return true;
+		break;
+	case rsHOME:
+		if (CPad::GetPad(PAD1)->GetHomeJustDown())
+			return true;
+		break;
+	case rsEND:
+		if (CPad::GetPad(PAD1)->GetEndJustDown())
+			return true;
+		break;
+	case rsPGUP:
+		if (CPad::GetPad(PAD1)->GetPageUpJustDown())
+			return true;
+		break;
+	case rsPGDN:
+		if (CPad::GetPad(PAD1)->GetPageDownJustDown())
+			return true;
+		break;
+	case rsUP:
+		if (CPad::GetPad(PAD1)->GetUpJustDown())
+			return true;
+		break;
+	case rsDOWN:
+		if (CPad::GetPad(PAD1)->GetDownJustDown())
+			return true;
+		break;
+	case rsLEFT:
+		if (CPad::GetPad(PAD1)->GetLeftJustDown())
+			return true;
+		break;
+	case rsRIGHT:
+		if (CPad::GetPad(PAD1)->GetRightJustDown())
+			return true;
+		break;
+	case rsSCROLL:
+		if (CPad::GetPad(PAD1)->GetScrollLockJustDown())
+			return true;
+		break;
+	case rsPAUSE:
+		if (CPad::GetPad(PAD1)->GetPauseJustDown())
+			return true;
+		break;
+	case rsNUMLOCK:
+		if (CPad::GetPad(PAD1)->GetNumLockJustDown())
+			return true;
+		break;
+	case rsDIVIDE:
+		if (CPad::GetPad(PAD1)->GetDivideJustDown())
+			return true;
+		break;
+	case rsTIMES:
+		if (CPad::GetPad(PAD1)->GetTimesJustDown())
+			return true;
+		break;
+	case rsMINUS:
+		if (CPad::GetPad(PAD1)->GetMinusJustDown())
+			return true;
+		break;
+	case rsPLUS:
+		if (CPad::GetPad(PAD1)->GetPlusJustDown())
+			return true;
+		break;
+	case rsPADENTER:
+		if (CPad::GetPad(PAD1)->GetPadEnterJustDown())
+			return true;
+		break;
+	case rsPADDEL:
+		if (CPad::GetPad(PAD1)->GetPadDelJustDown())
+			return true;
+		break;
+	case rsPADEND:
+		if (CPad::GetPad(PAD1)->GetPad1JustDown())
+			return true;
+		break;
+	case rsPADDOWN:
+		if (CPad::GetPad(PAD1)->GetPad2JustDown())
+			return true;
+		break;
+	case rsPADPGDN:
+		if (CPad::GetPad(PAD1)->GetPad3JustDown())
+			return true;
+		break;
+	case rsPADLEFT:
+		if (CPad::GetPad(PAD1)->GetPad4JustDown())
+			return true;
+		break;
+	case rsPAD5:
+		if (CPad::GetPad(PAD1)->GetPad5JustDown())
+			return true;
+		break;
+	case rsPADRIGHT:
+		if (CPad::GetPad(PAD1)->GetPad6JustDown())
+			return true;
+		break;
+	case rsPADHOME:
+		if (CPad::GetPad(PAD1)->GetPad7JustDown())
+			return true;
+		break;
+	case rsPADUP:
+		if (CPad::GetPad(PAD1)->GetPad8JustDown())
+			return true;
+		break;
+	case rsPADPGUP:
+		if (CPad::GetPad(PAD1)->GetPad9JustDown())
+			return true;
+		break;
+	case rsPADINS:
+		if (CPad::GetPad(PAD1)->GetPad0JustDown())
+			return true;
+		break;
+	case rsBACKSP:
+		if (CPad::GetPad(PAD1)->GetBackspaceJustDown())
+			return true;
+		break;
+	case rsTAB:
+		if (CPad::GetPad(PAD1)->GetTabJustDown())
+			return true;
+		break;
+	case rsCAPSLK:
+		if (CPad::GetPad(PAD1)->GetCapsLockJustDown())
+			return true;
+		break;
+	case rsENTER:
+		if (CPad::GetPad(PAD1)->GetReturnJustDown())
+			return true;
+		break;
+	case rsLSHIFT:
+		if (CPad::GetPad(PAD1)->GetLeftShiftJustDown())
+			return true;
+		break;
+	case rsSHIFT:
+		if (CPad::GetPad(PAD1)->GetShiftJustDown())
+			return true;
+		break;
+	case rsRSHIFT:
+		if (CPad::GetPad(PAD1)->GetRightShiftJustDown())
+			return true;
+		break;
+	case rsLCTRL:
+		if (CPad::GetPad(PAD1)->GetLeftCtrlJustDown())
+			return true;
+		break;
+	case rsRCTRL:
+		if (CPad::GetPad(PAD1)->GetRightCtrlJustDown())
+			return true;
+		break;
+	case rsLALT:
+		if (CPad::GetPad(PAD1)->GetLeftAltJustDown())
+			return true;
+		break;
+	case rsRALT:
+		if (CPad::GetPad(PAD1)->GetRightAltJustDown())
+			return true;
+		break;
+	case rsLWIN:
+		if (CPad::GetPad(PAD1)->GetLeftWinJustDown())
+			return true;
+		break;
+	case rsRWIN:
+		if (CPad::GetPad(PAD1)->GetRightWinJustDown())
+			return true;
+		break;
+	case rsAPPS:
+		if (CPad::GetPad(PAD1)->GetAppsJustDown())
+			return true;
+		break;
+	default: break;
+	}
+
+	return false;
+}
+
+bool CControllerConfigManager::GetIsMouseButtonDown(RsKeyCodes keycode)
+{
+	switch (keycode)
+	{
+	case rsMOUSELEFTBUTTON:
+		if (CPad::GetPad(PAD1)->GetLeftMouse())
+			return true;
+		break;
+	case rsMOUSMIDDLEBUTTON:
+		if (CPad::GetPad(PAD1)->GetMiddleMouse())
+			return true;
+		break;
+	case rsMOUSERIGHTBUTTON:
+		if (CPad::GetPad(PAD1)->GetRightMouse())
+			return true;
+		break;
+	case rsMOUSEWHEELUPBUTTON:
+		if (CPad::GetPad(PAD1)->GetMouseWheelUp())
+			return true;
+		break;
+	case rsMOUSEWHEELDOWNBUTTON:
+		if (CPad::GetPad(PAD1)->GetMouseWheelDown())
+			return true;
+		break;
+	case rsMOUSEX1BUTTON:
+		if (CPad::GetPad(PAD1)->GetMouseX1())
+			return true;
+		break;
+	case rsMOUSEX2BUTTON:
+		if (CPad::GetPad(PAD1)->GetMouseX2())
+			return true;
+		break;
+	default: break;
+	}
+
+	return false;
+}
+
+bool CControllerConfigManager::GetIsMouseButtonUp(RsKeyCodes keycode)
+{
+	switch (keycode)
+	{
+	case rsMOUSELEFTBUTTON:
+		if (CPad::GetPad(PAD1)->GetLeftMouseUp())
+			return true;
+		break;
+	case rsMOUSMIDDLEBUTTON:
+		if (CPad::GetPad(PAD1)->GetMiddleMouseUp())
+			return true;
+		break;
+	case rsMOUSERIGHTBUTTON:
+		if (CPad::GetPad(PAD1)->GetRightMouseUp())
+			return true;
+		break;
+	case rsMOUSEWHEELUPBUTTON:
+		if (CPad::GetPad(PAD1)->GetMouseWheelUpUp())
+			return true;
+		break;
+	case rsMOUSEWHEELDOWNBUTTON:
+		if (CPad::GetPad(PAD1)->GetMouseWheelDownUp())
+			return true;
+		break;
+	case rsMOUSEX1BUTTON:
+		if (CPad::GetPad(PAD1)->GetMouseX1Up())
+			return true;
+		break;
+	case rsMOUSEX2BUTTON:
+		if (CPad::GetPad(PAD1)->GetMouseX2Up())
+			return true;
+		break;
+	default: break;
+	}
+
+	return false;
+}
+
+#define CLEAR_ACTION_IF_NEEDED(action) \
+if (key == GetControllerKeyAssociatedWithAction(action, type))\
+	ClearSettingsAssociatedWithAction(action, type);
+
+void CControllerConfigManager::DeleteMatchingCommonControls(e_ControllerAction action, int32 key, eControllerType type)
+{
+	if (!GetIsKeyBlank(key, type))
+	{
+#ifndef BIND_VEHICLE_FIREWEAPON
+		CLEAR_ACTION_IF_NEEDED(PED_FIREWEAPON);
+#endif
+		CLEAR_ACTION_IF_NEEDED(GO_LEFT);
+		CLEAR_ACTION_IF_NEEDED(GO_RIGHT);
+		CLEAR_ACTION_IF_NEEDED(CAMERA_CHANGE_VIEW_ALL_SITUATIONS);
+		CLEAR_ACTION_IF_NEEDED(NETWORK_TALK);
+		CLEAR_ACTION_IF_NEEDED(SWITCH_DEBUG_CAM_ON);
+		CLEAR_ACTION_IF_NEEDED(TOGGLE_DPAD);
+		CLEAR_ACTION_IF_NEEDED(TAKE_SCREEN_SHOT);
+		CLEAR_ACTION_IF_NEEDED(SHOW_MOUSE_POINTER_TOGGLE);
+	}
+}
+
+void CControllerConfigManager::DeleteMatching3rdPersonControls(e_ControllerAction action, int32 key, eControllerType type)
+{
+	if (!GetIsKeyBlank(key, type))
+	{
+		CLEAR_ACTION_IF_NEEDED(PED_CYCLE_WEAPON_LEFT);
+		CLEAR_ACTION_IF_NEEDED(PED_CYCLE_WEAPON_RIGHT);
+		CLEAR_ACTION_IF_NEEDED(PED_JUMPING);
+		CLEAR_ACTION_IF_NEEDED(PED_SPRINT);
+		CLEAR_ACTION_IF_NEEDED(PED_LOOKBEHIND);
+		CLEAR_ACTION_IF_NEEDED(PED_DUCK);
+		CLEAR_ACTION_IF_NEEDED(PED_ANSWER_PHONE);
+
+		if (FrontEndMenuManager.m_ControlMethod == CONTROL_CLASSIC)
+		{
+			CLEAR_ACTION_IF_NEEDED(PED_CYCLE_TARGET_LEFT);
+			CLEAR_ACTION_IF_NEEDED(PED_CYCLE_TARGET_RIGHT);
+			CLEAR_ACTION_IF_NEEDED(PED_CENTER_CAMERA_BEHIND_PLAYER);
+		}
+	}
+}
+
+void CControllerConfigManager::DeleteMatching1rst3rdPersonControls(e_ControllerAction action, int32 key, eControllerType type)
+{
+	if (!GetIsKeyBlank(key, type))
+	{
+#ifdef BIND_VEHICLE_FIREWEAPON
+		CLEAR_ACTION_IF_NEEDED(PED_FIREWEAPON);
+#endif
+		CLEAR_ACTION_IF_NEEDED(PED_LOCK_TARGET);
+		CLEAR_ACTION_IF_NEEDED(GO_FORWARD);
+		CLEAR_ACTION_IF_NEEDED(GO_BACK);
+
+		if (FrontEndMenuManager.m_ControlMethod == CONTROL_CLASSIC)
+		{
+			CLEAR_ACTION_IF_NEEDED(PED_1RST_PERSON_LOOK_LEFT);
+			CLEAR_ACTION_IF_NEEDED(PED_1RST_PERSON_LOOK_RIGHT);
+			CLEAR_ACTION_IF_NEEDED(PED_1RST_PERSON_LOOK_DOWN);
+			CLEAR_ACTION_IF_NEEDED(PED_1RST_PERSON_LOOK_UP);
+		}
+	}
+}
+
+void CControllerConfigManager::DeleteMatchingVehicleControls(e_ControllerAction action, int32 key, eControllerType type)
+{
+	if (!GetIsKeyBlank(key, type))
+	{
+#ifdef BIND_VEHICLE_FIREWEAPON
+		CLEAR_ACTION_IF_NEEDED(VEHICLE_FIREWEAPON);
+#endif
+		CLEAR_ACTION_IF_NEEDED(VEHICLE_ACCELERATE);
+		CLEAR_ACTION_IF_NEEDED(VEHICLE_BRAKE);
+		CLEAR_ACTION_IF_NEEDED(VEHICLE_CHANGE_RADIO_STATION);
+		CLEAR_ACTION_IF_NEEDED(VEHICLE_HORN);
+		CLEAR_ACTION_IF_NEEDED(TOGGLE_SUBMISSIONS);
+		CLEAR_ACTION_IF_NEEDED(VEHICLE_HANDBRAKE);
+		CLEAR_ACTION_IF_NEEDED(VEHICLE_LOOKLEFT);
+		CLEAR_ACTION_IF_NEEDED(VEHICLE_LOOKRIGHT);
+		CLEAR_ACTION_IF_NEEDED(VEHICLE_LOOKBEHIND);
+		CLEAR_ACTION_IF_NEEDED(VEHICLE_TURRETLEFT);
+		CLEAR_ACTION_IF_NEEDED(VEHICLE_TURRETRIGHT);
+		CLEAR_ACTION_IF_NEEDED(VEHICLE_TURRETUP);
+		CLEAR_ACTION_IF_NEEDED(VEHICLE_TURRETDOWN);
+	}
+}
+
+void CControllerConfigManager::DeleteMatchingVehicle_3rdPersonControls(e_ControllerAction action, int32 key, eControllerType type)
+{
+	if (!GetIsKeyBlank(key, type))
+	{
+		CLEAR_ACTION_IF_NEEDED(VEHICLE_ENTER_EXIT);
+	}
+}
+
+void CControllerConfigManager::DeleteMatching1rstPersonControls(e_ControllerAction action, int32 key, eControllerType type)
+{
+	if (!GetIsKeyBlank(key, type))
+	{
+		CLEAR_ACTION_IF_NEEDED(PED_SNIPER_ZOOM_IN);
+		CLEAR_ACTION_IF_NEEDED(PED_SNIPER_ZOOM_OUT);
+	}
+}
+
+#undef CLEAR_ACTION_IF_NEEDED
+
+#ifdef RADIO_SCROLL_TO_PREV_STATION
+#define CHECK_ACTION(action) \
+if (key == GetControllerKeyAssociatedWithAction(action, type))\
+	return true;
+
+bool CControllerConfigManager::IsAnyVehicleActionAssignedToMouseKey(int32 key)
+{
+	const eControllerType type = MOUSE;
+	if (!GetIsKeyBlank(key, type))
+	{
+#ifdef BIND_VEHICLE_FIREWEAPON
+		CHECK_ACTION(VEHICLE_FIREWEAPON);
+#endif
+		CHECK_ACTION(VEHICLE_LOOKBEHIND);
+		CHECK_ACTION(VEHICLE_LOOKLEFT);
+		CHECK_ACTION(VEHICLE_LOOKRIGHT);
+		CHECK_ACTION(VEHICLE_HORN);
+		CHECK_ACTION(VEHICLE_HANDBRAKE);
+		CHECK_ACTION(VEHICLE_ACCELERATE);
+		CHECK_ACTION(VEHICLE_BRAKE);
+		CHECK_ACTION(VEHICLE_CHANGE_RADIO_STATION);
+		CHECK_ACTION(TOGGLE_SUBMISSIONS);
+		CHECK_ACTION(VEHICLE_TURRETLEFT);
+		CHECK_ACTION(VEHICLE_TURRETRIGHT);
+		CHECK_ACTION(VEHICLE_TURRETUP);
+		CHECK_ACTION(VEHICLE_TURRETDOWN);
+		CHECK_ACTION(VEHICLE_ENTER_EXIT);
+		CHECK_ACTION(CAMERA_CHANGE_VIEW_ALL_SITUATIONS);
+#ifndef BIND_VEHICLE_FIREWEAPON
+		CHECK_ACTION(PED_FIREWEAPON);
+#endif
+		CHECK_ACTION(GO_LEFT);
+		CHECK_ACTION(GO_RIGHT);
+		CHECK_ACTION(NETWORK_TALK);
+		CHECK_ACTION(SWITCH_DEBUG_CAM_ON);
+		CHECK_ACTION(TOGGLE_DPAD);
+		CHECK_ACTION(TAKE_SCREEN_SHOT);
+		CHECK_ACTION(SHOW_MOUSE_POINTER_TOGGLE);
+	}
+	return false;
+}
+
+#undef CHECK_ACTION
+#endif
+
+void CControllerConfigManager::DeleteMatchingActionInitiators(e_ControllerAction action, int32 key, eControllerType type)
+{
+	if (!GetIsKeyBlank(key, type))
+	{
+		switch (GetActionType(action))
+		{
+		case ACTIONTYPE_1RSTPERSON:
+			DeleteMatchingCommonControls           (action, key, type);
+			DeleteMatching1rstPersonControls       (action, key, type);
+			DeleteMatching1rst3rdPersonControls    (action, key, type);
+			break;
+		case ACTIONTYPE_3RDPERSON:
+			DeleteMatchingCommonControls           (action, key, type);
+			DeleteMatching1rst3rdPersonControls    (action, key, type);
+			DeleteMatching3rdPersonControls        (action, key, type);
+			DeleteMatchingVehicle_3rdPersonControls(action, key, type);
+			break;
+		case ACTIONTYPE_VEHICLE:
+			DeleteMatchingCommonControls           (action, key, type);
+			DeleteMatchingVehicleControls          (action, key, type);
+			DeleteMatchingVehicle_3rdPersonControls(action, key, type);
+			break;
+		case ACTIONTYPE_VEHICLE_3RDPERSON:
+			DeleteMatchingCommonControls           (action, key, type);
+			DeleteMatching1rst3rdPersonControls    (action, key, type);
+			DeleteMatching3rdPersonControls        (action, key, type);
+			DeleteMatchingVehicleControls          (action, key, type);
+			break;
+		case ACTIONTYPE_COMMON:
+			DeleteMatchingCommonControls           (action, key, type);
+			DeleteMatching1rstPersonControls       (action, key, type);
+			DeleteMatching1rst3rdPersonControls    (action, key, type);
+			DeleteMatching3rdPersonControls        (action, key, type);
+			DeleteMatchingVehicleControls          (action, key, type);
+			DeleteMatchingVehicle_3rdPersonControls(action, key, type);
+			break;
+		case ACTIONTYPE_1RST3RDPERSON:
+			DeleteMatchingCommonControls           (action, key, type);
+			DeleteMatching1rstPersonControls       (action, key, type);
+			DeleteMatching1rst3rdPersonControls    (action, key, type);
+			DeleteMatching3rdPersonControls        (action, key, type);
+			DeleteMatchingVehicle_3rdPersonControls(action, key, type);
+			break;
+		default: break;
+		}
+	}
+}
+
+bool CControllerConfigManager::GetIsKeyBlank(int32 key, eControllerType type)
+{
+	switch (type)
+	{
+	case KEYBOARD:
+	case OPTIONAL_EXTRA:
+		if (key != rsNULL)
+			return false;
+		break;
+
+	case JOYSTICK:
+		if (key != 0)
+			return false;
+		break;
+
+	case MOUSE:
+		if (key != 0)
+			return false;
+		break;
+	default: break;
+	}
+
+	return true;
+}
+
+e_ControllerActionType CControllerConfigManager::GetActionType(e_ControllerAction action)
+{
+	switch (action)
+	{
+#ifndef BIND_VEHICLE_FIREWEAPON
+	case PED_FIREWEAPON:
+#endif
+	case GO_LEFT:
+	case GO_RIGHT:
+	case CAMERA_CHANGE_VIEW_ALL_SITUATIONS:
+	case NETWORK_TALK:
+	case TOGGLE_DPAD:
+	case SWITCH_DEBUG_CAM_ON:
+	case TAKE_SCREEN_SHOT:
+	case SHOW_MOUSE_POINTER_TOGGLE:
+		return ACTIONTYPE_COMMON;
+		break;
+
+	case PED_CYCLE_WEAPON_RIGHT:
+	case PED_CYCLE_WEAPON_LEFT:
+	case PED_JUMPING:
+	case PED_SPRINT:
+	case PED_LOOKBEHIND:
+	case PED_DUCK:
+	case PED_ANSWER_PHONE:
+	case PED_CYCLE_TARGET_LEFT:
+	case PED_CYCLE_TARGET_RIGHT:
+	case PED_CENTER_CAMERA_BEHIND_PLAYER:
+		return ACTIONTYPE_3RDPERSON;
+		break;
+
+#ifdef BIND_VEHICLE_FIREWEAPON
+	case VEHICLE_FIREWEAPON:
+#endif
+	case VEHICLE_ACCELERATE:
+	case VEHICLE_BRAKE:
+	case VEHICLE_CHANGE_RADIO_STATION:
+	case VEHICLE_HORN:
+	case TOGGLE_SUBMISSIONS:
+	case VEHICLE_HANDBRAKE:
+	case VEHICLE_LOOKLEFT:
+	case VEHICLE_LOOKRIGHT:
+	case VEHICLE_LOOKBEHIND:
+	case VEHICLE_TURRETLEFT:
+	case VEHICLE_TURRETRIGHT:
+	case VEHICLE_TURRETUP:
+	case VEHICLE_TURRETDOWN:
+		return ACTIONTYPE_VEHICLE;
+		break;
+
+	case VEHICLE_ENTER_EXIT:
+		return ACTIONTYPE_VEHICLE_3RDPERSON;
+		break;
+
+#ifdef BIND_VEHICLE_FIREWEAPON
+	case PED_FIREWEAPON:
+#endif
+	case GO_FORWARD:
+	case GO_BACK:
+	case PED_1RST_PERSON_LOOK_LEFT:
+	case PED_1RST_PERSON_LOOK_RIGHT:
+	case PED_LOCK_TARGET:
+	case PED_1RST_PERSON_LOOK_UP:
+	case PED_1RST_PERSON_LOOK_DOWN:
+		return ACTIONTYPE_1RST3RDPERSON;
+		break;
+
+	case PED_SNIPER_ZOOM_IN:
+	case PED_SNIPER_ZOOM_OUT:
+		return ACTIONTYPE_1RSTPERSON;
+		break;
+	default: break;
+	}
+
+	return ACTIONTYPE_NONE;
+}
+
+void CControllerConfigManager::ClearSettingsAssociatedWithAction(e_ControllerAction action, eControllerType type)
+{
+	switch (type)
+	{
+	case KEYBOARD:
+		m_aSettings[action][type].m_Key = rsNULL;
+		m_aSettings[action][type].m_ContSetOrder = SETORDER_NONE;
+		break;
+	case OPTIONAL_EXTRA:
+		m_aSettings[action][type].m_Key = rsNULL;
+		m_aSettings[action][type].m_ContSetOrder = SETORDER_NONE;
+		break;
+	case MOUSE:
+		m_aSettings[action][type].m_Key = 0;
+		m_aSettings[action][type].m_ContSetOrder = SETORDER_NONE;
+		break;
+	case JOYSTICK:
+		m_aSettings[action][type].m_Key = 0;
+		m_aSettings[action][type].m_ContSetOrder = SETORDER_NONE;
+		break;
+	default: break;
+	}
+
+	ResetSettingOrder(action);
+}
+
+wchar *CControllerConfigManager::GetControllerSettingTextWithOrderNumber(e_ControllerAction action, eContSetOrder setorder)
+{
+	for (int i = 0; i < MAX_CONTROLLERTYPES; i++)
+	{
+		if (m_aSettings[action][i].m_ContSetOrder == setorder)
+		{
+			switch (i)
+			{
+			case KEYBOARD:
+			case OPTIONAL_EXTRA:
+				return GetControllerSettingTextKeyBoard(action, (eControllerType)i);
+			case MOUSE:
+				return GetControllerSettingTextMouse   (action);
+			case JOYSTICK:
+				return GetControllerSettingTextJoystick(action);
+			default: break;
+			}
+		}
+	}
+	
+	return NULL;
+}
+
+wchar *CControllerConfigManager::GetControllerSettingTextKeyBoard(e_ControllerAction action, eControllerType type)
+{
+	static wchar ActionText[50];
+	static wchar NewStringWithNumber[30];
+
+	for (int32 i = 0; i < ARRAY_SIZE(ActionText); i++)
+		ActionText[i] = '\0';
+
+	if (GetControllerKeyAssociatedWithAction(action, type) != rsNULL)
+	{
+		if (   GetControllerKeyAssociatedWithAction(action, type) >= 0
+			&& GetControllerKeyAssociatedWithAction(action, type) <= 255)
+		{
+			char c = GetControllerKeyAssociatedWithAction(action, type);
+			if (c == ' ')
+				return TheText.Get("FEC_SPC"); // "SPC"
+			else
+			{
+				ActionText[0] = CFont::character_code(c);
+				if (ActionText[0] == '\0')
+					ActionText[0] = CFont::character_code('#');
+				ActionText[1] = '\0';
+				return ActionText;
+			}
+		}
+		else
+		{
+			switch (GetControllerKeyAssociatedWithAction(action, type))
+			{
+				case rsF1:
+				case rsF2:
+				case rsF3:
+				case rsF4:
+				case rsF5:
+				case rsF6:
+				case rsF7:
+				case rsF8:
+				case rsF9:
+				case rsF10:
+				case rsF11:
+				case rsF12:
+				{
+					CMessages::InsertNumberInString(TheText.Get("FEC_FNC"), // "F~1~"
+						GetControllerKeyAssociatedWithAction(action, type) - rsESC,
+						-1, -1, -1, -1, -1,
+						NewStringWithNumber);
+					return NewStringWithNumber;
+					break;
+				}
+
+				case rsINS:
+				{
+					return TheText.Get("FEC_IRT"); // "INS"
+					break;
+				}
+
+				case rsDEL:
+				{
+					return TheText.Get("FEC_DLL"); // "DEL"
+					break;
+				}
+
+				case rsHOME:
+				{
+					return TheText.Get("FEC_HME"); // "HOME"
+					break;
+				}
+
+				case rsEND:
+				{
+					return TheText.Get("FEC_END"); // "END"
+					break;
+				}
+
+				case rsPGUP:
+				{
+					return TheText.Get("FEC_PGU"); // "PGUP"
+					break;
+				}
+
+				case rsPGDN:
+				{
+					return TheText.Get("FEC_PGD"); // "PGDN"
+					break;
+				}
+
+				case rsUP:
+				{
+					return TheText.Get("FEC_UPA"); // "UP"
+					break;
+				}
+
+				case rsDOWN:
+				{
+					return TheText.Get("FEC_DWA"); // "DOWN"
+					break;
+				}
+
+				case rsLEFT:
+				{
+					return TheText.Get("FEC_LFA"); // "LEFT"
+					break;
+				}
+
+				case rsRIGHT:
+				{
+					return TheText.Get("FEC_RFA"); // "RIGHT"
+					break;
+				}
+
+				case rsDIVIDE:
+				{
+					return TheText.Get("FEC_FWS"); // "NUM /"
+					break;
+				}
+
+				case rsTIMES:
+				{
+					return TheText.Get("FEC_STR"); // "NUM STAR"
+					break;
+				}
+
+				case rsPLUS:
+				{
+					return TheText.Get("FEC_PLS"); // "NUM +"
+					break;
+				}
+
+				case rsMINUS:
+				{
+					return TheText.Get("FEC_MIN"); // "NUM -"
+					break;
+				}
+
+				case rsPADDEL:
+				{
+					return TheText.Get("FEC_DOT"); // "NUM ."
+					break;
+				}
+
+				case rsPADEND:
+				{
+					CMessages::InsertNumberInString(TheText.Get("FEC_NMN"), // "NUM~1~"
+						1, -1, -1, -1, -1, -1, NewStringWithNumber);
+					return NewStringWithNumber;
+					break;
+				}
+
+				case rsPADDOWN:
+				{
+					CMessages::InsertNumberInString(TheText.Get("FEC_NMN"), // "NUM~1~"
+						2, -1, -1, -1, -1, -1,
+						NewStringWithNumber);
+					return NewStringWithNumber;
+					break;
+				}
+
+				case rsPADPGDN:
+				{
+					CMessages::InsertNumberInString(TheText.Get("FEC_NMN"), // "NUM~1~"
+						3, -1, -1, -1, -1, -1,
+						NewStringWithNumber);
+					return NewStringWithNumber;
+					break;
+				}
+
+				case rsPADLEFT:
+				{
+					CMessages::InsertNumberInString(TheText.Get("FEC_NMN"), // "NUM~1~"
+						4, -1, -1, -1, -1, -1,
+						NewStringWithNumber);
+					return NewStringWithNumber;
+					break;
+				}
+
+				case rsPAD5:
+				{
+					CMessages::InsertNumberInString(TheText.Get("FEC_NMN"), // "NUM~1~"
+						5, -1, -1, -1, -1, -1,
+						NewStringWithNumber);
+					return NewStringWithNumber;
+					break;
+				}
+
+				case rsNUMLOCK:
+				{
+					return TheText.Get("FEC_NLK"); // "NUMLOCK"
+					break;
+				}
+
+				case rsPADRIGHT:
+				{
+					CMessages::InsertNumberInString(TheText.Get("FEC_NMN"), // "NUM~1~"
+						6, -1, -1, -1, -1, -1,
+						NewStringWithNumber);
+					return NewStringWithNumber;
+					break;
+				}
+
+				case rsPADHOME:
+				{
+					CMessages::InsertNumberInString(TheText.Get("FEC_NMN"), // "NUM~1~"
+						7, -1, -1, -1, -1, -1,
+						NewStringWithNumber);
+					return NewStringWithNumber;
+					break;
+				}
+
+				case rsPADUP:
+				{
+					CMessages::InsertNumberInString(TheText.Get("FEC_NMN"), // "NUM~1~"
+						8, -1, -1, -1, -1, -1,
+						NewStringWithNumber);
+					return NewStringWithNumber;
+					break;
+				}
+
+				case rsPADPGUP:
+				{
+					CMessages::InsertNumberInString(TheText.Get("FEC_NMN"), // "NUM~1~"
+						9, -1, -1, -1, -1, -1,
+						NewStringWithNumber);
+					return NewStringWithNumber;
+					break;
+				}
+
+				case rsPADINS:
+				{
+					CMessages::InsertNumberInString(TheText.Get("FEC_NMN"), // "NUM~1~"
+						0, -1, -1, -1, -1, -1,
+						NewStringWithNumber);
+					return NewStringWithNumber;
+					break;
+				}
+
+				case rsPADENTER:
+				{
+					return TheText.Get("FEC_ETR"); // "ENT"
+					break;
+				}
+
+				case rsSCROLL:
+				{
+					return TheText.Get("FEC_SLK"); // "SCROLL LOCK"
+					break;
+				}
+
+				case rsPAUSE:
+				{
+					return TheText.Get("FEC_PSB"); // "BREAK"
+					break;
+				}
+
+				case rsBACKSP:
+				{
+					return TheText.Get("FEC_BSP"); // "BSPACE"
+					break;
+				}
+
+				case rsTAB:
+				{
+					return TheText.Get("FEC_TAB"); // "TAB"
+					break;
+				}
+
+				case rsCAPSLK:
+				{
+					return TheText.Get("FEC_CLK"); // "CAPSLOCK"
+					break;
+				}
+
+				case rsENTER:
+				{
+					return TheText.Get("FEC_RTN"); // "RET"
+					break;
+				}
+
+				case rsLSHIFT:
+				{
+					return TheText.Get("FEC_LSF"); // "LSHIFT"
+					break;
+				}
+
+				case rsRSHIFT:
+				{
+					return TheText.Get("FEC_RSF"); // "RSHIFT"
+					break;
+				}
+
+				case rsLCTRL:
+				{
+					return TheText.Get("FEC_LCT"); // "LCTRL"
+					break;
+				}
+
+				case rsRCTRL:
+				{
+					return TheText.Get("FEC_RCT"); // "RCTRL"
+					break;
+				}
+
+				case rsLALT:
+				{
+					return TheText.Get("FEC_LAL"); // "LALT"
+					break;
+				}
+
+				case rsRALT:
+				{
+					return TheText.Get("FEC_RAL"); // "RALT"
+					break;
+				}
+
+				case rsLWIN:
+				{
+					return TheText.Get("FEC_LWD"); // "LWIN"
+					break;
+				}
+
+				case rsRWIN:
+				{
+					return TheText.Get("FEC_RWD"); // "RWIN"
+					break;
+				}
+
+				case rsAPPS:
+				{
+					return TheText.Get("FEC_WRC"); // "WINCLICK"
+					break;
+				}
+
+				case rsSHIFT:
+				{
+					return TheText.Get("FEC_SFT"); // "SHIFT"
+					break;
+				}
+				default: break;
+			}
+		}
+	}
+
+	return NULL;
+}
+
+wchar *CControllerConfigManager::GetControllerSettingTextMouse(e_ControllerAction action)
+{
+	switch (m_aSettings[action][MOUSE].m_Key)
+	{
+	case 1:
+		return TheText.Get("FEC_MSL");	// LMB
+		break;
+	case 2:
+		return TheText.Get("FEC_MSM");	// MMB
+		break;
+	case 3:
+		return TheText.Get("FEC_MSR");	// RMB
+		break;
+	case 4:
+		return TheText.Get("FEC_MWF");	// WHEEL UP
+		break;
+	case 5:
+		return TheText.Get("FEC_MWB");	// WHEEL DN
+		break;
+	case 6:
+		return TheText.Get("FEC_MXO");	// MXB1
+		break;
+	case 7:
+		return TheText.Get("FEC_MXT");	// MXB2
+		break;
+	default: break;
+	}
+
+	return NULL;
+}
+
+wchar *CControllerConfigManager::GetControllerSettingTextJoystick(e_ControllerAction action)
+{
+	if (m_aSettings[action][JOYSTICK].m_Key == 0) 
+		return NULL;
+
+	static wchar NewStringWithNumber[30];
+
+	CMessages::InsertNumberInString(TheText.Get("FEC_JBO"),		// JOY ~1~
+		m_aSettings[action][JOYSTICK].m_Key, -1, -1, -1, -1, -1,
+		NewStringWithNumber);
+
+	return NewStringWithNumber;
+}
+
+int32 CControllerConfigManager::GetNumOfSettingsForAction(e_ControllerAction action)
+{
+	int32 num = 0;
+
+	if (m_aSettings[action][KEYBOARD].m_Key       != rsNULL) num++;
+	if (m_aSettings[action][OPTIONAL_EXTRA].m_Key != rsNULL) num++;
+	if (m_aSettings[action][MOUSE].m_Key          != 0)      num++;
+	if (m_aSettings[action][JOYSTICK].m_Key       != 0)      num++;
+
+	return num;
+}
+
+#ifdef BIND_VEHICLE_FIREWEAPON
+#define VFB(b) b,
+#else
+#define VFB(b)
+#endif
+
+#define CONTROLLER_BUTTONS(T, O, X, Q, L1, L2, L3, R1, R2, R3, SELECT, RSU, RSD, RSL, RSR)                                                                                         \
+	{{                                                                                                                                                         \
+	     O,      /* PED_FIREWEAPON */                                                                                                                          \
+	     R2,     /* PED_CYCLE_WEAPON_RIGHT */                                                                                                                  \
+	     L2,     /* PED_CYCLE_WEAPON_LEFT */                                                                                                                   \
+	     nil,    /* GO_FORWARD */                                                                                                                              \
+	     nil,    /* GO_BACK */                                                                                                                                 \
+	     LEFT,    /* GO_LEFT */                                                                                                                                 \
+	     RIGHT,    /* GO_RIGHT */                                                                                                                                \
+	     Q,      /* PED_SNIPER_ZOOM_IN */                                                                                                                      \
+	     X,      /* PED_SNIPER_ZOOM_OUT */                                                                                                                     \
+	     T,      /* VEHICLE_ENTER_EXIT */                                                                                                                      \
+	     SELECT, /* CAMERA_CHANGE_VIEW_ALL_SITUATIONS */                                                                                                       \
+	     Q,      /* PED_JUMPING */                                                                                                                             \
+	     X,      /* PED_SPRINT */                                                                                                                              \
+	     R3,     /* PED_LOOKBEHIND */                                                                                                                          \
+	     L3,     /* PED_DUCK */                                                                                                                                \
+	     L1,     /* PED_ANSWER_PHONE */                                                                                                                        \
+	     VFB(O)  /* VEHICLE_FIREWEAPON */                                                                                                                      \
+	     X,      /* VEHICLE_ACCELERATE */                                                                                                                      \
+	     Q,      /* VEHICLE_BRAKE */                                                                                                                           \
+	     L1,     /* VEHICLE_CHANGE_RADIO_STATION */                                                                                                            \
+	     L3,     /* VEHICLE_HORN */                                                                                                                            \
+	     R3,     /* TOGGLE_SUBMISSIONS */                                                                                                                      \
+	     R1,     /* VEHICLE_HANDBRAKE */                                                                                                                       \
+	     nil,    /* PED_1RST_PERSON_LOOK_LEFT */                                                                                                               \
+	     nil,    /* PED_1RST_PERSON_LOOK_RIGHT */                                                                                                              \
+	     L2,     /* VEHICLE_LOOKLEFT */                                                                                                                        \
+	     R2,     /* VEHICLE_LOOKRIGHT */                                                                                                                       \
+	     nil,    /* VEHICLE_LOOKBEHIND */                                                                                                                      \
+	     RSL,    /* VEHICLE_TURRETLEFT */                                                                                                                      \
+	     RSR,    /* VEHICLE_TURRETRIGHT */                                                                                                                     \
+	     UP,    /* VEHICLE_TURRETUP */                                                                                                                        \
+	     DOWN,    /* VEHICLE_TURRETDOWN */                                                                                                                      \
+	     L2,     /* PED_CYCLE_TARGET_LEFT */                                                                                                                   \
+	     R2,     /* PED_CYCLE_TARGET_RIGHT */                                                                                                                  \
+	     L1,     /* PED_CENTER_CAMERA_BEHIND_PLAYER */                                                                                                         \
+	     R1,     /* PED_LOCK_TARGET */                                                                                                                         \
+	     nil,    /* NETWORK_TALK */                                                                                                                            \
+	     nil,    /* PED_1RST_PERSON_LOOK_UP */                                                                                                                 \
+	     nil,    /* PED_1RST_PERSON_LOOK_DOWN */                                                                                                               \
+	     nil,    /* _CONTROLLERACTION_36 */                                                                                                                    \
+	     nil,    /* TOGGLE_DPAD */                                                                                                                             \
+	     nil,    /* SWITCH_DEBUG_CAM_ON */                                                                                                                     \
+	     nil,    /* TAKE_SCREEN_SHOT */                                                                                                                        \
+	     nil,    /* UNKNOWN_ACTION */                                                                                                                          \
+	     nil,    /* SHOW_MOUSE_POINTER_TOGGLE */                                                                                                               \
+	 },                                                                                                                                                        \
+	 {                                                                                                                                                         \
+	     O,      /* PED_FIREWEAPON */                                                                                                                          \
+	     R2,     /* PED_CYCLE_WEAPON_RIGHT */                                                                                                                  \
+	     L2,     /* PED_CYCLE_WEAPON_LEFT */                                                                                                                   \
+	     nil,    /* GO_FORWARD */                                                                                                                              \
+	     nil,    /* GO_BACK */                                                                                                                                 \
+	     LEFT,   /* GO_LEFT */                                                                                                                                 \
+	     RIGHT,  /* GO_RIGHT */                                                                                                                                \
+	     Q,      /* PED_SNIPER_ZOOM_IN */                                                                                                                      \
+	     X,      /* PED_SNIPER_ZOOM_OUT */                                                                                                                     \
+	     T,      /* VEHICLE_ENTER_EXIT */                                                                                                                      \
+	     SELECT, /* CAMERA_CHANGE_VIEW_ALL_SITUATIONS */                                                                                                       \
+	     Q,      /* PED_JUMPING */                                                                                                                             \
+	     X,      /* PED_SPRINT */                                                                                                                              \
+	     R3,     /* PED_LOOKBEHIND */                                                                                                                          \
+	     L3,     /* PED_DUCK */                                                                                                                                \
+	     L1,     /* PED_ANSWER_PHONE */                                                                                                                        \
+	     VFB(O)  /* VEHICLE_FIREWEAPON */                                                                                                                      \
+	     X,      /* VEHICLE_ACCELERATE */                                                                                                                      \
+	     Q,      /* VEHICLE_BRAKE */                                                                                                                           \
+	     SELECT, /* VEHICLE_CHANGE_RADIO_STATION */                                                                                                            \
+	     L1,     /* VEHICLE_HORN */                                                                                                                            \
+	     R3,     /* TOGGLE_SUBMISSIONS */                                                                                                                      \
+	     R1,     /* VEHICLE_HANDBRAKE */                                                                                                                       \
+	     nil,    /* PED_1RST_PERSON_LOOK_LEFT */                                                                                                               \
+	     nil,    /* PED_1RST_PERSON_LOOK_RIGHT */                                                                                                              \
+	     L2,     /* VEHICLE_LOOKLEFT */                                                                                                                        \
+	     R2,     /* VEHICLE_LOOKRIGHT */                                                                                                                       \
+	     nil,    /* VEHICLE_LOOKBEHIND */                                                                                                                      \
+	     RSL,    /* VEHICLE_TURRETLEFT */                                                                                                                      \
+	     RSR,    /* VEHICLE_TURRETRIGHT */                                                                                                                     \
+	     UP,    /* VEHICLE_TURRETUP */                                                                                                                        \
+	     DOWN,    /* VEHICLE_TURRETDOWN */                                                                                                                      \
+	     L2,     /* PED_CYCLE_TARGET_LEFT */                                                                                                                   \
+	     R2,     /* PED_CYCLE_TARGET_RIGHT */                                                                                                                  \
+	     L1,     /* PED_CENTER_CAMERA_BEHIND_PLAYER */                                                                                                         \
+	     R1,     /* PED_LOCK_TARGET */                                                                                                                         \
+	     nil,    /* NETWORK_TALK */                                                                                                                            \
+	     nil,    /* PED_1RST_PERSON_LOOK_UP */                                                                                                                 \
+	     nil,    /* PED_1RST_PERSON_LOOK_DOWN */                                                                                                               \
+	     nil,    /* _CONTROLLERACTION_36 */                                                                                                                    \
+	     nil,    /* TOGGLE_DPAD */                                                                                                                             \
+	     nil,    /* SWITCH_DEBUG_CAM_ON */                                                                                                                     \
+	     nil,    /* TAKE_SCREEN_SHOT */                                                                                                                        \
+	     nil,    /* UNKNOWN_ACTION */                                                                                                                          \
+	     nil,    /* SHOW_MOUSE_POINTER_TOGGLE */                                                                                                               \
+	 },                                                                                                                                                        \
+	 {                                                                                                                                                         \
+	     X,      /* PED_FIREWEAPON */                                                                                                                          \
+	     R2,     /* PED_CYCLE_WEAPON_RIGHT */                                                                                                                  \
+	     L2,     /* PED_CYCLE_WEAPON_LEFT */                                                                                                                   \
+	     nil,    /* GO_FORWARD */                                                                                                                              \
+	     nil,    /* GO_BACK */                                                                                                                                 \
+	     LEFT,   /* GO_LEFT */                                                                                                                                 \
+	     RIGHT,  /* GO_RIGHT */                                                                                                                                \
+	     T,      /* PED_SNIPER_ZOOM_IN */                                                                                                                      \
+	     Q,      /* PED_SNIPER_ZOOM_OUT */                                                                                                                     \
+	     L1,     /* VEHICLE_ENTER_EXIT */                                                                                                                      \
+	     SELECT, /* CAMERA_CHANGE_VIEW_ALL_SITUATIONS */                                                                                                       \
+	     Q,      /* PED_JUMPING */                                                                                                                             \
+	     O,      /* PED_SPRINT */                                                                                                                              \
+	     R3,     /* PED_LOOKBEHIND */                                                                                                                          \
+	     L3,     /* PED_DUCK */                                                                                                                                \
+	     T,     /* PED_ANSWER_PHONE */                                                                                                                        \
+	     VFB(O)  /* VEHICLE_FIREWEAPON */                                                                                                                      \
+	     X,      /* VEHICLE_ACCELERATE */                                                                                                                      \
+	     Q,      /* VEHICLE_BRAKE */                                                                                                                           \
+	     L3,     /* VEHICLE_CHANGE_RADIO_STATION */                                                                                                            \
+	     R1,     /* VEHICLE_HORN */                                                                                                                            \
+	     R3,     /* TOGGLE_SUBMISSIONS */                                                                                                                      \
+	     T,      /* VEHICLE_HANDBRAKE */                                                                                                                       \
+	     nil,    /* PED_1RST_PERSON_LOOK_LEFT */                                                                                                               \
+	     nil,    /* PED_1RST_PERSON_LOOK_RIGHT */                                                                                                              \
+	     L2,     /* VEHICLE_LOOKLEFT */                                                                                                                        \
+	     R2,     /* VEHICLE_LOOKRIGHT */                                                                                                                       \
+	     nil,    /* VEHICLE_LOOKBEHIND */                                                                                                                      \
+	     RSL,    /* VEHICLE_TURRETLEFT */                                                                                                                      \
+	     RSR,    /* VEHICLE_TURRETRIGHT */                                                                                                                     \
+	     UP,    /* VEHICLE_TURRETUP */                                                                                                                        \
+	     DOWN,    /* VEHICLE_TURRETDOWN */                                                                                                                      \
+	     L2,     /* PED_CYCLE_TARGET_LEFT */                                                                                                                   \
+	     R2,     /* PED_CYCLE_TARGET_RIGHT */                                                                                                                  \
+	     T,      /* PED_CENTER_CAMERA_BEHIND_PLAYER */                                                                                                         \
+	     R1,     /* PED_LOCK_TARGET */                                                                                                                         \
+	     nil,    /* NETWORK_TALK */                                                                                                                            \
+	     nil,    /* PED_1RST_PERSON_LOOK_UP */                                                                                                                 \
+	     nil,    /* PED_1RST_PERSON_LOOK_DOWN */                                                                                                               \
+	     nil,    /* _CONTROLLERACTION_36 */                                                                                                                    \
+	     nil,    /* TOGGLE_DPAD */                                                                                                                             \
+	     nil,    /* SWITCH_DEBUG_CAM_ON */                                                                                                                     \
+	     nil,    /* TAKE_SCREEN_SHOT */                                                                                                                        \
+	     nil,    /* UNKNOWN_ACTION */                                                                                                                          \
+	     nil,    /* SHOW_MOUSE_POINTER_TOGGLE */                                                                                                               \
+	 },                                                                                                                                                        \
+	 {                                                                                                                                                         \
+	     R1,     /* PED_FIREWEAPON */                                                                                                                          \
+	     R2,     /* PED_CYCLE_WEAPON_RIGHT */                                                                                                                  \
+	     L2,     /* PED_CYCLE_WEAPON_LEFT */                                                                                                                   \
+	     nil,    /* GO_FORWARD */                                                                                                                              \
+	     nil,    /* GO_BACK */                                                                                                                                 \
+	     LEFT,   /* GO_LEFT */                                                                                                                                 \
+	     RIGHT,  /* GO_RIGHT */                                                                                                                                \
+	     Q,      /* PED_SNIPER_ZOOM_IN */                                                                                                                      \
+	     X,      /* PED_SNIPER_ZOOM_OUT */                                                                                                                     \
+	     T,      /* VEHICLE_ENTER_EXIT */                                                                                                                      \
+	     SELECT, /* CAMERA_CHANGE_VIEW_ALL_SITUATIONS */                                                                                                       \
+	     Q,      /* PED_JUMPING */                                                                                                                             \
+	     X,      /* PED_SPRINT */                                                                                                                              \
+	     R3,     /* PED_LOOKBEHIND */                                                                                                                          \
+	     L3,     /* PED_DUCK */                                                                                                                                \
+	     O,     /* PED_ANSWER_PHONE */                                                                                                                        \
+	     VFB(R1) /* VEHICLE_FIREWEAPON */                                                                                                                      \
+	     RSU,    /* VEHICLE_ACCELERATE */                                                                                                                      \
+	     RSD,    /* VEHICLE_BRAKE */                                                                                                                           \
+	     O,      /* VEHICLE_CHANGE_RADIO_STATION */                                                                                                            \
+	     L3,     /* VEHICLE_HORN */                                                                                                                            \
+	     Q,      /* TOGGLE_SUBMISSIONS */                                                                                                                      \
+	     L1,     /* VEHICLE_HANDBRAKE */                                                                                                                       \
+	     nil,    /* PED_1RST_PERSON_LOOK_LEFT */                                                                                                               \
+	     nil,    /* PED_1RST_PERSON_LOOK_RIGHT */                                                                                                              \
+	     L2,     /* VEHICLE_LOOKLEFT */                                                                                                                        \
+	     R2,     /* VEHICLE_LOOKRIGHT */                                                                                                                       \
+	     nil,    /* VEHICLE_LOOKBEHIND */                                                                                                                      \
+	     RSL,    /* VEHICLE_TURRETLEFT */                                                                                                                      \
+	     RSR,    /* VEHICLE_TURRETRIGHT */                                                                                                                     \
+	     UP,    /* VEHICLE_TURRETUP */                                                                                                                        \
+	     DOWN,    /* VEHICLE_TURRETDOWN */                                                                                                                      \
+	     L2,     /* PED_CYCLE_TARGET_LEFT */                                                                                                                   \
+	     R2,     /* PED_CYCLE_TARGET_RIGHT */                                                                                                                  \
+	     O,      /* PED_CENTER_CAMERA_BEHIND_PLAYER */                                                                                                         \
+	     L1,     /* PED_LOCK_TARGET */                                                                                                                         \
+	     nil,    /* NETWORK_TALK */                                                                                                                            \
+	     nil,    /* PED_1RST_PERSON_LOOK_UP */                                                                                                                 \
+	     nil,    /* PED_1RST_PERSON_LOOK_DOWN */                                                                                                               \
+	     nil,    /* _CONTROLLERACTION_36 */                                                                                                                    \
+	     nil,    /* TOGGLE_DPAD */                                                                                                                             \
+	     nil,    /* SWITCH_DEBUG_CAM_ON */                                                                                                                     \
+	     nil,    /* TAKE_SCREEN_SHOT */                                                                                                                        \
+	     nil,    /* UNKNOWN_ACTION */                                                                                                                          \
+	     nil,    /* SHOW_MOUSE_POINTER_TOGGLE */                                                                                                               \
+	 }}
+
+#ifdef BUTTON_ICONS
+#define UP "~U~"
+#define DOWN "~D~"
+#define LEFT "~<~"
+#define RIGHT "~>~"
+#else
+#define UP "UP"
+#define DOWN "DOWN"
+#define LEFT "LEFT"
+#define RIGHT "RIGHT"
+#endif
+
+const char *XboxButtons_noIcons[][MAX_CONTROLLERACTIONS] = CONTROLLER_BUTTONS("Y", "B", "A", "X", "LB", "LT", "LS", "RB", "RT", "RS", "BACK", "right stick up", "right stick down", "right stick left", "right stick right");
+
+#ifdef BUTTON_ICONS
+const char *XboxButtons[][MAX_CONTROLLERACTIONS] = CONTROLLER_BUTTONS("~T~", "~O~", "~X~", "~Q~", "~K~", "~M~", "~A~", "~J~", "~V~", "~C~", "BACK", "~H~", "~L~", "~(~", "~)~");
+#endif
+
+
+#if 0 // set 1 for ps2 fonts
+#define PS2_TRIANGLE "\""
+#define PS2_CIRCLE "|"
+#define PS2_CROSS "/"
+#define PS2_SQUARE "^"
+#else
+#define PS2_TRIANGLE "TRIANGLE"
+#define PS2_CIRCLE "CIRCLE"
+#define PS2_CROSS "CROSS"
+#define PS2_SQUARE "SQUARE"
+#endif
+
+const char *PlayStationButtons_noIcons[][MAX_CONTROLLERACTIONS] =
+    CONTROLLER_BUTTONS(PS2_TRIANGLE, PS2_CIRCLE, PS2_CROSS, PS2_SQUARE, "L1", "L2", "L3", "R1", "R2", "R3", "SELECT", "right stick up", "right stick down", "right stick left", "right stick right");
+
+#ifdef BUTTON_ICONS
+const char *PlayStationButtons[][MAX_CONTROLLERACTIONS] =
+    CONTROLLER_BUTTONS("~T~", "~O~", "~X~", "~Q~", "~K~", "~M~", "~A~", "~J~", "~V~", "~C~", "SELECT", "~H~", "~L~", "~(~", "~)~");
+#endif
+
+#undef PS2_TRIANGLE
+#undef PS2_CIRCLE
+#undef PS2_CROSS
+#undef PS2_SQUARE
+
+#undef UP
+#undef DOWN
+#undef LEFT
+#undef RIGHT
+
+#undef CONTROLLER_BUTTONS
+#undef VFB
+
+void CControllerConfigManager::GetWideStringOfCommandKeys(uint16 action, wchar *text, uint16 leight)
+{
+#ifdef DETECT_PAD_INPUT_SWITCH
+	if (CPad::GetPad(0)->IsAffectedByController) {
+		wchar wstr[16];
+
+		const char* (*Buttons)[MAX_CONTROLLERACTIONS];
+
+#ifdef BUTTON_ICONS
+	#ifdef GAMEPAD_MENU
+		switch (FrontEndMenuManager.m_PrefsControllerType)
+		{
+		case CMenuManager::CONTROLLER_DUALSHOCK2:
+		case CMenuManager::CONTROLLER_DUALSHOCK3:
+		case CMenuManager::CONTROLLER_DUALSHOCK4:
+			Buttons = CFont::ButtonsSlot != -1 ? PlayStationButtons : PlayStationButtons_noIcons;
+			break;
+		default:
+	#endif
+			Buttons = CFont::ButtonsSlot != -1 ? XboxButtons : XboxButtons_noIcons;
+	#ifdef GAMEPAD_MENU
+			break;
+		}
+	#endif
+#else
+		switch (FrontEndMenuManager.m_PrefsControllerType)
+		{
+		case CMenuManager::CONTROLLER_DUALSHOCK2:
+		case CMenuManager::CONTROLLER_DUALSHOCK3:
+		case CMenuManager::CONTROLLER_DUALSHOCK4:
+			Buttons = PlayStationButtons_noIcons;
+			break;
+		default:
+			Buttons = XboxButtons_noIcons;
+			break;
+		}
+#endif
+
+		assert(Buttons[CPad::GetPad(0)->Mode][action] != nil); // we cannot use these
+		AsciiToUnicode(Buttons[CPad::GetPad(0)->Mode][action], wstr);
+
+		CMessages::WideStringCopy(text, wstr, leight);
+		return;
+	}
+#endif
+
+	int32 nums = GetNumOfSettingsForAction((e_ControllerAction)action);
+
+	int32 sets = 0;
+
+	for (int32 i = SETORDER_1; i < MAX_SETORDERS; i++)
+	{
+		wchar *textorder = ControlsManager.GetControllerSettingTextWithOrderNumber((e_ControllerAction)action, (eContSetOrder)i);
+		if (textorder != NULL)
+		{
+			uint16 len = CMessages::GetWideStringLength(text);
+			CMessages::WideStringCopy(&text[len], textorder, leight - len);
+
+			if (++sets < nums)
+			{
+				if (sets == nums - 1)
+				{
+					// if last - text += ' or ';
+					uint16 pos1 = CMessages::GetWideStringLength(text);
+					text[pos1] = ' ';
+
+					CMessages::WideStringCopy(&text[pos1 + 1],
+						TheText.Get("FEC_ORR"),	// "or"
+						leight - (pos1 + 1));
+					
+					uint16 pos2 = CMessages::GetWideStringLength(text);
+					text[pos2 + 0] = ' ';
+					text[pos2 + 1] = '\0';
+				}
+				else
+				{
+					// text += ', ';
+					uint16 pos1 = CMessages::GetWideStringLength(text);
+					text[pos1 + 0] = ',';
+					text[pos1 + 1] = ' ';
+					text[pos1 + 2] = '\0';
+
+					uint16 pos2 = CMessages::GetWideStringLength(text);
+				}
+			}
+		}
+	}
+}
+
+int32 CControllerConfigManager::GetControllerKeyAssociatedWithAction(e_ControllerAction action, eControllerType type)
+{
+	return m_aSettings[action][type].m_Key;
+}
+
+void CControllerConfigManager::UpdateJoyButtonState(int32 padnumber)
+{
+	for (int32 i = 0; i < MAX_BUTTONS; i++)
+		m_aButtonStates[i] = false;
+
+#ifdef __DINPUT_INCLUDED__
+	for (int32 i = 0; i < MAX_BUTTONS; i++)
+	{
+		if (m_NewState.rgbButtons[i] & 0x80)
+			m_aButtonStates[i] = true;
+		else
+			m_aButtonStates[i] = false;
+	}
+#elif defined RW_GL3
+	if (m_NewState.isGamepad) {
+		for (int32 i = 0; i < MAX_BUTTONS; i++) {
+			if (i == GLFW_GAMEPAD_BUTTON_GUIDE)
+				continue;
+
+			m_aButtonStates[MapIdToButtonId(i)-1] = m_NewState.mappedButtons[i];
+		}
+	} else {
+		for (int32 i = 0; i < Min(m_NewState.numButtons, MAX_BUTTONS); i++) {
+			m_aButtonStates[i] = m_NewState.buttons[i];
+		}
+	}
+#endif
+}
+
+bool CControllerConfigManager::GetIsActionAButtonCombo(e_ControllerAction action)
+{
+	switch (action)
+	{
+	case VEHICLE_LOOKBEHIND:
+	case PED_CYCLE_TARGET_LEFT:
+	case PED_CYCLE_TARGET_RIGHT:
+		return true;
+		break;
+	default: break;
+	}
+
+	return false;
+}
+
+wchar *CControllerConfigManager::GetButtonComboText(e_ControllerAction action)
+{
+	switch (action)
+	{
+	case PED_CYCLE_TARGET_LEFT:
+		return TheText.Get("FEC_PTL");	// Use LockTarget with Weapon Switch Left.
+		break;
+	
+	case PED_CYCLE_TARGET_RIGHT:
+		return TheText.Get("FEC_PTR");	// Use LockTarget with Weapon Switch Right.
+		break;
+	
+	case VEHICLE_LOOKBEHIND:
+		return TheText.Get("FEC_LBC");	// Use Look Left With Look Right. 
+		break;
+	default: break;
+	}
+
+	return NULL;
+}
+
+void CControllerConfigManager::SetControllerKeyAssociatedWithAction(e_ControllerAction action, int32 key, eControllerType type)
+{
+	ResetSettingOrder(action);
+	int numOfSettings = GetNumOfSettingsForAction(action);
+	
+	m_aSettings[action][type].m_Key = key;
+	m_aSettings[action][type].m_ContSetOrder = numOfSettings + 1;
+}
+
+int32 CControllerConfigManager::GetMouseButtonAssociatedWithAction(e_ControllerAction action)
+{
+	return m_aSettings[action][MOUSE].m_Key;
+}
+
+void CControllerConfigManager::SetMouseButtonAssociatedWithAction(e_ControllerAction action, int32 button)
+{
+	int numOfSettings = GetNumOfSettingsForAction(action);
+	
+	m_aSettings[action][MOUSE].m_Key = button;
+	m_aSettings[action][MOUSE].m_ContSetOrder = numOfSettings + 1;
+}
+
+void CControllerConfigManager::ResetSettingOrder(e_ControllerAction action)
+{
+	int32 conttype = KEYBOARD;
+
+	for (int32 i = SETORDER_1; i < MAX_SETORDERS; i++)
+	{
+		bool isexist = false;
+		for (int32 j = 0; j < MAX_CONTROLLERTYPES; j++)
+		{
+			if (m_aSettings[action][j].m_ContSetOrder == i)
+				isexist = true;
+		}
+
+		bool init = false;
+
+		if (!isexist)
+		{
+			for (int32 k = 0; k < MAX_CONTROLLERTYPES; k++)
+			{
+				int32 setorder = m_aSettings[action][k].m_ContSetOrder;
+				if (setorder > i && setorder != 0)
+				{
+					if (init)
+					{
+						if (setorder < m_aSettings[action][conttype].m_ContSetOrder)
+							conttype = k;
+					}
+					else
+					{
+						init = true;
+						conttype = k;
+					}
+				}
+			}
+
+			if (init)
+				m_aSettings[action][conttype].m_ContSetOrder = i;
+		}
+	}
+}
diff --git a/src/core/ControllerConfig.h b/src/core/ControllerConfig.h
new file mode 100644
index 0000000..d61e23e
--- /dev/null
+++ b/src/core/ControllerConfig.h
@@ -0,0 +1,229 @@
+#pragma once
+
+#if defined RW_D3D9 || defined RWLIBS
+#define DIRECTINPUT_VERSION 0x0800
+#include <dinput.h>
+#endif
+
+// based on x-gtasa
+
+enum eControllerType
+{
+	KEYBOARD = 0,
+	OPTIONAL_EXTRA,
+	MOUSE,
+	JOYSTICK,
+	MAX_CONTROLLERTYPES,
+};
+
+enum e_ControllerAction
+{
+	PED_FIREWEAPON = 0,
+	PED_CYCLE_WEAPON_RIGHT,
+	PED_CYCLE_WEAPON_LEFT,
+	GO_FORWARD,
+	GO_BACK,
+	GO_LEFT,
+	GO_RIGHT,
+	PED_SNIPER_ZOOM_IN,
+	PED_SNIPER_ZOOM_OUT,
+	VEHICLE_ENTER_EXIT,
+	CAMERA_CHANGE_VIEW_ALL_SITUATIONS,
+	PED_JUMPING,
+	PED_SPRINT,
+	PED_LOOKBEHIND,
+	PED_DUCK,
+	PED_ANSWER_PHONE,
+#ifdef BIND_VEHICLE_FIREWEAPON
+	VEHICLE_FIREWEAPON,
+#endif
+	VEHICLE_ACCELERATE,
+	VEHICLE_BRAKE,
+	VEHICLE_CHANGE_RADIO_STATION,
+	VEHICLE_HORN,
+	TOGGLE_SUBMISSIONS,
+	VEHICLE_HANDBRAKE,
+	PED_1RST_PERSON_LOOK_LEFT,
+	PED_1RST_PERSON_LOOK_RIGHT,
+	VEHICLE_LOOKLEFT,
+	VEHICLE_LOOKRIGHT,
+	VEHICLE_LOOKBEHIND,
+	VEHICLE_TURRETLEFT,
+	VEHICLE_TURRETRIGHT,
+	VEHICLE_TURRETUP,
+	VEHICLE_TURRETDOWN,
+	PED_CYCLE_TARGET_LEFT,
+	PED_CYCLE_TARGET_RIGHT,
+	PED_CENTER_CAMERA_BEHIND_PLAYER,
+	PED_LOCK_TARGET,
+	NETWORK_TALK,
+	PED_1RST_PERSON_LOOK_UP,
+	PED_1RST_PERSON_LOOK_DOWN,
+	_CONTROLLERACTION_36,					// Unused
+	TOGGLE_DPAD,
+	SWITCH_DEBUG_CAM_ON,
+	TAKE_SCREEN_SHOT,
+	SHOW_MOUSE_POINTER_TOGGLE,
+	UNKNOWN_ACTION,
+	MAX_CONTROLLERACTIONS,
+};
+
+enum e_ControllerActionType
+{
+	ACTIONTYPE_1RSTPERSON = 0,
+	ACTIONTYPE_3RDPERSON,
+	ACTIONTYPE_VEHICLE,
+	ACTIONTYPE_VEHICLE_3RDPERSON,
+	ACTIONTYPE_COMMON,
+	ACTIONTYPE_1RST3RDPERSON,
+	ACTIONTYPE_NONE,
+};
+
+enum eContSetOrder
+{
+	SETORDER_NONE = 0,
+	SETORDER_1,
+	SETORDER_2,
+	SETORDER_3,
+	SETORDER_4,
+	MAX_SETORDERS,
+};
+
+enum eSimCheckers
+{
+	SIM_X1 = 0, SIM_Y1,	// DPad
+	SIM_X2, SIM_Y2,	    // LeftStick
+
+	MAX_SIMS
+};
+
+class CMouseControllerState;
+class CControllerState;
+
+
+#define JOY_BUTTONS 16
+#define MAX_BUTTONS (JOY_BUTTONS+1)
+
+#define ACTIONNAME_LENGTH 40
+
+#ifdef RW_GL3
+struct GlfwJoyState {
+	int8 id;
+	bool isGamepad;
+	uint8 numButtons;
+	uint8* buttons;
+	bool mappedButtons[17];
+};
+#endif
+
+class CControllerConfigManager
+{
+public:
+	struct tControllerConfigBind
+	{
+		int32      m_Key;
+		int32      m_ContSetOrder;
+
+		tControllerConfigBind()
+		{
+			m_Key = 0;
+			m_ContSetOrder = 0;
+		}
+	};
+
+	bool                  m_bFirstCapture;
+#if defined RW_GL3
+	GlfwJoyState           m_OldState;
+	GlfwJoyState           m_NewState;
+#else
+	DIJOYSTATE2           m_OldState;
+	DIJOYSTATE2           m_NewState;
+#endif
+	wchar                 m_aActionNames[MAX_CONTROLLERACTIONS][ACTIONNAME_LENGTH];
+	bool                  m_aButtonStates[MAX_BUTTONS];
+	tControllerConfigBind m_aSettings[MAX_CONTROLLERACTIONS][MAX_CONTROLLERTYPES];
+	bool                  m_aSimCheckers[MAX_SIMS][MAX_CONTROLLERTYPES];
+	bool                  m_bMouseAssociated;
+
+#ifdef LOAD_INI_SETTINGS
+	static uint32 ms_padButtonsInited;
+#endif
+	
+	CControllerConfigManager();
+
+	void  MakeControllerActionsBlank();
+	
+	int32 GetJoyButtonJustDown();
+	
+	void  SaveSettings(int32 file);
+	void  LoadSettings(int32 file);
+	
+	void  InitDefaultControlConfiguration();
+	void  InitDefaultControlConfigMouse(CMouseControllerState const &availableButtons);
+	void  InitDefaultControlConfigJoyPad(uint32 buttons);
+	void  InitialiseControllerActionNameArray();
+
+	void  UpdateJoyInConfigMenus_ButtonDown                           (int32 button, int32 padnumber);
+	void  AffectControllerStateOn_ButtonDown                          (int32 button, eControllerType type);
+	void  AffectControllerStateOn_ButtonDown_Driving                  (int32 button, eControllerType type, CControllerState &state);
+	void  AffectControllerStateOn_ButtonDown_FirstPersonOnly          (int32 button, eControllerType type, CControllerState &state);
+	void  AffectControllerStateOn_ButtonDown_ThirdPersonOnly          (int32 button, eControllerType type, CControllerState &state);
+	void  AffectControllerStateOn_ButtonDown_FirstAndThirdPersonOnly  (int32 button, eControllerType type, CControllerState &state);
+	void  AffectControllerStateOn_ButtonDown_AllStates                (int32 button, eControllerType type, CControllerState &state);
+	void  AffectControllerStateOn_ButtonDown_VehicleAndThirdPersonOnly(int32 button, eControllerType type, CControllerState &state);
+
+	void  UpdateJoyInConfigMenus_ButtonUp(int32 button, int32 padnumber);
+	void  AffectControllerStateOn_ButtonUp(int32 button, eControllerType type);
+	void  AffectControllerStateOn_ButtonUp_All_Player_States(int32 button, eControllerType type, CControllerState &state);
+	
+	void  AffectPadFromKeyBoard();
+	void  AffectPadFromMouse();
+	
+	void  ClearSimButtonPressCheckers();
+
+	bool  GetIsKeyboardKeyDown    (RsKeyCodes keycode);
+	bool  GetIsKeyboardKeyJustDown(RsKeyCodes keycode);
+	bool  GetIsMouseButtonDown    (RsKeyCodes keycode);
+	bool  GetIsMouseButtonUp      (RsKeyCodes keycode);
+
+
+	void DeleteMatchingCommonControls           (e_ControllerAction action, int32 key, eControllerType type);
+	void DeleteMatching3rdPersonControls        (e_ControllerAction action, int32 key, eControllerType type);
+	void DeleteMatching1rst3rdPersonControls    (e_ControllerAction action, int32 key, eControllerType type);
+	void DeleteMatchingVehicleControls          (e_ControllerAction action, int32 key, eControllerType type);
+	void DeleteMatchingVehicle_3rdPersonControls(e_ControllerAction action, int32 key, eControllerType type);
+	void DeleteMatching1rstPersonControls       (e_ControllerAction action, int32 key, eControllerType type);
+	void DeleteMatchingActionInitiators         (e_ControllerAction action, int32 key, eControllerType type);
+
+#ifdef RADIO_SCROLL_TO_PREV_STATION
+	bool IsAnyVehicleActionAssignedToMouseKey(int32 key);
+#endif 
+
+	bool GetIsKeyBlank(int32 key, eControllerType type);
+	e_ControllerActionType GetActionType(e_ControllerAction action);
+
+	void ClearSettingsAssociatedWithAction        (e_ControllerAction action, eControllerType type);
+	wchar *GetControllerSettingTextWithOrderNumber(e_ControllerAction action, eContSetOrder setorder);
+	wchar *GetControllerSettingTextKeyBoard       (e_ControllerAction action, eControllerType type);
+	wchar *GetControllerSettingTextMouse          (e_ControllerAction action);
+	wchar *GetControllerSettingTextJoystick       (e_ControllerAction action);
+
+	int32 GetNumOfSettingsForAction(e_ControllerAction action);
+	void  GetWideStringOfCommandKeys(uint16 action, wchar *text, uint16 leight);
+	int32 GetControllerKeyAssociatedWithAction(e_ControllerAction action, eControllerType type);
+
+	void  UpdateJoyButtonState(int32 padnumber);
+	
+	bool  GetIsActionAButtonCombo             (e_ControllerAction action);
+	wchar *GetButtonComboText                 (e_ControllerAction action);
+	void  SetControllerKeyAssociatedWithAction(e_ControllerAction action, int32 key, eControllerType type);
+	int32 GetMouseButtonAssociatedWithAction  (e_ControllerAction action);
+	void  SetMouseButtonAssociatedWithAction  (e_ControllerAction action, int32 button);
+	void  ResetSettingOrder                   (e_ControllerAction action);
+};
+
+#ifndef RW_GL3
+VALIDATE_SIZE(CControllerConfigManager, 0x143C);
+#endif
+
+extern CControllerConfigManager ControlsManager;
\ No newline at end of file
diff --git a/src/core/Crime.h b/src/core/Crime.h
new file mode 100644
index 0000000..3c3e2b2
--- /dev/null
+++ b/src/core/Crime.h
@@ -0,0 +1,39 @@
+#pragma once
+
+enum eCrimeType {
+	CRIME_NONE,
+	CRIME_POSSESSION_GUN,
+	CRIME_HIT_PED,
+	CRIME_HIT_COP,
+	CRIME_SHOOT_PED,
+	CRIME_SHOOT_COP,
+	CRIME_STEAL_CAR,
+	CRIME_RUN_REDLIGHT,
+	CRIME_RECKLESS_DRIVING,
+	CRIME_SPEEDING,
+	CRIME_RUNOVER_PED,
+	CRIME_RUNOVER_COP,
+	CRIME_SHOOT_HELI,
+	CRIME_PED_BURNED,
+	CRIME_COP_BURNED,
+	CRIME_VEHICLE_BURNED,
+	CRIME_DESTROYED_CESSNA,
+	CRIME_EXPLOSION,
+	CRIME_HIT_PED_NASTYWEAPON,
+	CRIME_HIT_COP_NASTYWEAPON,
+	NUM_CRIME_TYPES
+};
+
+class CCrimeBeingQd
+{
+public:
+	eCrimeType m_nType;
+	uint32 m_nId;
+	uint32 m_nTime;
+	CVector m_vecPosn;
+	bool m_bReported;
+	bool m_bPoliceDoesntCare;
+
+	CCrimeBeingQd() { };
+	~CCrimeBeingQd() { };
+};
diff --git a/src/core/Debug.cpp b/src/core/Debug.cpp
new file mode 100644
index 0000000..e319388
--- /dev/null
+++ b/src/core/Debug.cpp
@@ -0,0 +1,170 @@
+#include "common.h"
+#include "RwHelper.h"
+#include "Debug.h"
+#include "Lines.h"
+#include "Font.h"
+#include "main.h"
+#include "Text.h"
+
+bool gbDebugStuffInRelease = false;
+
+#define DEBUG_X_POS (300)
+#define DEBUG_Y_POS (41)
+#define DEBUG_LINE_HEIGHT (22)
+
+int16 CDebug::ms_nCurrentTextLine;
+char CDebug::ms_aTextBuffer[MAX_LINES][MAX_STR_LEN];
+
+void
+CDebug::DebugInitTextBuffer()
+{
+	ms_nCurrentTextLine = 0;
+}
+
+void
+CDebug::DebugAddText(const char *str)
+{
+	int32 i = 0;
+	if (*str != '\0') {
+		while (i < MAX_STR_LEN - 1) {
+			ms_aTextBuffer[ms_nCurrentTextLine][i++] = *(str++);
+			if (*str == '\0')
+				break;
+		}
+	}
+
+	ms_aTextBuffer[ms_nCurrentTextLine++][i] = '\0';
+	if (ms_nCurrentTextLine >= MAX_LINES)
+		ms_nCurrentTextLine = 0;
+}
+
+void
+CDebug::DebugDisplayTextBuffer()
+{
+#ifndef MASTER
+	if (gbDebugStuffInRelease)
+	{
+		int32 i = 0;
+		int32 y = DEBUG_Y_POS;
+#ifdef FIX_BUGS
+		CFont::SetPropOn();
+		CFont::SetBackgroundOff();
+		CFont::SetScale(1.0f, 1.0f);
+		CFont::SetCentreOff();
+		CFont::SetRightJustifyOff();
+		CFont::SetJustifyOn();
+		CFont::SetRightJustifyWrap(0.0f);
+		CFont::SetBackGroundOnlyTextOff();
+		CFont::SetFontStyle(FONT_STANDARD);
+#else
+		// this is not even readable
+		CFont::SetPropOff();
+		CFont::SetBackgroundOff();
+		CFont::SetScale(1.0f, 1.0f);
+		CFont::SetCentreOff();
+		CFont::SetRightJustifyOn();
+		CFont::SetRightJustifyWrap(0.0f);
+		CFont::SetBackGroundOnlyTextOff();
+		CFont::SetFontStyle(FONT_STANDARD);
+		CFont::SetPropOff();
+#endif
+		do {
+			char *line;
+			while (true) {
+				line = ms_aTextBuffer[(ms_nCurrentTextLine + i++) % MAX_LINES];
+				if (*line != '\0')
+					break;
+				y += DEBUG_LINE_HEIGHT;
+				if (i == MAX_LINES) {
+					CFont::DrawFonts();
+					return;
+				}
+			}
+			AsciiToUnicode(line, gUString);
+			CFont::SetColor(CRGBA(0, 0, 0, 255));
+			CFont::PrintString(DEBUG_X_POS, y-1, gUString);
+			CFont::SetColor(CRGBA(255, 128, 128, 255));
+			CFont::PrintString(DEBUG_X_POS+1, y, gUString);
+			y += DEBUG_LINE_HEIGHT;
+		} while (i != MAX_LINES);
+		CFont::DrawFonts();
+	}
+#endif
+}
+
+
+// custom
+
+CDebug::ScreenStr CDebug::ms_aScreenStrs[MAX_SCREEN_STRS];
+int CDebug::ms_nScreenStrs;
+
+void
+CDebug::DisplayScreenStrings()
+{
+	int i;
+	
+
+	CFont::SetPropOn();
+	CFont::SetBackgroundOff();
+	CFont::SetScale(1.0f, 1.0f);
+	CFont::SetCentreOff();
+	CFont::SetRightJustifyOff();
+	CFont::SetJustifyOff();
+	CFont::SetRightJustifyWrap(0.0f);
+	CFont::SetWrapx(9999.0f);
+	CFont::SetBackGroundOnlyTextOff();
+	CFont::SetFontStyle(FONT_STANDARD);
+
+	for(i = 0; i < ms_nScreenStrs; i++){
+/*
+		AsciiToUnicode(ms_aScreenStrs[i].str, gUString);
+		CFont::SetColor(CRGBA(0, 0, 0, 255));
+		CFont::PrintString(ms_aScreenStrs[i].x, ms_aScreenStrs[i].y, gUString);
+		CFont::SetColor(CRGBA(255, 255, 255, 255));
+		CFont::PrintString(ms_aScreenStrs[i].x+1, ms_aScreenStrs[i].y+1, gUString);
+*/
+		ObrsPrintfString(ms_aScreenStrs[i].str, ms_aScreenStrs[i].x, ms_aScreenStrs[i].y);
+	}
+	CFont::DrawFonts();
+
+	ms_nScreenStrs = 0;
+}
+
+void
+CDebug::PrintAt(const char *str, int x, int y)
+{
+	if(ms_nScreenStrs >= MAX_SCREEN_STRS)
+		return;
+	strncpy(ms_aScreenStrs[ms_nScreenStrs].str, str, 256);
+	ms_aScreenStrs[ms_nScreenStrs].x = x;//*12;
+	ms_aScreenStrs[ms_nScreenStrs].y = y;//*22;
+	ms_nScreenStrs++;
+}
+
+CDebug::Line CDebug::ms_aLines[MAX_DEBUG_LINES];
+int CDebug::ms_nLines;
+
+void
+CDebug::AddLine(CVector p1, CVector p2, uint32 c1, uint32 c2)
+{
+	if(ms_nLines >= MAX_DEBUG_LINES)
+		return;
+	ms_aLines[ms_nLines].p1 = p1;
+	ms_aLines[ms_nLines].p2 = p2;
+	ms_aLines[ms_nLines].c1 = c1;
+	ms_aLines[ms_nLines].c2 = c2;
+	ms_nLines++;
+}
+
+void
+CDebug::DrawLines(void)
+{
+	int i;
+	RwRenderStateSet(rwRENDERSTATETEXTURERASTER, nil);
+	RwRenderStateSet(rwRENDERSTATEZTESTENABLE, (void*)FALSE);
+	for(i = 0; i < ms_nLines; i++){
+		Line *l = &ms_aLines[i];
+		CLines::RenderLineWithClipping(l->p1.x, l->p1.y, l->p1.z, l->p2.x, l->p2.y, l->p2.z, l->c1, l->c2);
+	}
+	ms_nLines = 0;
+}
diff --git a/src/core/Debug.h b/src/core/Debug.h
new file mode 100644
index 0000000..4a25bf4
--- /dev/null
+++ b/src/core/Debug.h
@@ -0,0 +1,45 @@
+#pragma once
+
+class CDebug
+{
+	enum
+	{
+		MAX_LINES = 15,
+		MAX_STR_LEN = 80,
+
+		MAX_SCREEN_STRS = 100,
+		MAX_DEBUG_LINES = 100,
+	};
+
+	static int16 ms_nCurrentTextLine;
+	static char ms_aTextBuffer[MAX_LINES][MAX_STR_LEN];
+
+	// custom
+	struct ScreenStr {
+		int x, y;
+		char str[256];
+	};
+	static ScreenStr ms_aScreenStrs[MAX_SCREEN_STRS];
+	static int ms_nScreenStrs;
+
+	struct Line {
+		CVector p1, p2;
+		uint32 c1, c2;
+	};
+	static Line ms_aLines[MAX_DEBUG_LINES];
+	static int ms_nLines;
+
+public:
+	static void DebugInitTextBuffer();
+	static void DebugDisplayTextBuffer();
+	static void DebugAddText(const char *str);
+
+	// custom
+	static void PrintAt(const char *str, int x, int y);
+	static void DisplayScreenStrings();
+
+	static void AddLine(CVector p1, CVector p2, uint32 c1, uint32 c2);
+	static void DrawLines(void);
+};
+
+extern bool gbDebugStuffInRelease;
diff --git a/src/core/Directory.cpp b/src/core/Directory.cpp
new file mode 100644
index 0000000..0534406
--- /dev/null
+++ b/src/core/Directory.cpp
@@ -0,0 +1,74 @@
+#include "common.h"
+
+#include "General.h"
+#include "FileMgr.h"
+#include "Directory.h"
+
+CDirectory::CDirectory(int32 maxEntries)
+ : numEntries(0), maxEntries(maxEntries)
+{
+	entries = new DirectoryInfo[maxEntries];
+}
+
+CDirectory::~CDirectory(void)
+{
+	delete[] entries;
+}
+
+void
+CDirectory::ReadDirFile(const char *filename)
+{
+	int fd;
+	DirectoryInfo dirinfo;
+
+	fd = CFileMgr::OpenFile(filename, "rb");
+	while(CFileMgr::Read(fd, (char*)&dirinfo, sizeof(dirinfo)))
+		AddItem(dirinfo);
+	CFileMgr::CloseFile(fd);
+}
+
+bool
+CDirectory::WriteDirFile(const char *filename)
+{
+	int fd;
+	size_t n;
+	fd = CFileMgr::OpenFileForWriting(filename);
+	n = CFileMgr::Write(fd, (char*)entries, numEntries*sizeof(DirectoryInfo));
+	CFileMgr::CloseFile(fd);
+	return n == numEntries*sizeof(DirectoryInfo);
+}
+
+void
+CDirectory::AddItem(const DirectoryInfo &dirinfo)
+{
+	assert(numEntries < maxEntries);
+#ifdef FIX_BUGS
+	// don't add if already exists
+	uint32 offset, size;
+	if(FindItem(dirinfo.name, offset, size))
+		return;
+#endif
+	entries[numEntries++] = dirinfo;
+}
+
+void
+CDirectory::AddItem(const DirectoryInfo &dirinfo, int32 imgId)
+{
+	DirectoryInfo di = dirinfo;
+	di.offset |= imgId<<24;
+	AddItem(di);
+}
+
+bool
+CDirectory::FindItem(const char *name, uint32 &offset, uint32 &size)
+{
+	int i;
+
+	for(i = 0; i < numEntries; i++)
+		if(!CGeneral::faststricmp(entries[i].name, name)){
+			offset = entries[i].offset;
+			size = entries[i].size;
+			return true;
+		}
+	return false;
+}
diff --git a/src/core/Directory.h b/src/core/Directory.h
new file mode 100644
index 0000000..0fef080
--- /dev/null
+++ b/src/core/Directory.h
@@ -0,0 +1,23 @@
+#pragma once
+
+class CDirectory
+{
+public:
+	struct DirectoryInfo {
+		uint32 offset;
+		uint32 size;
+		char name[24];
+	};
+	DirectoryInfo *entries;
+	int32 maxEntries;
+	int32 numEntries;
+
+	CDirectory(int32 maxEntries);
+	~CDirectory(void);
+
+	void ReadDirFile(const char *filename);
+	bool WriteDirFile(const char *filename);
+	void AddItem(const DirectoryInfo &dirinfo);
+	void AddItem(const DirectoryInfo &dirinfo, int32 imgId);
+	bool FindItem(const char *name, uint32 &offset, uint32 &size);
+};
diff --git a/src/core/EventList.cpp b/src/core/EventList.cpp
new file mode 100644
index 0000000..b7f139b
--- /dev/null
+++ b/src/core/EventList.cpp
@@ -0,0 +1,251 @@
+#include "common.h"
+
+#include "Pools.h"
+#include "ModelIndices.h"
+#include "World.h"
+#include "Wanted.h"
+#include "EventList.h"
+#include "Messages.h"
+#include "Text.h"
+#include "main.h"
+#include "Accident.h"
+
+int32 CEventList::ms_nFirstFreeSlotIndex;
+CEvent gaEvent[NUMEVENTS];
+
+enum
+{
+	EVENT_STATE_0,
+	EVENT_STATE_CANDELETE,
+	EVENT_STATE_CLEAR,
+};
+
+void
+CEventList::Initialise(void)
+{
+	int i;
+
+	debug("Initialising CEventList...");
+	for(i = 0; i < NUMEVENTS; i++){
+		gaEvent[i].type = EVENT_NULL;
+		gaEvent[i].entityType = EVENT_ENTITY_NONE;
+		gaEvent[i].entityRef = 0;
+		gaEvent[i].posn.x = 0.0f;
+		gaEvent[i].posn.y = 0.0f;
+		gaEvent[i].posn.z = 0.0f;
+		gaEvent[i].timeout = 0;
+		gaEvent[i].state = EVENT_STATE_0;
+	}
+	ms_nFirstFreeSlotIndex = 0;
+}
+
+void
+CEventList::Update(void)
+{
+	int i;
+
+	ms_nFirstFreeSlotIndex = 0;
+	for(i = 0; i < NUMEVENTS; i++){
+		if(gaEvent[i].type == EVENT_NULL)
+			continue;
+		if(CTimer::GetTimeInMilliseconds() > gaEvent[i].timeout || gaEvent[i].state == EVENT_STATE_CANDELETE){
+			gaEvent[i].type = EVENT_NULL;
+			gaEvent[i].state = EVENT_STATE_0;
+		}
+		if(gaEvent[i].state == EVENT_STATE_CLEAR)
+			gaEvent[i].state = EVENT_STATE_CANDELETE;
+	}
+}
+
+void
+CEventList::RegisterEvent(eEventType type, eEventEntity entityType, CEntity *ent, CPed *criminal, int32 timeout)
+{
+	int i;
+	int ref;
+	bool copsDontCare;
+
+#ifdef SQUEEZE_PERFORMANCE
+	if (type == EVENT_INJURED_PED) {
+		gAccidentManager.ReportAccident((CPed*)ent);
+		return;
+	}
+#endif
+
+	copsDontCare = false;
+	switch(entityType){
+	case EVENT_ENTITY_PED:
+		ref = CPools::GetPedRef((CPed*)ent);
+		break;
+	case EVENT_ENTITY_VEHICLE:
+		ref = CPools::GetVehicleRef((CVehicle*)ent);
+		break;
+	case EVENT_ENTITY_OBJECT:
+		ref = CPools::GetObjectRef((CObject*)ent);
+		break;
+	default:
+		Error("Undefined entity type, RegisterEvent, EventList.cpp");
+		ref = 0;
+		break;
+	}
+
+	// only update time if event exists already
+	for(i = 0; i < NUMEVENTS; i++)
+		if(gaEvent[i].type == type &&
+		   gaEvent[i].entityType == entityType &&
+		   gaEvent[i].entityRef == ref){
+			gaEvent[i].timeout = CTimer::GetTimeInMilliseconds() + timeout;
+			return;
+		}
+
+	for(i = ms_nFirstFreeSlotIndex; i < NUMEVENTS; i++)
+		if(gaEvent[i].type == EVENT_NULL){
+			ms_nFirstFreeSlotIndex = i;
+			break;
+		}
+	if(i < NUMEVENTS){
+		gaEvent[i].type = type;
+		gaEvent[i].entityType = entityType;
+		gaEvent[i].timeout = CTimer::GetTimeInMilliseconds() + timeout;
+		gaEvent[i].entityRef = ref;
+		gaEvent[i].posn = ent->GetPosition();
+		gaEvent[i].criminal = criminal;
+		if(gaEvent[i].criminal)
+			gaEvent[i].criminal->RegisterReference((CEntity**)&gaEvent[i].criminal);
+		if(type == EVENT_GUNSHOT)
+			gaEvent[i].state = EVENT_STATE_CLEAR;
+		else
+			gaEvent[i].state = EVENT_STATE_0;
+	}
+
+	if(criminal == FindPlayerPed())
+		ReportCrimeForEvent(type, (intptr)ent, copsDontCare);
+}
+
+void
+CEventList::RegisterEvent(eEventType type, CVector posn, int32 timeout)
+{
+	int i;
+
+	// only update time if event exists already
+	for(i = 0; i < NUMEVENTS; i++)
+		if(gaEvent[i].type == type &&
+		   gaEvent[i].posn.x == posn.x &&
+		   gaEvent[i].posn.y == posn.y &&
+		   gaEvent[i].posn.z == posn.z &&
+		   gaEvent[i].entityType == EVENT_ENTITY_NONE){
+			gaEvent[i].timeout = CTimer::GetTimeInMilliseconds() + timeout;
+			return;
+		}
+
+	for(i = ms_nFirstFreeSlotIndex; i < NUMEVENTS; i++)
+		if(gaEvent[i].type == EVENT_NULL){
+			ms_nFirstFreeSlotIndex = i;
+			break;
+		}
+	if(i < NUMEVENTS){
+		gaEvent[i].type = type;
+		gaEvent[i].entityType = EVENT_ENTITY_NONE;
+		gaEvent[i].timeout = CTimer::GetTimeInMilliseconds() + timeout;
+		gaEvent[i].posn = posn;
+		gaEvent[i].entityRef = 0;
+		if(type == EVENT_GUNSHOT)
+			gaEvent[i].state = EVENT_STATE_CLEAR;
+		else
+			gaEvent[i].state = EVENT_STATE_0;
+	}
+}
+
+bool
+CEventList::GetEvent(eEventType type, int32 *event)
+{
+	int i;
+	for(i = 0; i < NUMEVENTS; i++)
+		if(gaEvent[i].type == type){
+			*event = i;
+			return true;
+		}
+	return false;
+}
+
+void
+CEventList::ClearEvent(int32 event)
+{
+	if(gaEvent[event].state != EVENT_STATE_CANDELETE)
+		gaEvent[event].state = EVENT_STATE_CLEAR;
+}
+
+bool
+CEventList::FindClosestEvent(eEventType type, CVector posn, int32 *event)
+{
+	int i;
+	float dist;
+	bool found = false;
+	float mindist = 60.0f;
+
+	for(i = 0; i < NUMEVENTS; i++){
+		if(gaEvent[i].type != type)
+			continue;
+		dist = (posn - gaEvent[i].posn).Magnitude();
+		if(dist < mindist){
+			mindist = dist;
+			found = true;
+			*event = i;
+		}
+	}
+	return found;
+}
+
+void
+CEventList::ReportCrimeForEvent(eEventType type, intptr crimeId, bool copsDontCare)
+{
+	eCrimeType crime;
+	switch(type){
+	case EVENT_ASSAULT: crime = CRIME_HIT_PED; break;
+	case EVENT_RUN_REDLIGHT: crime = CRIME_RUN_REDLIGHT; break;
+	case EVENT_ASSAULT_POLICE: crime = CRIME_HIT_COP; break;
+	case EVENT_GUNSHOT: crime = CRIME_POSSESSION_GUN; break;
+	case EVENT_STEAL_CAR: crime = CRIME_STEAL_CAR; break;
+	case EVENT_HIT_AND_RUN: crime = CRIME_RUNOVER_PED; break;
+	case EVENT_HIT_AND_RUN_COP: crime = CRIME_RUNOVER_COP; break;
+	case EVENT_SHOOT_PED: crime = CRIME_SHOOT_PED; break;
+	case EVENT_SHOOT_COP: crime = CRIME_SHOOT_COP; break;
+	case EVENT_EXPLOSION: crime = CRIME_EXPLOSION; break;
+	case EVENT_PED_SET_ON_FIRE: crime = CRIME_PED_BURNED; break;
+	case EVENT_COP_SET_ON_FIRE: crime = CRIME_COP_BURNED; break;
+	case EVENT_CAR_SET_ON_FIRE: crime = CRIME_VEHICLE_BURNED; break;
+	case EVENT_ASSAULT_NASTYWEAPON: crime = CRIME_HIT_PED_NASTYWEAPON; break;
+	case EVENT_ASSAULT_NASTYWEAPON_POLICE: crime = CRIME_HIT_COP_NASTYWEAPON; break;
+	default: crime = CRIME_NONE; break;
+	}
+	
+	if (crime == CRIME_HIT_PED && IsPedPointerValid((CPed*)crimeId) && FindPlayerPed()->m_pWanted->GetWantedLevel() == 0 && ((CPed*)crimeId)->bBeingChasedByPolice) {
+		if (!((CPed*)crimeId)->DyingOrDead()) {
+			CMessages::AddBigMessage(TheText.Get("GOODBOY"), 5000, 0);
+			CWorld::Players[CWorld::PlayerInFocus].m_nMoney += 50;
+		}
+		return;
+	}
+
+	if(crime == CRIME_NONE)
+		return;
+
+#ifdef FIX_BUGS
+	CVector playerPedCoors = FindPlayerCoors();
+#else
+	CVector playerPedCoors = FindPlayerPed()->GetPosition();
+#endif
+	CVector playerCoors = FindPlayerCoors();
+
+	if(CWanted::WorkOutPolicePresence(playerCoors, 14.0f) != 0 ||
+		CGame::germanGame && (crime == CRIME_SHOOT_PED || crime == CRIME_SHOOT_COP || crime == CRIME_COP_BURNED || crime == CRIME_VEHICLE_BURNED)){
+		FindPlayerPed()->m_pWanted->RegisterCrime_Immediately(crime, playerPedCoors, (uint32)crimeId, copsDontCare);
+		FindPlayerPed()->m_pWanted->SetWantedLevelNoDrop(1);
+	}else
+		FindPlayerPed()->m_pWanted->RegisterCrime(crime, playerPedCoors, (uint32)crimeId, copsDontCare);
+
+	if(type == EVENT_ASSAULT_POLICE)
+		FindPlayerPed()->SetWantedLevelNoDrop(1);
+	if(type == EVENT_SHOOT_COP || type == EVENT_ASSAULT_NASTYWEAPON_POLICE)
+		FindPlayerPed()->SetWantedLevelNoDrop(2);
+
+}
diff --git a/src/core/EventList.h b/src/core/EventList.h
new file mode 100644
index 0000000..3e9d8fd
--- /dev/null
+++ b/src/core/EventList.h
@@ -0,0 +1,68 @@
+#pragma once
+
+class CEntity;
+class CPed;
+
+enum eEventType
+{
+	EVENT_NULL,
+	EVENT_ASSAULT,
+	EVENT_RUN_REDLIGHT,
+	EVENT_ASSAULT_POLICE,
+	EVENT_GUNSHOT,
+	EVENT_INJURED_PED,
+	EVENT_DEAD_PED,
+	EVENT_FIRE,
+	EVENT_STEAL_CAR,
+	EVENT_HIT_AND_RUN,
+	EVENT_HIT_AND_RUN_COP,
+	EVENT_SHOOT_PED,
+	EVENT_SHOOT_COP,
+	EVENT_EXPLOSION,
+	EVENT_PED_SET_ON_FIRE,
+	EVENT_COP_SET_ON_FIRE,
+	EVENT_CAR_SET_ON_FIRE,
+	EVENT_ASSAULT_NASTYWEAPON,
+	EVENT_ASSAULT_NASTYWEAPON_POLICE,
+	EVENT_UNK, // Not on SA it seems
+	EVENT_ICECREAM,
+	EVENT_ATM,
+	EVENT_SHOPSTALL,
+	EVENT_SHOPWINDOW,
+	EVENT_LAST_EVENT
+};
+
+enum eEventEntity
+{
+	EVENT_ENTITY_NONE,
+	EVENT_ENTITY_PED,
+	EVENT_ENTITY_VEHICLE,
+	EVENT_ENTITY_OBJECT
+};
+
+struct CEvent
+{
+	eEventType type;
+	eEventEntity entityType;
+	int32 entityRef;
+	CPed *criminal;
+	CVector posn;
+	uint32 timeout;
+	int32 state;
+};
+
+class CEventList
+{
+	static int32 ms_nFirstFreeSlotIndex;
+public:
+	static void Initialise(void);
+	static void Update(void);
+	static void RegisterEvent(eEventType type, eEventEntity entityType, CEntity *ent, CPed *criminal, int32 timeout);
+	static void RegisterEvent(eEventType type, CVector posn, int32 timeout);
+	static bool GetEvent(eEventType type, int32 *event);
+	static void ClearEvent(int32 event);
+	static bool FindClosestEvent(eEventType type, CVector posn, int32 *event);
+	static void ReportCrimeForEvent(eEventType type, intptr, bool);
+};
+
+extern CEvent gaEvent[NUMEVENTS];
\ No newline at end of file
diff --git a/src/core/FileLoader.cpp b/src/core/FileLoader.cpp
new file mode 100644
index 0000000..bf01725
--- /dev/null
+++ b/src/core/FileLoader.cpp
@@ -0,0 +1,1470 @@
+#include "common.h"
+#include <ctype.h>
+#include "main.h"
+
+#include "General.h"
+#include "Quaternion.h"
+#include "ModelInfo.h"
+#include "ModelIndices.h"
+#include "TempColModels.h"
+#include "VisibilityPlugins.h"
+#include "FileMgr.h"
+#include "HandlingMgr.h"
+#include "CarCtrl.h"
+#include "PedType.h"
+#include "AnimManager.h"
+#include "Game.h"
+#include "RwHelper.h"
+#include "NodeName.h"
+#include "TxdStore.h"
+#include "PathFind.h"
+#include "ObjectData.h"
+#include "DummyObject.h"
+#include "World.h"
+#include "Zones.h"
+#include "ZoneCull.h"
+#include "CdStream.h"
+#include "FileLoader.h"
+#include "MemoryHeap.h"
+#include "Streaming.h"
+#include "ColStore.h"
+#include "Occlusion.h"
+
+char CFileLoader::ms_line[256];
+
+const char*
+GetFilename(const char *filename)
+{
+	char *s = strrchr((char*)filename, '\\');
+	return s ? s+1 : filename;
+}
+
+void
+LoadingScreenLoadingFile(const char *filename)
+{
+	sprintf(gString, "Loading %s", GetFilename(filename));
+	LoadingScreen("Loading the Game", gString, nil);
+}
+
+void
+CFileLoader::LoadLevel(const char *filename)
+{
+	int fd;
+	RwTexDictionary *savedTxd;
+	bool objectsLoaded;
+	char *line;
+	char txdname[64];
+
+	savedTxd = RwTexDictionaryGetCurrent();
+	objectsLoaded = false;
+	if(savedTxd == nil){
+		savedTxd = RwTexDictionaryCreate();
+		RwTexDictionarySetCurrent(savedTxd);
+	}
+	fd = CFileMgr::OpenFile(filename, "r");
+	assert(fd > 0);
+
+	for(line = LoadLine(fd); line; line = LoadLine(fd)){
+		if(*line == '#')
+			continue;
+
+		if(strncmp(line, "EXIT", 4) == 0)
+			break;
+
+		if(strncmp(line, "IMAGEPATH", 9) == 0){
+			RwImageSetPath(line + 10);
+		}else if(strncmp(line, "TEXDICTION", 10) == 0){
+			PUSH_MEMID(MEMID_TEXTURES);
+			strcpy(txdname, line+11);
+			LoadingScreenLoadingFile(txdname);
+			RwTexDictionary *txd = LoadTexDictionary(txdname);
+			AddTexDictionaries(savedTxd, txd);
+			RwTexDictionaryDestroy(txd);
+			POP_MEMID();
+		}else if(strncmp(line, "COLFILE", 7) == 0){
+			LoadingScreenLoadingFile(line+10);
+			LoadCollisionFile(line+10, 0);
+		}else if(strncmp(line, "MODELFILE", 9) == 0){
+			LoadingScreenLoadingFile(line + 10);
+			LoadModelFile(line + 10);
+		}else if(strncmp(line, "HIERFILE", 8) == 0){
+			LoadingScreenLoadingFile(line + 9);
+			LoadClumpFile(line + 9);
+		}else if(strncmp(line, "IDE", 3) == 0){
+			LoadingScreenLoadingFile(line + 4);
+			LoadObjectTypes(line + 4);
+		}else if(strncmp(line, "IPL", 3) == 0){
+			if(!objectsLoaded){
+				LoadingScreenLoadingFile("Collision");
+				PUSH_MEMID(MEMID_WORLD);
+				CObjectData::Initialise("DATA\\OBJECT.DAT");
+				CStreaming::Init();
+				POP_MEMID();
+				PUSH_MEMID(MEMID_COLLISION);
+				CColStore::LoadAllCollision();
+				POP_MEMID();
+				for(int i = 0; i < MODELINFOSIZE; i++)
+					if(CModelInfo::GetModelInfo(i))
+						CModelInfo::GetModelInfo(i)->ConvertAnimFileIndex();
+				objectsLoaded = true;
+			}
+			PUSH_MEMID(MEMID_WORLD);
+			LoadingScreenLoadingFile(line + 4);
+			LoadScene(line + 4);
+			POP_MEMID();
+		}else if(strncmp(line, "SPLASH", 6) == 0){
+#ifndef DISABLE_LOADING_SCREEN
+			LoadSplash(GetRandomSplashScreen());
+#endif
+#ifndef GTA_PS2
+		}else if(strncmp(line, "CDIMAGE", 7) == 0){
+			CdStreamAddImage(line + 8);
+#endif
+		}
+	}
+
+	CFileMgr::CloseFile(fd);
+	RwTexDictionarySetCurrent(savedTxd);
+
+	int i;
+	for(i = 1; i < COLSTORESIZE; i++)
+		if(CColStore::GetSlot(i))
+			CColStore::GetBoundingBox(i).Grow(120.0f);
+	CWorld::RepositionCertainDynamicObjects();
+	CColStore::RemoveAllCollision();
+}
+
+char*
+CFileLoader::LoadLine(int fd)
+{
+	int i;
+	char *line;
+
+	if(CFileMgr::ReadLine(fd, ms_line, 256) == false)
+		return nil;
+	for(i = 0; ms_line[i] != '\0'; i++)
+		if(ms_line[i] < ' ' || ms_line[i] == ',')
+			ms_line[i] = ' ';
+	for(line = ms_line; *line <= ' ' && *line != '\0'; line++);
+	return line;
+}
+
+RwTexDictionary*
+CFileLoader::LoadTexDictionary(const char *filename)
+{
+	RwTexDictionary *txd;
+	RwStream *stream;
+
+	txd = nil;
+	stream = RwStreamOpen(rwSTREAMFILENAME, rwSTREAMREAD, filename);
+	debug("Loading texture dictionary file %s\n", filename);
+	if(stream){
+		if(RwStreamFindChunk(stream, rwID_TEXDICTIONARY, nil, nil))
+			txd = RwTexDictionaryGtaStreamRead(stream);
+		RwStreamClose(stream, nil);
+	}
+	if(txd == nil)
+		txd = RwTexDictionaryCreate();
+	return txd;
+}
+
+struct ColHeader
+{
+	uint32 ident;
+	uint32 size;
+};
+
+void
+CFileLoader::LoadCollisionFile(const char *filename, uint8 colSlot)
+{
+	int fd;
+	char modelname[24];
+	CBaseModelInfo *mi;
+	ColHeader header;
+
+	PUSH_MEMID(MEMID_COLLISION);
+
+	debug("Loading collision file %s\n", filename);
+	fd = CFileMgr::OpenFile(filename, "rb");
+	assert(fd > 0);
+
+	while(CFileMgr::Read(fd, (char*)&header, sizeof(header))){
+		assert(header.ident == 'LLOC');
+		CFileMgr::Read(fd, (char*)work_buff, header.size);
+		memcpy(modelname, work_buff, 24);
+
+		mi = CModelInfo::GetModelInfo(modelname, nil);
+		if(mi){
+			if(mi->GetColModel() && mi->DoesOwnColModel()){
+				LoadCollisionModel(work_buff+24, *mi->GetColModel(), modelname);
+			}else{
+				CColModel *model = new CColModel;
+				model->level = colSlot;
+				LoadCollisionModel(work_buff+24, *model, modelname);
+				mi->SetColModel(model, true);
+			}
+		}else{
+			debug("colmodel %s can't find a modelinfo\n", modelname);
+		}
+	}
+
+	CFileMgr::CloseFile(fd);
+
+	POP_MEMID();
+}
+
+
+bool
+CFileLoader::LoadCollisionFileFirstTime(uint8 *buffer, uint32 size, uint8 colSlot)
+{
+	uint32 modelsize;
+	char modelname[24];
+	CBaseModelInfo *mi;
+	ColHeader *header;
+	int modelIndex;
+
+	while(size > 8){
+		header = (ColHeader*)buffer;
+		modelsize = header->size;
+		if(header->ident != 'LLOC')
+			return size-8 < CDSTREAM_SECTOR_SIZE;
+		memcpy(modelname, buffer+8, 24);
+		memcpy(work_buff, buffer+32, modelsize-24);
+		size -= 32 + (modelsize-24);
+		buffer += 32 + (modelsize-24);
+		if(modelsize > 15*1024)
+			debug("colmodel %s is huge, size %d\n", modelname, modelsize);
+
+		mi = CModelInfo::GetModelInfo(modelname, &modelIndex);
+		if(mi){
+			CColStore::IncludeModelIndex(colSlot, modelIndex);
+			CColModel *model = new CColModel;
+			model->level = colSlot;
+			LoadCollisionModel(work_buff, *model, modelname);
+			mi->SetColModel(model, true);
+		}else{
+			debug("colmodel %s can't find a modelinfo\n", modelname);
+		}
+	}
+	return true;
+}
+
+bool
+CFileLoader::LoadCollisionFile(uint8 *buffer, uint32 size, uint8 colSlot)
+{
+	uint32 modelsize;
+	char modelname[24];
+	CBaseModelInfo *mi;
+	ColHeader *header;
+
+	while(size > 8){
+		header = (ColHeader*)buffer;
+		modelsize = header->size;
+		if(header->ident != 'LLOC')
+			return size-8 < CDSTREAM_SECTOR_SIZE;
+		memcpy(modelname, buffer+8, 24);
+		memcpy(work_buff, buffer+32, modelsize-24);
+		size -= 32 + (modelsize-24);
+		buffer += 32 + (modelsize-24);
+		if(modelsize > 15*1024)
+			debug("colmodel %s is huge, size %d\n", modelname, modelsize);
+
+		mi = CModelInfo::GetModelInfo(modelname, CColStore::GetSlot(colSlot)->minIndex, CColStore::GetSlot(colSlot)->maxIndex);
+		if(mi){
+			if(mi->GetColModel()){
+				LoadCollisionModel(work_buff, *mi->GetColModel(), modelname);
+			}else{
+				CColModel *model = new CColModel;
+				model->level = colSlot;
+				LoadCollisionModel(work_buff, *model, modelname);
+				mi->SetColModel(model, true);
+			}
+		}else{
+			debug("colmodel %s can't find a modelinfo\n", modelname);
+		}
+	}
+	return true;
+}
+
+void
+CFileLoader::LoadCollisionModel(uint8 *buf, CColModel &model, char *modelname)
+{
+	int i;
+
+	model.boundingSphere.radius = *(float*)(buf);
+	model.boundingSphere.center.x = *(float*)(buf+4);
+	model.boundingSphere.center.y = *(float*)(buf+8);
+	model.boundingSphere.center.z = *(float*)(buf+12);
+	model.boundingBox.min.x = *(float*)(buf+16);
+	model.boundingBox.min.y = *(float*)(buf+20);
+	model.boundingBox.min.z = *(float*)(buf+24);
+	model.boundingBox.max.x = *(float*)(buf+28);
+	model.boundingBox.max.y = *(float*)(buf+32);
+	model.boundingBox.max.z = *(float*)(buf+36);
+	model.numSpheres = *(int16*)(buf+40);
+	buf += 44;
+	if(model.numSpheres > 0){
+		model.spheres = (CColSphere*)RwMalloc(model.numSpheres*sizeof(CColSphere));
+		REGISTER_MEMPTR(&model.spheres);
+		for(i = 0; i < model.numSpheres; i++){
+			model.spheres[i].Set(*(float*)buf, *(CVector*)(buf+4), buf[16], buf[17]);
+			buf += 20;
+		}
+	}else
+		model.spheres = nil;
+
+	model.numLines = *(int16*)buf;
+	buf += 4;
+	if(model.numLines > 0){
+		//model.lines = (CColLine*)RwMalloc(model.numLines*sizeof(CColLine));
+		REGISTER_MEMPTR(&model.lines);
+		for(i = 0; i < model.numLines; i++){
+			//model.lines[i].Set(*(CVector*)buf, *(CVector*)(buf+12));
+			buf += 24;
+		}
+	}else
+		model.lines = nil;
+	model.numLines = 0;
+	model.lines = nil;
+
+	model.numBoxes = *(int16*)buf;
+	buf += 4;
+	if(model.numBoxes > 0){
+		model.boxes = (CColBox*)RwMalloc(model.numBoxes*sizeof(CColBox));
+		REGISTER_MEMPTR(&model.boxes);
+		for(i = 0; i < model.numBoxes; i++){
+			model.boxes[i].Set(*(CVector*)buf, *(CVector*)(buf+12), buf[24], buf[25]);
+			buf += 28;
+		}
+	}else
+		model.boxes = nil;
+
+	int32 numVertices = *(int16*)buf;
+	buf += 4;
+	if(numVertices > 0){
+		model.vertices = (CompressedVector*)RwMalloc(numVertices*sizeof(CompressedVector));
+		REGISTER_MEMPTR(&model.vertices);
+		for(i = 0; i < numVertices; i++){
+			model.vertices[i].Set(*(float*)buf, *(float*)(buf+4), *(float*)(buf+8));
+#if 0
+			if(Abs(*(float*)buf) >= 256.0f ||
+			   Abs(*(float*)(buf+4)) >= 256.0f ||
+			   Abs(*(float*)(buf+8)) >= 256.0f)
+				printf("%s:Collision volume too big\n", modelname);
+#endif
+			buf += 12;
+		}
+	}else
+		model.vertices = nil;
+
+	model.numTriangles = *(int16*)buf;
+	buf += 4;
+	if(model.numTriangles > 0){
+		model.triangles = (CColTriangle*)RwMalloc(model.numTriangles*sizeof(CColTriangle));
+		REGISTER_MEMPTR(&model.triangles);
+		for(i = 0; i < model.numTriangles; i++){
+			model.triangles[i].Set(*(int32*)buf, *(int32*)(buf+4), *(int32*)(buf+8), buf[12]);
+			buf += 16;
+		}
+	}else
+		model.triangles = nil;
+}
+
+static void
+GetNameAndLOD(char *nodename, char *name, int *n)
+{
+	char *underscore = nil;
+	for(char *s = nodename; *s != '\0'; s++){
+		if(s[0] == '_' && (s[1] == 'l' || s[1] == 'L') && isdigit(s[2]))
+			underscore = s;
+	}
+	if(underscore){
+		strncpy(name, nodename, underscore - nodename);
+		name[underscore - nodename] = '\0';
+		*n = atoi(underscore + 2);
+	}else{
+		strncpy(name, nodename, 24);
+		*n = 0;
+	}
+}
+
+RpAtomic*
+CFileLoader::FindRelatedModelInfoCB(RpAtomic *atomic, void *data)
+{
+	CSimpleModelInfo *mi;
+	char *nodename, name[24];
+	int n;
+	RpClump *clump = (RpClump*)data;
+
+	nodename = GetFrameNodeName(RpAtomicGetFrame(atomic));
+	GetNameAndLOD(nodename, name, &n);
+	mi = (CSimpleModelInfo*)CModelInfo::GetModelInfo(name, nil);
+	if(mi){
+		assert(mi->IsSimple());
+		CVisibilityPlugins::SetAtomicRenderCallback(atomic, nil);
+		mi->SetAtomic(n, atomic);
+		RpClumpRemoveAtomic(clump, atomic);
+		RpAtomicSetFrame(atomic, RwFrameCreate());
+		CVisibilityPlugins::SetAtomicModelInfo(atomic, mi);
+	}else{
+		debug("Can't find Atomic %s\n", name);
+	}
+
+	return atomic;
+}
+
+#ifdef LIBRW
+void
+InitClump(RpClump *clump)
+{
+	RpClumpForAllAtomics(clump, ConvertPlatformAtomic, nil);
+}
+#else
+#define InitClump(clump)
+#endif
+
+void
+CFileLoader::LoadModelFile(const char *filename)
+{
+	RwStream *stream;
+	RpClump *clump;
+
+	debug("Loading model file %s\n", filename);
+	stream = RwStreamOpen(rwSTREAMFILENAME, rwSTREAMREAD, filename);
+	if(RwStreamFindChunk(stream, rwID_CLUMP, nil, nil)){
+		clump = RpClumpStreamRead(stream);
+		if(clump){
+			InitClump(clump);
+			RpClumpForAllAtomics(clump, FindRelatedModelInfoCB, clump);
+			RpClumpDestroy(clump);
+		}
+	}
+	RwStreamClose(stream, nil);
+}
+
+void
+CFileLoader::LoadClumpFile(const char *filename)
+{
+	RwStream *stream;
+	RpClump *clump;
+	char *nodename, name[24];
+	int n;
+	CClumpModelInfo *mi;
+
+	debug("Loading model file %s\n", filename);
+	stream = RwStreamOpen(rwSTREAMFILENAME, rwSTREAMREAD, filename);
+	while(RwStreamFindChunk(stream, rwID_CLUMP, nil, nil)){
+		clump = RpClumpStreamRead(stream);
+		if(clump){
+			nodename = GetFrameNodeName(RpClumpGetFrame(clump));
+			GetNameAndLOD(nodename, name, &n);
+			mi = (CClumpModelInfo*)CModelInfo::GetModelInfo(name, nil);
+			if(mi){
+				InitClump(clump);
+				assert(mi->IsClump());
+				mi->SetClump(clump);
+			}else
+				RpClumpDestroy(clump);
+		}
+	}
+	RwStreamClose(stream, nil);
+}
+
+bool
+CFileLoader::LoadClumpFile(RwStream *stream, uint32 id)
+{
+	RpClump *clump;
+	CClumpModelInfo *mi;
+
+	if(!RwStreamFindChunk(stream, rwID_CLUMP, nil, nil))
+		return false;
+	clump = RpClumpStreamRead(stream);
+	if(clump == nil)
+		return false;
+	InitClump(clump);
+	mi = (CClumpModelInfo*)CModelInfo::GetModelInfo(id);
+	mi->SetClump(clump);
+	return true;
+}
+
+bool
+CFileLoader::StartLoadClumpFile(RwStream *stream, uint32 id)
+{
+	if(RwStreamFindChunk(stream, rwID_CLUMP, nil, nil)){
+		printf("Start loading %s\n", CModelInfo::GetModelInfo(id)->GetModelName());
+		return RpClumpGtaStreamRead1(stream);
+	}else{
+		printf("FAILED\n");
+		return false;
+	}
+}
+
+bool
+CFileLoader::FinishLoadClumpFile(RwStream *stream, uint32 id)
+{
+	RpClump *clump;
+	CClumpModelInfo *mi;
+
+	printf("Finish loading %s\n", CModelInfo::GetModelInfo(id)->GetModelName());
+	clump = RpClumpGtaStreamRead2(stream);
+
+	if(clump){
+		InitClump(clump);
+		mi = (CClumpModelInfo*)CModelInfo::GetModelInfo(id);
+		mi->SetClump(clump);
+		return true;
+	}else{
+		printf("FAILED\n");
+		return false;
+	}
+}
+
+CSimpleModelInfo *gpRelatedModelInfo;
+
+bool
+CFileLoader::LoadAtomicFile(RwStream *stream, uint32 id)
+{
+	RpClump *clump;
+
+	if(RwStreamFindChunk(stream, rwID_CLUMP, nil, nil)){
+		clump = RpClumpStreamRead(stream);
+		if(clump == nil)
+			return false;
+		InitClump(clump);
+		gpRelatedModelInfo = (CSimpleModelInfo*)CModelInfo::GetModelInfo(id);
+		RpClumpForAllAtomics(clump, SetRelatedModelInfoCB, clump);
+		RpClumpDestroy(clump);
+	}
+	return true;
+}
+
+RpAtomic*
+CFileLoader::SetRelatedModelInfoCB(RpAtomic *atomic, void *data)
+{
+	char *nodename, name[24];
+	int n;
+	RpClump *clump = (RpClump*)data;
+
+	nodename = GetFrameNodeName(RpAtomicGetFrame(atomic));
+	GetNameAndLOD(nodename, name, &n);
+	CVisibilityPlugins::SetAtomicRenderCallback(atomic, nil);
+	gpRelatedModelInfo->SetAtomic(n, atomic);
+	RpClumpRemoveAtomic(clump, atomic);
+	RpAtomicSetFrame(atomic, RwFrameCreate());
+	CVisibilityPlugins::SetAtomicModelInfo(atomic, gpRelatedModelInfo);
+	return atomic;
+}
+
+RpClump*
+CFileLoader::LoadAtomicFile2Return(const char *filename)
+{
+	RwStream *stream;
+	RpClump *clump;
+
+	clump = nil;
+	debug("Loading model file %s\n", filename);
+	stream = RwStreamOpen(rwSTREAMFILENAME, rwSTREAMREAD, filename);
+	if(RwStreamFindChunk(stream, rwID_CLUMP, nil, nil))
+		clump = RpClumpStreamRead(stream);
+	if(clump)
+		InitClump(clump);
+	RwStreamClose(stream, nil);
+	return clump;
+}
+
+static RwTexture*
+MoveTexturesCB(RwTexture *texture, void *pData)
+{
+	RwTexDictionaryAddTexture((RwTexDictionary*)pData, texture);
+	return texture;
+}
+
+void
+CFileLoader::AddTexDictionaries(RwTexDictionary *dst, RwTexDictionary *src)
+{
+	RwTexDictionaryForAllTextures(src, MoveTexturesCB, dst);
+}
+
+#define isLine3(l, a, b, c) ((l[0] == a) && (l[1] == b) && (l[2] == c))
+#define isLine4(l, a, b, c, d) ((l[0] == a) && (l[1] == b) && (l[2] == c) && (l[3] == d))
+
+void
+CFileLoader::LoadObjectTypes(const char *filename)
+{
+	enum {
+		NONE,
+		OBJS,
+		MLO,	// unused but enum still has it
+		TOBJ,
+		WEAP,
+		HIER,
+		CARS,
+		PEDS,
+		PATH,
+		TWODFX
+	};
+	char *line;
+	int fd;
+	int section;
+	int pathIndex;
+	int id, pathType;
+	int minID, maxID;
+
+	section = NONE;
+	minID = INT32_MAX;
+	maxID = -1;
+	pathIndex = -1;
+	debug("Loading object types from %s...\n", filename);
+
+	fd = CFileMgr::OpenFile(filename, "rb");
+	assert(fd > 0);
+	for(line = CFileLoader::LoadLine(fd); line; line = CFileLoader::LoadLine(fd)){
+		if(*line == '\0' || *line == '#')
+			continue;
+
+		if(section == NONE){
+			if(isLine4(line, 'o','b','j','s')) section = OBJS;
+			else if(isLine4(line, 't','o','b','j')) section = TOBJ;
+			else if(isLine4(line, 'w','e','a','p')) section = WEAP;
+			else if(isLine4(line, 'h','i','e','r')) section = HIER;
+			else if(isLine4(line, 'c','a','r','s')) section = CARS;
+			else if(isLine4(line, 'p','e','d','s')) section = PEDS;
+			else if(isLine4(line, 'p','a','t','h')) section = PATH;
+			else if(isLine4(line, '2','d','f','x')) section = TWODFX;
+		}else if(isLine3(line, 'e','n','d')){
+			section = NONE;
+		}else switch(section){
+		case OBJS:
+			id = LoadObject(line);
+			if(id > maxID) maxID = id;
+			if(id < minID) minID = id;
+			break;
+		case TOBJ:
+			id = LoadTimeObject(line);
+			if(id > maxID) maxID = id;
+			if(id < minID) minID = id;
+			break;
+		case WEAP:
+			LoadWeaponObject(line);
+			break;
+		case HIER:
+			LoadClumpObject(line);
+			break;
+		case CARS:
+			LoadVehicleObject(line);
+			break;
+		case PEDS:
+			LoadPedObject(line);
+			break;
+		case PATH:
+			if(pathIndex == -1){
+				id = LoadPathHeader(line, pathType);
+				pathIndex = 0;
+			}else{
+				if(pathType == 0)
+					LoadPedPathNode(line, id, pathIndex);
+				else if (pathType == 1)
+					LoadCarPathNode(line, id, pathIndex, false);
+				else if (pathType == 2)
+					LoadCarPathNode(line, id, pathIndex, true);
+				pathIndex++;
+				if(pathIndex == 12)
+					pathIndex = -1;
+			}
+			break;
+		case TWODFX:
+			Load2dEffect(line);
+			break;
+		}
+	}
+	CFileMgr::CloseFile(fd);
+
+	for(id = minID; id <= maxID; id++){
+		CSimpleModelInfo *mi = (CSimpleModelInfo*)CModelInfo::GetModelInfo(id);
+		if(mi && mi->IsBuilding())
+			mi->SetupBigBuilding(minID, maxID);
+	}
+}
+
+void
+SetModelInfoFlags(CSimpleModelInfo *mi, uint32 flags)
+{
+	mi->m_wetRoadReflection =	!!(flags & 1);
+	mi->m_noFade =	!!(flags & 2);
+	mi->m_drawLast =	!!(flags & (4|8));
+	mi->m_additive =	!!(flags & 8);
+	mi->m_isSubway =	!!(flags & 0x10);
+	mi->m_ignoreLight =	!!(flags & 0x20);
+	mi->m_noZwrite =	!!(flags & 0x40);
+	mi->m_noShadows =	!!(flags & 0x80);
+	mi->m_ignoreDrawDist =	!!(flags & 0x100);
+	mi->m_isCodeGlass =	!!(flags & 0x200);
+	mi->m_isArtistGlass =	!!(flags & 0x400);
+}
+
+int
+CFileLoader::LoadObject(const char *line)
+{
+	int id, numObjs;
+	char model[24], txd[24];
+	float dist[3];
+	uint32 flags;
+	int damaged;
+	CSimpleModelInfo *mi;
+
+	if(sscanf(line, "%d %s %s %d", &id, model, txd, &numObjs) != 4)
+		return 0;	// game returns return value
+
+	switch(numObjs){
+	case 1:
+		sscanf(line, "%d %s %s %d %f %d",
+			&id, model, txd, &numObjs, &dist[0], &flags);
+		damaged = 0;
+		break;
+	case 2:
+		sscanf(line, "%d %s %s %d %f %f %d",
+			&id, model, txd, &numObjs, &dist[0], &dist[1], &flags);
+		damaged = dist[0] < dist[1] ?	// Are distances increasing?
+			0 :	// Yes, no damage model
+			1;	// No, 1 is damaged
+		break;
+	case 3:
+		sscanf(line, "%d %s %s %d %f %f %f %d",
+			&id, model, txd, &numObjs, &dist[0], &dist[1], &dist[2], &flags);
+		damaged = dist[0] < dist[1] ?	// Are distances increasing?
+				(dist[1] < dist[2] ? 0 : 2) :	// Yes, only 2 can still be a damage model
+			1;	// No, 1 and 2 are damaged
+		break;
+	}
+
+	mi = CModelInfo::AddSimpleModel(id);
+	mi->SetModelName(model);
+	mi->SetNumAtomics(numObjs);
+	mi->SetLodDistances(dist);
+	SetModelInfoFlags(mi, flags);
+	mi->m_firstDamaged = damaged;
+	mi->SetTexDictionary(txd);
+	MatchModelString(model, id);
+
+	return id;
+}
+
+int
+CFileLoader::LoadTimeObject(const char *line)
+{
+	int id, numObjs;
+	char model[24], txd[24];
+	float dist[3];
+	uint32 flags;
+	int timeOn, timeOff;
+	int damaged;
+	CTimeModelInfo *mi, *other;
+
+	if(sscanf(line, "%d %s %s %d", &id, model, txd, &numObjs) != 4)
+		return 0;	// game returns return value
+
+	switch(numObjs){
+	case 1:
+		sscanf(line, "%d %s %s %d %f %d %d %d",
+			&id, model, txd, &numObjs, &dist[0], &flags, &timeOn, &timeOff);
+		damaged = 0;
+		break;
+	case 2:
+		sscanf(line, "%d %s %s %d %f %f %d %d %d",
+			&id, model, txd, &numObjs, &dist[0], &dist[1], &flags, &timeOn, &timeOff);
+		damaged = dist[0] < dist[1] ?	// Are distances increasing?
+			0 :	// Yes, no damage model
+			1;	// No, 1 is damaged
+		break;
+	case 3:
+		sscanf(line, "%d %s %s %d %f %f %f %d %d %d",
+			&id, model, txd, &numObjs, &dist[0], &dist[1], &dist[2], &flags, &timeOn, &timeOff);
+		damaged = dist[0] < dist[1] ?	// Are distances increasing?
+				(dist[1] < dist[2] ? 0 : 2) :	// Yes, only 2 can still be a damage model
+			1;	// No, 1 and 2 are damaged
+		break;
+	}
+
+	mi = CModelInfo::AddTimeModel(id);
+	mi->SetModelName(model);
+	mi->SetNumAtomics(numObjs);
+	mi->SetLodDistances(dist);
+	SetModelInfoFlags(mi, flags);
+	mi->m_firstDamaged = damaged;
+	mi->SetTimes(timeOn, timeOff);
+	mi->SetTexDictionary(txd);
+	other = mi->FindOtherTimeModel();
+	if(other)
+		other->SetOtherTimeModel(id);
+	MatchModelString(model, id);
+
+	return id;
+}
+
+int
+CFileLoader::LoadWeaponObject(const char *line)
+{
+	int id, numObjs;
+	char model[24], txd[24], animFile[16];
+	float dist;
+	CWeaponModelInfo *mi;
+
+	sscanf(line, "%d %s %s %s %d %f", &id, model, txd, animFile, &numObjs, &dist);
+
+	mi = CModelInfo::AddWeaponModel(id);
+	mi->SetModelName(model);
+	mi->SetNumAtomics(1);
+	mi->m_lodDistances[0] = dist;
+	mi->SetTexDictionary(txd);
+	mi->SetAnimFile(animFile);
+	mi->SetColModel(&CTempColModels::ms_colModelWeapon);
+	MatchModelString(model, id);
+	return id;
+}
+
+void
+CFileLoader::LoadClumpObject(const char *line)
+{
+	int id;
+	char model[24], txd[24];
+	CClumpModelInfo *mi;
+
+	if(sscanf(line, "%d %s %s", &id, model, txd) == 3){
+		mi = CModelInfo::AddClumpModel(id);
+		mi->SetModelName(model);
+		mi->SetTexDictionary(txd);
+		mi->SetColModel(&CTempColModels::ms_colModelBBox);
+	}
+}
+
+void
+CFileLoader::LoadVehicleObject(const char *line)
+{
+	int id;
+	char model[24], txd[24];
+	char type[8], handlingId[16], gamename[32], animFile[16], vehclass[12];
+	uint32 frequency, comprules;
+	int32 level, misc;
+	float wheelScale;
+	CVehicleModelInfo *mi;
+	char *p;
+
+	sscanf(line, "%d %s %s %s %s %s %s %s %d %d %x %d %f",
+		&id, model, txd,
+		type, handlingId, gamename, animFile, vehclass,
+		&frequency, &level, &comprules, &misc, &wheelScale);
+
+	mi = CModelInfo::AddVehicleModel(id);
+	mi->SetModelName(model);
+	mi->SetTexDictionary(txd);
+	mi->SetAnimFile(animFile);
+	for(p = gamename; *p; p++)
+		if(*p == '_') *p = ' ';
+	strcpy(mi->m_gameName, gamename);
+	mi->m_level = level;
+	mi->m_compRules = comprules;
+
+	if(strcmp(type, "car") == 0){
+		mi->m_wheelId = misc;
+		mi->m_wheelScale = wheelScale;
+		mi->m_vehicleType = VEHICLE_TYPE_CAR;
+	}else if(strcmp(type, "boat") == 0){
+		mi->m_vehicleType = VEHICLE_TYPE_BOAT;
+	}else if(strcmp(type, "train") == 0){
+		mi->m_vehicleType = VEHICLE_TYPE_TRAIN;
+	}else if(strcmp(type, "heli") == 0){
+		mi->m_vehicleType = VEHICLE_TYPE_HELI;
+	}else if(strcmp(type, "plane") == 0){
+		mi->m_planeLodId = misc;
+		mi->m_wheelScale = 1.0f;
+		mi->m_vehicleType = VEHICLE_TYPE_PLANE;
+	}else if(strcmp(type, "bike") == 0){
+		mi->m_bikeSteerAngle = misc;
+		mi->m_wheelScale = wheelScale;
+		mi->m_vehicleType = VEHICLE_TYPE_BIKE;
+	}else
+		assert(0);
+
+	mi->m_handlingId = mod_HandlingManager.GetHandlingId(handlingId);
+
+	if(strcmp(vehclass, "normal") == 0)
+		mi->m_vehicleClass = CCarCtrl::NORMAL;
+	else if(strcmp(vehclass, "poorfamily") == 0)
+		mi->m_vehicleClass = CCarCtrl::POOR;
+	else if(strcmp(vehclass, "richfamily") == 0)
+		mi->m_vehicleClass = CCarCtrl::RICH;
+	else if(strcmp(vehclass, "executive") == 0)
+		mi->m_vehicleClass = CCarCtrl::EXEC;
+	else if(strcmp(vehclass, "worker") == 0)
+		mi->m_vehicleClass = CCarCtrl::WORKER;
+	else if(strcmp(vehclass, "big") == 0)
+		mi->m_vehicleClass = CCarCtrl::BIG;
+	else if(strcmp(vehclass, "taxi") == 0)
+		mi->m_vehicleClass = CCarCtrl::TAXI;
+	else if(strcmp(vehclass, "moped") == 0)
+		mi->m_vehicleClass = CCarCtrl::MOPED;
+	else if(strcmp(vehclass, "motorbike") == 0)
+		mi->m_vehicleClass = CCarCtrl::MOTORBIKE;
+	else if(strcmp(vehclass, "leisureboat") == 0)
+		mi->m_vehicleClass = CCarCtrl::LEISUREBOAT;
+	else if(strcmp(vehclass, "workerboat") == 0)
+		mi->m_vehicleClass = CCarCtrl::WORKERBOAT;
+	else if(strcmp(vehclass, "ignore") == 0) {
+		mi->m_vehicleClass = -1;
+		return;
+	}
+	CCarCtrl::AddToCarArray(id, mi->m_vehicleClass);
+	mi->m_frequency = frequency;
+}
+
+void
+CFileLoader::LoadPedObject(const char *line)
+{
+	int id;
+	char model[24], txd[24];
+	char pedType[24], pedStats[24], animGroup[24], animFile[16];
+	int carsCanDrive;
+	CPedModelInfo *mi;
+	int animGroupId;
+	int radio1, radio2;
+
+	sscanf(line, "%d %s %s %s %s %s %x %s %d %d",
+	          &id, model, txd,
+	          pedType, pedStats, animGroup, &carsCanDrive,
+		  animFile, &radio1, &radio2);
+
+	mi = CModelInfo::AddPedModel(id);
+	mi->SetModelName(model);
+	mi->SetTexDictionary(txd);
+	mi->SetAnimFile(animFile);
+	mi->SetColModel(&CTempColModels::ms_colModelPed1);
+	mi->m_pedType = CPedType::FindPedType(pedType);
+	mi->m_pedStatType = CPedStats::GetPedStatType(pedStats);
+	for(animGroupId = 0; animGroupId < NUM_ANIM_ASSOC_GROUPS; animGroupId++)
+		if(strcmp(animGroup, CAnimManager::GetAnimGroupName((AssocGroupId)animGroupId)) == 0)
+			break;
+	assert(animGroupId < NUM_ANIM_ASSOC_GROUPS);
+	mi->m_animGroup = animGroupId;
+	mi->m_carsCanDrive = carsCanDrive;
+	mi->radio1 = radio1;
+	mi->radio2 = radio2;
+}
+
+int
+CFileLoader::LoadPathHeader(const char *line, int &type)
+{
+	int id;
+	char modelname[32];
+
+	sscanf(line, "%d %d %s", &type, &id, modelname);
+	return id;
+}
+
+void
+CFileLoader::LoadPedPathNode(const char *line, int id, int node)
+{
+	int type, next, cross, numLeft, numRight, speed, flags;
+	float x, y, z, width, spawnRate;
+
+	if(sscanf(line, "%d %d %d %f %f %f %f %d %d %d %d %f",
+			&type, &next, &cross, &x, &y, &z, &width, &numLeft, &numRight,
+			&speed, &flags, &spawnRate) != 12)
+		spawnRate = 1.0f;
+
+	if(id == -1)
+		ThePaths.StoreDetachedNodeInfoPed(node, type, next, x, y, z,
+			width, !!cross, !!(flags&1), !!(flags&4), spawnRate*15.0f);
+	else
+		ThePaths.StoreNodeInfoPed(id, node, type, next, x, y, z,
+			width, !!cross, spawnRate*15.0f);
+}
+
+void
+CFileLoader::LoadCarPathNode(const char *line, int id, int node, bool waterPath)
+{
+	int type, next, cross, numLeft, numRight, speed, flags;
+	float x, y, z, width, spawnRate;
+
+	if(sscanf(line, "%d %d %d %f %f %f %f %d %d %d %d %f",
+			&type, &next, &cross, &x, &y, &z, &width, &numLeft, &numRight,
+			&speed, &flags, &spawnRate) != 12)
+		spawnRate = 1.0f;
+
+	if(id == -1)
+		ThePaths.StoreDetachedNodeInfoCar(node, type, next, x, y, z, width, numLeft, numRight,
+			!!(flags&1), !!(flags&4), speed, !!(flags&2), waterPath, spawnRate * 15, false);
+	else
+		ThePaths.StoreNodeInfoCar(id, node, type, next, x, y, z, 0, numLeft, numRight,
+			!!(flags&1), !!(flags&4), speed, !!(flags&2), waterPath, spawnRate * 15);
+}
+
+
+void
+CFileLoader::Load2dEffect(const char *line)
+{
+	int id, r, g, b, a, type, ptype;
+	float x, y, z;
+	char corona[32], shadow[32];
+	int shadowIntens, lightType, roadReflection, flare, flags, probability;
+	CBaseModelInfo *mi;
+	C2dEffect *effect;
+	char *p;
+
+	sscanf(line, "%d %f %f %f %d %d %d %d %d", &id, &x, &y, &z, &r, &g, &b, &a, &type);
+
+	CTxdStore::PushCurrentTxd();
+	CTxdStore::SetCurrentTxd(CTxdStore::FindTxdSlot("particle"));
+
+	mi = CModelInfo::GetModelInfo(id);
+	effect = CModelInfo::Get2dEffectStore().Alloc();
+	mi->Add2dEffect(effect);
+	effect->pos = CVector(x, y, z);
+	effect->col = CRGBA(r, g, b, a);
+	effect->type = type;
+
+	switch(effect->type){
+	case EFFECT_LIGHT:
+		while(*line++ != '"');
+		p = corona;
+		while(*line != '"') *p++ = *line++;
+		*p = '\0';
+		line++;
+
+		while(*line++ != '"');
+		p = shadow;
+		while(*line != '"') *p++ = *line++;
+		*p = '\0';
+		line++;
+
+		sscanf(line, "%f %f %f %f %d %d %d %d %d",
+			&effect->light.dist,
+			&effect->light.range,
+			&effect->light.size,
+			&effect->light.shadowSize,
+			&shadowIntens, &lightType, &roadReflection, &flare, &flags);
+		effect->light.corona = RwTextureRead(corona, nil);
+		effect->light.shadow = RwTextureRead(shadow, nil);
+		effect->light.shadowIntensity = shadowIntens;
+		effect->light.lightType = lightType;
+		effect->light.roadReflection = roadReflection;
+		effect->light.flareType = flare;
+
+		if(flags & LIGHTFLAG_FOG_ALWAYS)
+			flags &= ~LIGHTFLAG_FOG_NORMAL;
+		effect->light.flags = flags;
+		break;
+
+	case EFFECT_PARTICLE:
+		sscanf(line, "%d %f %f %f %d %d %d %d %d %d %f %f %f %f",
+			&id, &x, &y, &z, &r, &g, &b, &a, &type,
+			&effect->particle.particleType,
+			&effect->particle.dir.x,
+			&effect->particle.dir.y,
+			&effect->particle.dir.z,
+			&effect->particle.scale);
+		break;
+
+	case EFFECT_ATTRACTOR:
+		sscanf(line, "%d %f %f %f %d %d %d %d %d %d %f %f %f %d",
+			&id, &x, &y, &z, &r, &g, &b, &a, &type,
+			&flags,
+			&effect->attractor.dir.x,
+			&effect->attractor.dir.y,
+			&effect->attractor.dir.z,
+			&probability);
+		effect->attractor.type = flags;
+#ifdef FIX_BUGS
+		effect->attractor.probability = clamp(probability, 0, 255);
+#else
+		effect->attractor.probability = probability;
+#endif
+		break;
+	case EFFECT_PED_ATTRACTOR:
+		sscanf(line, "%d %f %f %f %d %d %d %d %d %d %f %f %f %f %f %f",
+			&id, &x, &y, &z, &r, &g, &b, &a, &type,
+			&ptype,
+			&effect->pedattr.queueDir.x,
+			&effect->pedattr.queueDir.y,
+			&effect->pedattr.queueDir.z,
+			&effect->pedattr.useDir.x,
+			&effect->pedattr.useDir.y,
+			&effect->pedattr.useDir.z);
+		effect->pedattr.type = ptype;
+		break;
+	}
+
+	CTxdStore::PopCurrentTxd();
+}
+
+void
+CFileLoader::LoadScene(const char *filename)
+{
+	enum {
+		NONE,
+		INST,
+		ZONE,
+		CULL,
+		OCCL,
+		PICK,
+		PATH,
+	};
+	char *line;
+	int fd;
+	int section;
+	int pathType, pathIndex;
+
+	section = NONE;
+	pathIndex = -1;
+	debug("Creating objects from %s...\n", filename);
+
+	fd = CFileMgr::OpenFile(filename, "rb");
+	assert(fd > 0);
+	for(line = CFileLoader::LoadLine(fd); line; line = CFileLoader::LoadLine(fd)){
+		if(*line == '\0' || *line == '#')
+			continue;
+
+		if(section == NONE){
+			if(isLine4(line, 'i','n','s','t')) section = INST;
+			else if(isLine4(line, 'z','o','n','e')) section = ZONE;
+			else if(isLine4(line, 'c','u','l','l')) section = CULL;
+			else if(isLine4(line, 'p','i','c','k')) section = PICK;
+			else if(isLine4(line, 'p','a','t','h')) section = PATH;
+			else if(isLine4(line, 'o','c','c','l')) section = OCCL;
+		}else if(isLine3(line, 'e','n','d')){
+			section = NONE;
+		}else switch(section){
+		case INST:
+			LoadObjectInstance(line);
+			break;
+		case ZONE:
+			LoadZone(line);
+			break;
+		case CULL:
+			LoadCullZone(line);
+			break;
+		case OCCL:
+			LoadOcclusionVolume(line);
+			break;
+		case PICK:
+			// unused
+			LoadPickup(line);
+			break;
+		case PATH:
+			if(pathIndex == -1){
+				LoadPathHeader(line, pathType);
+				pathIndex = 0;
+			}else{
+				if(pathType == 0)
+					LoadPedPathNode(line, -1, pathIndex);
+				else if (pathType == 1)
+					LoadCarPathNode(line, -1, pathIndex, false);
+				else if (pathType == 2)
+					LoadCarPathNode(line, -1, pathIndex, true);
+				pathIndex++;
+				if(pathIndex == 12)
+					pathIndex = -1;
+			}
+			break;
+		}
+	}
+	CFileMgr::CloseFile(fd);
+
+	debug("Finished loading IPL\n");
+}
+
+void
+CFileLoader::LoadObjectInstance(const char *line)
+{
+	int id;
+	char name[24];
+	RwV3d trans, scale, axis;
+	float angle;
+	CSimpleModelInfo *mi;
+	RwMatrix *xform;
+	CEntity *entity;
+	float area;
+
+	if(sscanf(line, "%d %s %f %f %f %f %f %f %f %f %f %f %f",
+	          &id, name, &area,
+	          &trans.x, &trans.y, &trans.z,
+	          &scale.x, &scale.y, &scale.z,
+	          &axis.x, &axis.y, &axis.z, &angle) != 13){
+		if(sscanf(line, "%d %s %f %f %f %f %f %f %f %f %f %f",
+		          &id, name,
+		          &trans.x, &trans.y, &trans.z,
+		          &scale.x, &scale.y, &scale.z,
+		          &axis.x, &axis.y, &axis.z, &angle) != 12)
+			return;
+		area = 0;
+	}
+
+	mi = (CSimpleModelInfo*)CModelInfo::GetModelInfo(id);
+	if(mi == nil)
+		return;
+	assert(mi->IsSimple());
+
+	if(!CStreaming::IsObjectInCdImage(id))
+		debug("Not in cdimage %s\n", mi->GetModelName());
+
+	angle = -RADTODEG(2.0f * acosf(angle));
+	xform = RwMatrixCreate();
+	RwMatrixRotate(xform, &axis, angle, rwCOMBINEREPLACE);
+	RwMatrixTranslate(xform, &trans, rwCOMBINEPOSTCONCAT);
+
+	if(mi->GetObjectID() == -1){
+		if(ThePaths.IsPathObject(id)){
+			entity = new CTreadable;
+			ThePaths.RegisterMapObject((CTreadable*)entity);
+		}else
+			entity = new CBuilding;
+		entity->SetModelIndexNoCreate(id);
+		entity->GetMatrix() = CMatrix(xform);
+		entity->m_level = CTheZones::GetLevelFromPosition(&entity->GetPosition());
+		entity->m_area = area;
+		if(mi->IsBuilding()){
+			if(mi->m_isBigBuilding)
+				entity->SetupBigBuilding();
+			if(mi->m_isSubway)
+				entity->bIsSubway = true;
+		}
+		if(mi->GetLargestLodDistance() < 2.0f)
+			entity->bIsVisible = false;
+		CWorld::Add(entity);
+
+		CColModel *col = entity->GetColModel();
+		if(col->numSpheres || col->numBoxes || col->numTriangles){
+			if(col->level != 0)
+				CColStore::GetBoundingBox(col->level).ContainRect(entity->GetBoundRect());
+		}else
+			entity->bUsesCollision = false;
+
+		if(entity->GetPosition().z + col->boundingBox.min.z < 6.0f)
+			entity->bUnderwater = true;
+	}else{
+		entity = new CDummyObject;
+		entity->SetModelIndexNoCreate(id);
+		entity->GetMatrix() = CMatrix(xform);
+		CWorld::Add(entity);
+		if(IsGlass(entity->GetModelIndex()) && !mi->m_isArtistGlass)
+			entity->bIsVisible = false;
+		entity->m_level = CTheZones::GetLevelFromPosition(&entity->GetPosition());
+		entity->m_area = area;
+	}
+
+	RwMatrixDestroy(xform);
+}
+
+void
+CFileLoader::LoadZone(const char *line)
+{
+	char name[24];
+	int type, level;
+	float minx, miny, minz;
+	float maxx, maxy, maxz;
+
+	if(sscanf(line, "%s %d %f %f %f %f %f %f %d", name, &type, &minx, &miny, &minz, &maxx, &maxy, &maxz, &level) == 9)
+		CTheZones::CreateZone(name, (eZoneType)type, minx, miny, minz, maxx, maxy, maxz, (eLevelName)level);
+}
+
+void
+CFileLoader::LoadCullZone(const char *line)
+{
+	CVector pos;
+	float minx, miny, minz;
+	float maxx, maxy, maxz;
+	int flags;
+	int wantedLevelDrop = 0;
+
+	sscanf(line, "%f %f %f %f %f %f %f %f %f %d %d",
+		&pos.x, &pos.y, &pos.z,
+		&minx, &miny, &minz,
+		&maxx, &maxy, &maxz,
+		&flags, &wantedLevelDrop);
+	CCullZones::AddCullZone(pos, minx, maxx, miny, maxy, minz, maxz, flags, wantedLevelDrop);
+}
+
+// unused
+void
+CFileLoader::LoadPickup(const char *line)
+{
+	int id;
+	float x, y, z;
+
+	sscanf(line, "%d %f %f %f", &id, &x, &y, &z);
+}
+
+void
+CFileLoader::LoadOcclusionVolume(const char *line)
+{
+	float x, y, z;
+	float width, length, height;
+	float angle;
+
+	sscanf(line, "%f %f %f %f %f %f %f",
+		&x, &y, &z,
+		&width, &length, &height,
+		&angle);
+	COcclusion::AddOne(x, y, z + height/2.0f, width, length, height, angle);
+}
+
+
+// unused
+void
+CFileLoader::ReloadPaths(const char *filename)
+{
+	enum {
+		NONE,
+		PATH,
+	};
+	char *line;
+	int section = NONE;
+	int id, pathType, pathIndex = -1;
+	debug("Reloading paths from %s...\n", filename);
+
+	int fd = CFileMgr::OpenFile(filename, "r");
+	assert(fd > 0);
+	for (line = CFileLoader::LoadLine(fd); line; line = CFileLoader::LoadLine(fd)) {
+		if (*line == '\0' || *line == '#')
+			continue;
+
+		if (section == NONE) {
+			if (isLine4(line, 'p','a','t','h')) {
+				section = PATH;
+				ThePaths.AllocatePathFindInfoMem(4500);
+			}
+		} else if (isLine3(line, 'e','n','d')) {
+			section = NONE;
+		} else {
+			switch (section) {
+				case PATH:
+					if (pathIndex == -1) {
+						id = LoadPathHeader(line, pathType);
+						pathIndex = 0;
+					} else {
+						if(pathType == 0)
+							LoadPedPathNode(line, id, pathIndex);
+						else if (pathType == 1)
+							LoadCarPathNode(line, id, pathIndex, false);
+						else if (pathType == 2)
+							LoadCarPathNode(line, id, pathIndex, true);
+						pathIndex++;
+						if (pathIndex == 12)
+							pathIndex = -1;
+					}
+					break;
+				default:
+					break;
+			}
+		}
+	}
+	CFileMgr::CloseFile(fd);
+}
+
+void
+CFileLoader::ReloadObjectTypes(const char *filename)
+{
+	enum {
+		NONE,
+		OBJS,
+		TOBJ,
+		TWODFX
+	};
+	char *line;
+	int section = NONE;
+	CModelInfo::ReInit2dEffects();
+	debug("Reloading object types from %s...\n", filename);
+
+	CFileMgr::ChangeDir("\\DATA\\MAPS\\");
+	int fd = CFileMgr::OpenFile(filename, "r");
+	assert(fd > 0);
+	CFileMgr::ChangeDir("\\");
+	for (line = CFileLoader::LoadLine(fd); line; line = CFileLoader::LoadLine(fd)) {
+		if (*line == '\0' || *line == '#')
+			continue;
+
+		if (section == NONE) {
+			if (isLine4(line, 'o','b','j','s')) section = OBJS;
+			else if (isLine4(line, 't','o','b','j')) section = TOBJ;
+			else if (isLine4(line, '2','d','f','x')) section = TWODFX;
+		} else if (isLine3(line, 'e','n','d')) {
+			section = NONE;
+		} else {
+			switch (section) {
+				case OBJS:
+				case TOBJ:
+					ReloadObject(line);
+					break;
+				case TWODFX:
+					Load2dEffect(line);
+					break;
+				default:
+					break;
+			}
+		}
+	}
+	CFileMgr::CloseFile(fd);
+}
+
+void
+CFileLoader::ReloadObject(const char *line)
+{
+	int id, numObjs;
+	char model[24], txd[24];
+	float dist[3];
+	uint32 flags;
+	CSimpleModelInfo *mi;
+
+	if(sscanf(line, "%d %s %s %d", &id, model, txd, &numObjs) != 4)
+		return;
+
+	switch(numObjs){
+	case 1:
+		sscanf(line, "%d %s %s %d %f %d",
+			&id, model, txd, &numObjs, &dist[0], &flags);
+		break;
+	case 2:
+		sscanf(line, "%d %s %s %d %f %f %d",
+			&id, model, txd, &numObjs, &dist[0], &dist[1], &flags);
+		break;
+	case 3:
+		sscanf(line, "%d %s %s %d %f %f %f %d",
+			&id, model, txd, &numObjs, &dist[0], &dist[1], &dist[2], &flags);
+		break;
+	}
+
+	mi = (CSimpleModelInfo*) CModelInfo::GetModelInfo(id);
+	if (
+#ifdef FIX_BUGS
+		mi &&
+#endif
+	    mi->GetModelType() == MITYPE_SIMPLE && !strcmp(mi->GetModelName(), model) && mi->m_numAtomics == numObjs) {
+		mi->SetLodDistances(dist);
+		SetModelInfoFlags(mi, flags);
+	} else {
+		printf("Can't reload %s\n", model);
+	}
+}
+
+// unused mobile function - crashes
+void
+CFileLoader::ReLoadScene(const char *filename)
+{
+	char *line;
+	CFileMgr::ChangeDir("\\DATA\\");
+	int fd = CFileMgr::OpenFile(filename, "r");
+	assert(fd > 0);
+	CFileMgr::ChangeDir("\\");
+
+	for (line = CFileLoader::LoadLine(fd); line; line = CFileLoader::LoadLine(fd)) {
+		if (*line == '#')
+			continue;
+
+		if (strncmp(line, "EXIT", 4) == 0)
+			break;
+
+		if (strncmp(line, "IDE", 3) == 0) {
+			LoadObjectTypes(line + 4);
+		}
+	}
+	CFileMgr::CloseFile(fd);
+}
diff --git a/src/core/FileLoader.h b/src/core/FileLoader.h
new file mode 100644
index 0000000..077e7bd
--- /dev/null
+++ b/src/core/FileLoader.h
@@ -0,0 +1,48 @@
+#pragma once
+
+class CFileLoader
+{
+	static char ms_line[256];
+public:
+	static void LoadLevel(const char *filename);
+	static char *LoadLine(int fd);
+	static RwTexDictionary *LoadTexDictionary(const char *filename);
+	static void LoadCollisionFile(const char *filename, uint8 colSlot);
+	static bool LoadCollisionFileFirstTime(uint8 *buffer, uint32 size, uint8 colSlot);
+	static bool LoadCollisionFile(uint8 *buffer, uint32 size, uint8 colSlot);
+	static void LoadCollisionModel(uint8 *buf, struct CColModel &model, char *name);
+	static void LoadModelFile(const char *filename);
+	static RpAtomic *FindRelatedModelInfoCB(RpAtomic *atomic, void *data);
+	static void LoadClumpFile(const char *filename);
+	static bool LoadClumpFile(RwStream *stream, uint32 id);
+	static bool StartLoadClumpFile(RwStream *stream, uint32 id);
+	static bool FinishLoadClumpFile(RwStream *stream, uint32 id);
+	static bool LoadAtomicFile(RwStream *stream, uint32 id);
+	static RpAtomic *SetRelatedModelInfoCB(RpAtomic *atomic, void *data);
+	static RpClump *LoadAtomicFile2Return(const char *filename);
+	static void AddTexDictionaries(RwTexDictionary *dst, RwTexDictionary *src);
+
+	static void LoadObjectTypes(const char *filename);
+	static int LoadObject(const char *line);
+	static int LoadTimeObject(const char *line);
+	static int LoadWeaponObject(const char *line);
+	static void LoadClumpObject(const char *line);
+	static void LoadVehicleObject(const char *line);
+	static void LoadPedObject(const char *line);
+	static int LoadPathHeader(const char *line, int &type);
+	static void LoadPedPathNode(const char *line, int id, int node);
+	static void LoadCarPathNode(const char *line, int id, int node, bool waterPath);
+	static void Load2dEffect(const char *line);
+
+	static void LoadScene(const char *filename);
+	static void LoadObjectInstance(const char *line);
+	static void LoadZone(const char *line);
+	static void LoadCullZone(const char *line);
+	static void LoadPickup(const char *line);
+	static void LoadOcclusionVolume(const char *line);
+
+	static void ReloadPaths(const char *filename);
+	static void ReloadObjectTypes(const char *filename);
+	static void ReloadObject(const char *line);
+	static void ReLoadScene(const char *filename); // unused mobile function
+};
diff --git a/src/core/FileMgr.cpp b/src/core/FileMgr.cpp
new file mode 100644
index 0000000..32aa404
--- /dev/null
+++ b/src/core/FileMgr.cpp
@@ -0,0 +1,313 @@
+#define _CRT_SECURE_NO_WARNINGS
+#include <fcntl.h>
+#ifdef _WIN32
+#include <direct.h>
+#endif
+#include "common.h"
+#include "crossplatform.h"
+
+#include "FileMgr.h"
+
+const char *_psGetUserFilesFolder();
+
+/*
+ * Windows FILE is BROKEN for GTA.
+ *
+ * We need to support mapping between LF and CRLF for text files
+ * but we do NOT want to end the file at the first sight of a SUB character.
+ * So here is a simple implementation of a FILE interface that works like GTA expects.
+ */
+
+struct myFILE
+{
+	bool isText;
+	FILE *file;
+};
+
+#define NUMFILES 20
+static myFILE myfiles[NUMFILES];
+
+
+#if !defined(_WIN32)
+#include <dirent.h>
+#include <errno.h>
+#include <unistd.h>
+#define _getcwd getcwd
+
+// Case-insensitivity on linux (from https://github.com/OneSadCookie/fcaseopen)
+void mychdir(char const *path)
+{
+	char* r = casepath(path, false);
+    if (r) {
+        chdir(r);
+		free(r);
+    } else {
+        errno = ENOENT;
+    }
+}
+#else
+#define mychdir chdir
+#endif
+
+/* Force file to open as binary but remember if it was text mode */
+static int
+myfopen(const char *filename, const char *mode)
+{
+	int fd;
+	char realmode[10], *p;
+
+	for(fd = 1; fd < NUMFILES; fd++)
+		if(myfiles[fd].file == nil)
+			goto found;
+	return 0;	// no free fd
+found:
+	myfiles[fd].isText = strchr(mode, 'b') == nil;
+	p = realmode;
+	while(*mode)
+		if(*mode != 't' && *mode != 'b')
+			*p++ = *mode++;
+		else
+			mode++;
+	*p++ = 'b';
+	*p = '\0';
+	
+	myfiles[fd].file = fcaseopen(filename, realmode);
+	if(myfiles[fd].file == nil)
+		return 0;
+	return fd;
+}
+
+static int
+myfclose(int fd)
+{
+	int ret;
+	assert(fd < NUMFILES);
+	if(myfiles[fd].file){
+		ret = fclose(myfiles[fd].file);
+		myfiles[fd].file = nil;
+		return ret;
+	}
+	return EOF;
+}
+
+static int
+myfgetc(int fd)
+{
+	int c;
+	c = fgetc(myfiles[fd].file);
+	if(myfiles[fd].isText && c == 015){
+		/* translate CRLF to LF */
+		c = fgetc(myfiles[fd].file);
+		if(c == 012)
+			return c;
+		ungetc(c, myfiles[fd].file);
+		return 015;
+	}
+	return c;
+}
+
+static int
+myfputc(int c, int fd)
+{
+	/* translate LF to CRLF */
+	if(myfiles[fd].isText && c == 012)
+		fputc(015, myfiles[fd].file);
+	return fputc(c, myfiles[fd].file);
+}
+
+static char*
+myfgets(char *buf, int len, int fd)
+{
+	int c;
+	char *p;
+
+	p = buf;
+	len--;	// NUL byte
+	while(len--){
+		c = myfgetc(fd);
+		if(c == EOF){
+			if(p == buf)
+				return nil;
+			break;
+		}
+		*p++ = c;
+		if(c == '\n')
+			break;
+	}
+	*p = '\0';
+	return buf;
+}
+
+static size_t
+myfread(void *buf, size_t elt, size_t n, int fd)
+{
+	if(myfiles[fd].isText){
+		unsigned char *p;
+		size_t i;
+		int c;
+
+		n *= elt;
+		p = (unsigned char*)buf;
+		for(i = 0; i < n; i++){
+			c = myfgetc(fd);
+			if(c == EOF)
+				break;
+			*p++ = (unsigned char)c;
+		}
+		return i / elt;
+	}
+	return fread(buf, elt, n, myfiles[fd].file);
+}
+
+static size_t
+myfwrite(void *buf, size_t elt, size_t n, int fd)
+{
+	if(myfiles[fd].isText){
+		unsigned char *p;
+		size_t i;
+		int c;
+
+		n *= elt;
+		p = (unsigned char*)buf;
+		for(i = 0; i < n; i++){
+			c = *p++;
+			myfputc(c, fd);
+			if(feof(myfiles[fd].file))	// is this right?
+				break;
+		}
+		return i / elt;
+	}
+	return fwrite(buf, elt, n, myfiles[fd].file);
+}
+
+static int
+myfseek(int fd, long offset, int whence)
+{
+	return fseek(myfiles[fd].file, offset, whence);
+}
+
+static int
+myfeof(int fd)
+{
+	return feof(myfiles[fd].file);
+//	return ferror(myfiles[fd].file);
+}
+
+
+char CFileMgr::ms_rootDirName[128] = {'\0'};
+char CFileMgr::ms_dirName[128];
+
+void
+CFileMgr::Initialise(void)
+{
+	_getcwd(ms_rootDirName, 128);
+	strcat(ms_rootDirName, "\\");
+}
+
+void
+CFileMgr::ChangeDir(const char *dir)
+{
+	if(*dir == '\\'){
+		strcpy(ms_dirName, ms_rootDirName);
+		dir++;
+	}
+	if(*dir != '\0'){
+		strcat(ms_dirName, dir);
+		// BUG in the game it seems, it's off by one
+		if(dir[strlen(dir)-1] != '\\')
+			strcat(ms_dirName, "\\");
+	}
+	mychdir(ms_dirName);
+}
+
+void
+CFileMgr::SetDir(const char *dir)
+{
+	strcpy(ms_dirName, ms_rootDirName);
+	if(*dir != '\0'){
+		strcat(ms_dirName, dir);
+		// BUG in the game it seems, it's off by one
+		if(dir[strlen(dir)-1] != '\\')
+			strcat(ms_dirName, "\\");
+	}
+	mychdir(ms_dirName);
+}
+
+void
+CFileMgr::SetDirMyDocuments(void)
+{
+	SetDir("");	// better start at the root if user directory is relative
+	mychdir(_psGetUserFilesFolder());
+}
+
+ssize_t
+CFileMgr::LoadFile(const char *file, uint8 *buf, int maxlen, const char *mode)
+{
+	int fd;
+	ssize_t n, len;
+
+	fd = myfopen(file, mode);
+	if(fd == 0)
+		return -1;
+	len = 0;
+	do{
+		n = myfread(buf + len, 1, 0x4000, fd);
+#ifndef FIX_BUGS
+		if (n < 0)
+			return -1;
+#endif
+		len += n;
+		assert(len < maxlen);
+	}while(n == 0x4000);
+	buf[len] = 0;
+	myfclose(fd);
+	return len;
+}
+
+int
+CFileMgr::OpenFile(const char *file, const char *mode)
+{
+	return myfopen(file, mode);
+}
+
+int
+CFileMgr::OpenFileForWriting(const char *file)
+{
+	return OpenFile(file, "wb");
+}
+
+size_t
+CFileMgr::Read(int fd, const char *buf, ssize_t len)
+{
+	return myfread((void*)buf, 1, len, fd);
+}
+
+size_t
+CFileMgr::Write(int fd, const char *buf, ssize_t len)
+{
+	return myfwrite((void*)buf, 1, len, fd);
+}
+
+bool
+CFileMgr::Seek(int fd, int offset, int whence)
+{
+	return !!myfseek(fd, offset, whence);
+}
+
+bool
+CFileMgr::ReadLine(int fd, char *buf, int len)
+{
+	return myfgets(buf, len, fd) != nil;
+}
+
+int
+CFileMgr::CloseFile(int fd)
+{
+	return myfclose(fd);
+}
+
+int
+CFileMgr::GetErrorReadWrite(int fd)
+{
+	return myfeof(fd);
+}
diff --git a/src/core/FileMgr.h b/src/core/FileMgr.h
new file mode 100644
index 0000000..f70451b
--- /dev/null
+++ b/src/core/FileMgr.h
@@ -0,0 +1,23 @@
+#pragma once
+
+class CFileMgr
+{
+	static char ms_rootDirName[128];
+	static char ms_dirName[128];
+public:
+	static void Initialise(void);
+	static void ChangeDir(const char *dir);
+	static void SetDir(const char *dir);
+	static void SetDirMyDocuments(void);
+	static ssize_t LoadFile(const char *file, uint8 *buf, int maxlen, const char *mode);
+	static int OpenFile(const char *file, const char *mode);
+	static int OpenFile(const char *file) { return OpenFile(file, "rb"); }
+	static int OpenFileForWriting(const char *file);
+	static size_t Read(int fd, const char *buf, ssize_t len);
+	static size_t Write(int fd, const char *buf, ssize_t len);
+	static bool Seek(int fd, int offset, int whence);
+	static bool ReadLine(int fd, char *buf, int len);
+	static int CloseFile(int fd);
+	static int GetErrorReadWrite(int fd);
+	static char *GetRootDirName() { return ms_rootDirName; }
+};
diff --git a/src/core/Fire.cpp b/src/core/Fire.cpp
new file mode 100644
index 0000000..8a6db0d
--- /dev/null
+++ b/src/core/Fire.cpp
@@ -0,0 +1,500 @@
+#include "common.h"
+
+#include "Vector.h"
+#include "PlayerPed.h"
+#include "Entity.h"
+#include "PointLights.h"
+#include "Particle.h"
+#include "Timer.h"
+#include "Vehicle.h"
+#include "Shadows.h"
+#include "Automobile.h"
+#include "World.h"
+#include "General.h"
+#include "EventList.h"
+#include "DamageManager.h"
+#include "Ped.h"
+#include "Fire.h"
+#include "GameLogic.h"
+#include "CarAI.h"
+
+CFireManager gFireManager;
+
+CFire::CFire()
+{
+	m_bIsOngoing = false;
+	m_bIsScriptFire = false;
+	m_bPropagationFlag = true;
+	m_bAudioSet = true;
+	m_vecPos = CVector(0.0f, 0.0f, 0.0f);
+	m_nExtinguishTime = 0;
+	m_nStartTime = 0;
+	m_pEntity = nil;
+	m_pSource = nil;
+	m_fStrength = 0.8f;
+	m_fWaterExtinguishCountdown = 1.0f;
+  	m_bExtinguishedWithWater = false;
+}
+
+CFire::~CFire() {}
+
+void
+CFire::ProcessFire(void)
+{
+	float fDamagePlayer;
+	float fDamagePeds;
+	float fDamageVehicle;
+	int16 nRandNumber;
+	float fGreen;
+	float fRed;
+	CVector lightpos;
+	CVector firePos;
+	CPed *ped = (CPed *)m_pEntity;
+	CVehicle *veh = (CVehicle*)m_pEntity;
+
+	m_fWaterExtinguishCountdown = Min(1.0f, 0.002f * CTimer::GetTimeStep() + m_fWaterExtinguishCountdown);
+
+	if (m_pEntity) {
+		m_vecPos = m_pEntity->GetPosition();
+
+		if (((CPed *)m_pEntity)->IsPed()) {
+			if (ped->m_pFire != this) {
+				Extinguish();
+				return;
+			}
+#if defined GTAVC_JP_PATCH && !defined FIX_BUGS
+			if (m_pEntity == CGameLogic::pShortCutTaxi && CGameLogic::ShortCutState == CGameLogic::SHORTCUT_TRANSITION) {
+				Extinguish();
+				return;
+			}
+#endif
+			if (ped->m_nMoveState != PEDMOVE_RUN)
+				m_vecPos.z -= 1.0f;
+			if (ped->bInVehicle && ped->m_pMyVehicle) {
+				if (ped->m_pMyVehicle->IsCar())
+					ped->m_pMyVehicle->m_fHealth = 75.0f;
+			} else if (m_pEntity == (CPed *)FindPlayerPed()) {
+				fDamagePlayer = 1.2f * CTimer::GetTimeStep();
+
+				((CPlayerPed *)m_pEntity)->InflictDamage(
+					(CPlayerPed *)m_pSource, WEAPONTYPE_FLAMETHROWER,
+						fDamagePlayer, PEDPIECE_TORSO, 0);
+			} else {
+				fDamagePeds = 1.2f * CTimer::GetTimeStep();
+
+				if (((CPlayerPed *)m_pEntity)->InflictDamage(
+					(CPlayerPed *)m_pSource, WEAPONTYPE_FLAMETHROWER,
+					fDamagePeds, PEDPIECE_TORSO, 0)) {
+					m_pEntity->bRenderScorched = true;
+				}
+			}
+		} else if (m_pEntity->IsVehicle()) {
+			if (veh->m_pCarFire != this) {
+				Extinguish();
+				return;
+			}
+#ifdef FIX_BUGS
+			if (m_pEntity == CGameLogic::pShortCutTaxi && CGameLogic::ShortCutState == CGameLogic::SHORTCUT_TRANSITION) {
+				Extinguish();
+				return;
+			}
+#endif
+			if (!m_bIsScriptFire) {
+				fDamageVehicle = 1.2f * CTimer::GetTimeStep();
+				veh->InflictDamage((CVehicle *)m_pSource, WEAPONTYPE_FLAMETHROWER, fDamageVehicle);
+			}
+		}
+	}
+	if (!FindPlayerVehicle() &&
+#ifdef FIX_BUGS
+		FindPlayerPed() &&
+#endif
+		!FindPlayerPed()->m_pFire && !(FindPlayerPed()->bFireProof)
+		&& ((FindPlayerPed()->GetPosition() - m_vecPos).MagnitudeSqr() < 2.0f)) {
+		FindPlayerPed()->DoStuffToGoOnFire();
+		gFireManager.StartFire(FindPlayerPed(), m_pSource, 0.8f, 1);
+	}
+	if (CTimer::GetTimeInMilliseconds() > m_nNextTimeToAddFlames) {
+		m_nNextTimeToAddFlames = CTimer::GetTimeInMilliseconds() + (m_fWaterExtinguishCountdown < 0.3f ? 400 : (m_fWaterExtinguishCountdown < 0.7f ? 200 : 80));
+		firePos = m_vecPos;
+
+		if (veh && veh->IsVehicle() && veh->IsCar()) {
+			CVehicleModelInfo *mi = ((CVehicleModelInfo*)CModelInfo::GetModelInfo(veh->GetModelIndex()));
+			CVector ModelInfo = mi->m_positions[CAR_POS_HEADLIGHTS];
+			ModelInfo = m_pEntity->GetMatrix() * ModelInfo;
+
+			firePos.x = ModelInfo.x;
+			firePos.y = ModelInfo.y;
+			firePos.z = ModelInfo.z + 0.15f;
+		}
+
+		CParticle::AddParticle(PARTICLE_CARFLAME, firePos,
+			CVector(0.0f, 0.0f, CGeneral::GetRandomNumberInRange(0.0125f, 0.1f) * m_fStrength),
+				0, m_fStrength, 0, 0, 0, 0);
+
+		CGeneral::GetRandomNumber(); CGeneral::GetRandomNumber(); CGeneral::GetRandomNumber(); /* unsure why these three rands are called */
+
+		CParticle::AddParticle(PARTICLE_CARFLAME_SMOKE, firePos,
+			CVector(0.0f, 0.0f, 0.0f), 0, 0.0f, 0, 0, 0, 0);
+	}
+	if (CTimer::GetTimeInMilliseconds() < m_nExtinguishTime || m_bIsScriptFire) {
+		if (CTimer::GetTimeInMilliseconds() > m_nStartTime)
+			m_nStartTime = CTimer::GetTimeInMilliseconds() + 400;
+
+		nRandNumber = CGeneral::GetRandomNumber() & 127;
+		lightpos.x = m_vecPos.x;
+		lightpos.y = m_vecPos.y;
+		lightpos.z = m_vecPos.z + 5.0f;
+
+		if (!m_pEntity) {
+			CShadows::StoreStaticShadow((uintptr)this, SHADOWTYPE_ADDITIVE, gpShadowExplosionTex, &lightpos, 7.0f, 0.0f, 0.0f, -7.0f, 0, nRandNumber / 2,
+			                            nRandNumber / 2, 0, 10.0f, 1.0f, 40.0f, 0, 0.0f);
+		}
+		fGreen = nRandNumber / 128.f;
+		fRed = nRandNumber / 128.f;
+
+		CPointLights::AddLight(CPointLights::LIGHT_POINT, m_vecPos, CVector(0.0f, 0.0f, 0.0f), 12.0f, fRed, fGreen, 0.0f, 0, 0);
+	} else {
+		Extinguish();
+	}
+}
+
+void
+CFire::ReportThisFire(void)
+{
+	gFireManager.m_nTotalFires++;
+	CEventList::RegisterEvent(EVENT_FIRE, m_vecPos, 1000);
+}
+
+void
+CFire::Extinguish(void)
+{
+	if (m_bIsOngoing) {
+		if (!m_bIsScriptFire)
+			gFireManager.m_nTotalFires--;
+
+		m_nExtinguishTime = 0;
+		m_bIsOngoing = false;
+		m_bExtinguishedWithWater = false;
+
+		if (m_pEntity) {
+			if (m_pEntity->IsPed()) {
+				CPed *ped = (CPed*)m_pEntity;
+				if (ped->CanSetPedState()) {
+					if (ped->m_nPedState != PED_DRIVING && ped->m_nPedState != PED_FALL) {
+						if (ped->IsPlayer()) {
+							ped->SetIdle();
+						} else {
+							ped->m_nLastPedState = PED_NONE;
+							ped->SetWanderPath(0);
+							ped->SetWaitState(WAITSTATE_FINISH_FLEE, 0);
+						}
+					}
+				}
+				ped->m_pFire = nil;
+			} else if (m_pEntity->IsVehicle()) {
+				((CVehicle *)m_pEntity)->m_pCarFire = nil;
+			}
+			m_pEntity = nil;
+		}
+	}
+}
+
+void
+CFireManager::StartFire(CVector pos, float size, uint8 propagation)
+{
+	CFire *fire = GetNextFreeFire();
+
+	if (fire) {
+		fire->m_bIsOngoing = true;
+		fire->m_bIsScriptFire = false;
+		fire->m_bPropagationFlag = propagation;
+		fire->m_bAudioSet = true;
+		fire->m_vecPos = pos;
+		fire->m_nExtinguishTime = CTimer::GetTimeInMilliseconds() + 10000;
+		fire->m_nStartTime = CTimer::GetTimeInMilliseconds() + 400;
+		fire->m_pEntity = nil;
+		fire->m_pSource = nil;
+		fire->m_nNextTimeToAddFlames = 0;
+		fire->ReportThisFire();
+		fire->m_fStrength = size;
+		fire->m_bExtinguishedWithWater = false;
+	}
+}
+
+CFire *
+CFireManager::StartFire(CEntity *entityOnFire, CEntity *fleeFrom, float strength, uint8 propagation)
+{
+	CPed *ped = (CPed *)entityOnFire;
+	CVehicle *veh = (CVehicle *)entityOnFire;
+
+	if (entityOnFire->IsPed()) {
+		if (ped->m_pFire)
+			return nil;
+		if (!ped->IsPedInControl())
+			return nil;
+	} else if (entityOnFire->IsVehicle()) {
+		if (veh->m_pCarFire)
+			return nil;
+		if (veh->IsCar() &&  ((CAutomobile *)veh)->Damage.GetEngineStatus() >= 225)
+			return nil;
+	}
+	CFire *fire = GetNextFreeFire();
+
+	if (fire) {
+		if (entityOnFire->IsPed()) {
+			ped->m_pFire = fire;
+			if (ped != FindPlayerPed()) {
+				if (fleeFrom) {
+					ped->SetFlee(fleeFrom, 10000);
+				} else {
+					CVector2D pos = entityOnFire->GetPosition();
+					ped->SetFlee(pos, 10000);
+					ped->m_fleeFrom = nil;
+				}
+				ped->m_fleeTimer = CTimer::GetTimeInMilliseconds() + 10000;
+				ped->bDrawLast = false;
+				ped->SetMoveState(PEDMOVE_SPRINT);
+				ped->SetMoveAnim();
+				ped->SetPedState(PED_ON_FIRE);
+			}
+			if (fleeFrom) {
+				if (ped->m_nPedType == PEDTYPE_COP) {
+					CEventList::RegisterEvent(EVENT_COP_SET_ON_FIRE, EVENT_ENTITY_PED,
+						entityOnFire, (CPed *)fleeFrom, 10000);
+				} else {
+					CEventList::RegisterEvent(EVENT_PED_SET_ON_FIRE, EVENT_ENTITY_PED,
+						entityOnFire, (CPed *)fleeFrom, 10000);
+				}
+			}
+		} else {
+			if (entityOnFire->IsVehicle()) {
+				veh->m_pCarFire = fire;
+				if (CModelInfo::IsBikeModel(veh->GetModelIndex()) || CModelInfo::IsCarModel(veh->GetModelIndex()))
+        				CCarAI::TellOccupantsToFleeCar(veh);
+
+				if (fleeFrom) {
+					CEventList::RegisterEvent(EVENT_CAR_SET_ON_FIRE, EVENT_ENTITY_VEHICLE,
+						entityOnFire, (CPed *)fleeFrom, 10000);
+				}
+			}
+		}
+
+		fire->m_bIsOngoing = true;
+		fire->m_bExtinguishedWithWater = false;
+		fire->m_bIsScriptFire = false;
+		fire->m_vecPos = entityOnFire->GetPosition();
+
+		if (entityOnFire && entityOnFire->IsPed() && ped->IsPlayer()) {
+			fire->m_nExtinguishTime = CTimer::GetTimeInMilliseconds() + 3333;
+		} else if (entityOnFire->IsVehicle()) {
+			fire->m_nExtinguishTime = CTimer::GetTimeInMilliseconds() + CGeneral::GetRandomNumberInRange(4000, 5000);
+		} else {
+			fire->m_nExtinguishTime = CTimer::GetTimeInMilliseconds() + CGeneral::GetRandomNumberInRange(10000, 11000);
+		}
+		fire->m_nStartTime = CTimer::GetTimeInMilliseconds() + 400;
+		fire->m_pEntity = entityOnFire;
+
+		entityOnFire->RegisterReference(&fire->m_pEntity);
+		fire->m_pSource = fleeFrom;
+
+		if (fleeFrom)
+			fleeFrom->RegisterReference(&fire->m_pSource);
+		fire->ReportThisFire();
+		fire->m_nNextTimeToAddFlames = 0;
+		fire->m_fStrength = strength;
+		fire->m_bPropagationFlag = propagation;
+		fire->m_bAudioSet = true;
+	}
+	return fire;
+}
+
+void
+CFireManager::Update(void)
+{
+	for (int i = 0; i < NUM_FIRES; i++) {
+		if (m_aFires[i].m_bIsOngoing)
+			m_aFires[i].ProcessFire();
+	}
+}
+
+CFire* CFireManager::FindNearestFire(CVector vecPos, float *pDistance)
+{
+	int fireId = -1;
+	float minDistance = 999999;
+	for (int j = 0; j < NUM_FIRES; j++) {
+		if (!m_aFires[j].m_bIsOngoing)
+			continue;
+		if (m_aFires[j].m_bIsScriptFire)
+			continue;
+		float distance = (m_aFires[j].m_vecPos - vecPos).Magnitude2D();
+		if (distance < minDistance) {
+			minDistance = distance;
+			fireId = j;
+		}
+	}
+	*pDistance = minDistance;
+	if (fireId != -1)
+		return &m_aFires[fireId];
+
+	return nil;
+}
+
+CFire *
+CFireManager::FindFurthestFire_NeverMindFireMen(CVector coords, float minRange, float maxRange)
+{
+	int furthestFire = -1;
+	float lastFireDist = 0.0f;
+	float fireDist;
+
+	for (int i = 0; i < NUM_FIRES; i++) {
+		if (m_aFires[i].m_bIsOngoing && !m_aFires[i].m_bIsScriptFire) {
+			fireDist = (m_aFires[i].m_vecPos - coords).Magnitude2D();
+			if (fireDist > minRange && fireDist < maxRange && fireDist > lastFireDist) {
+				lastFireDist = fireDist;
+				furthestFire = i;
+			}
+		}
+	}
+	if (furthestFire == -1)
+		return nil;
+	else
+		return &m_aFires[furthestFire];
+}
+
+CFire *
+CFireManager::GetNextFreeFire(void)
+{
+	for (int i = 0; i < NUM_FIRES; i++) {
+		if (!m_aFires[i].m_bIsOngoing && !m_aFires[i].m_bIsScriptFire)
+			return &m_aFires[i];
+	}
+	return nil;
+}
+
+uint32
+CFireManager::GetTotalActiveFires(void) const
+{
+	return m_nTotalFires;
+}
+
+void
+CFireManager::ExtinguishPoint(CVector point, float range)
+{
+	for (int i = 0; i < NUM_FIRES; i++) {
+		if (m_aFires[i].m_bIsOngoing) {
+			if ((point - m_aFires[i].m_vecPos).MagnitudeSqr() < sq(range))
+				m_aFires[i].Extinguish();
+		}
+	}
+}
+
+bool
+CFireManager::ExtinguishPointWithWater(CVector point, float range)
+{
+    int i;
+    for (i = 0; i < NUM_FIRES;) {
+        if (m_aFires[i].m_bIsOngoing && (point - m_aFires[i].m_vecPos).MagnitudeSqr() < sq(range)) {
+                break;
+        }
+        if (++i >= NUM_FIRES)
+          return false;
+    }
+    
+	CFire *fireToExtinguish = &m_aFires[i];
+	fireToExtinguish->m_fWaterExtinguishCountdown -= 0.012f * CTimer::GetTimeStep();
+	CVector steamPos = fireToExtinguish->m_vecPos +
+		CVector((CGeneral::GetRandomNumber() - 128) * 3.1f / 200.f,
+			(CGeneral::GetRandomNumber() - 128) * 3.1f / 200.f,
+			CGeneral::GetRandomNumber() / 200.f);
+
+	CParticle::AddParticle(PARTICLE_STEAM_NY_SLOWMOTION, steamPos, CVector(0.f, 0.f, 0.2f), nil, 0.5f);
+	CParticle::AddParticle(PARTICLE_STEAM_NY_SLOWMOTION, steamPos, CVector(0.f, 0.f, 0.1f), nil, 0.8f);
+	fireToExtinguish->m_bExtinguishedWithWater = true;
+	if (fireToExtinguish->m_fWaterExtinguishCountdown < 0.0f )
+	  fireToExtinguish->Extinguish();
+
+	return true;
+}
+
+int32
+CFireManager::StartScriptFire(const CVector &pos, CEntity *target, float strength, uint8 propagation)
+{
+	CFire *fire;
+	CPed *ped = (CPed *)target;
+	CVehicle *veh = (CVehicle *)target;
+
+	if (target) {
+		if (target->IsPed()) {
+			if (ped->m_pFire)
+				ped->m_pFire->Extinguish();
+		} else if (target->IsVehicle()) {
+			if (veh->m_pCarFire)
+				veh->m_pCarFire->Extinguish();
+			if (veh->IsCar() && ((CAutomobile *)veh)->Damage.GetEngineStatus() >= 225) {
+				((CAutomobile *)veh)->Damage.SetEngineStatus(215);
+			}
+		}
+	}
+
+	fire = GetNextFreeFire();
+	fire->m_bIsOngoing = true;
+	fire->m_bIsScriptFire = true;
+	fire->m_bPropagationFlag = propagation;
+	fire->m_bAudioSet = true;
+	fire->m_vecPos = pos;
+	fire->m_nStartTime = CTimer::GetTimeInMilliseconds() + 400;
+	fire->m_pEntity = target;
+	fire->m_bExtinguishedWithWater = false;
+
+	if (target)
+		target->RegisterReference(&fire->m_pEntity);
+	fire->m_pSource = nil;
+	fire->m_nNextTimeToAddFlames = 0;
+	fire->m_fStrength = strength;
+	fire->m_fWaterExtinguishCountdown = 1.0f;
+
+	if (target) {
+		if (target->IsPed()) {
+			ped->m_pFire = fire;
+			if (target != (CVehicle *)FindPlayerPed()) {
+				CVector2D pos = target->GetPosition();
+				ped->SetFlee(pos, 10000);
+				ped->SetMoveAnim();
+				ped->SetPedState(PED_ON_FIRE);
+			}
+		} else if (target->IsVehicle()) {
+			veh->m_pCarFire = fire;
+		}
+	}
+	return fire - m_aFires;
+}
+
+bool
+CFireManager::IsScriptFireExtinguish(int16 index)
+{
+	return !m_aFires[index].m_bIsOngoing;
+}
+
+void
+CFireManager::RemoveAllScriptFires(void)
+{
+	for (int i = 0; i < NUM_FIRES; i++) {
+		if (m_aFires[i].m_bIsScriptFire) {
+			RemoveScriptFire(i);
+		}
+	}
+}
+
+void
+CFireManager::RemoveScriptFire(int16 index)
+{
+	m_aFires[index].Extinguish();
+	m_aFires[index].m_bIsScriptFire = false;
+}
+
+void
+CFireManager::SetScriptFireAudio(int16 index, bool state)
+{
+	m_aFires[index].m_bAudioSet = state;
+}
diff --git a/src/core/Fire.h b/src/core/Fire.h
new file mode 100644
index 0000000..8126f83
--- /dev/null
+++ b/src/core/Fire.h
@@ -0,0 +1,53 @@
+#pragma once
+
+class CEntity;
+
+class CFire
+{
+public:
+	bool m_bIsOngoing;
+	bool m_bIsScriptFire;
+	bool m_bPropagationFlag;
+	bool m_bAudioSet;
+	CVector m_vecPos;
+	CEntity *m_pEntity;
+	CEntity *m_pSource;
+	uint32 m_nExtinguishTime;
+	uint32 m_nStartTime;
+	uint32 m_nNextTimeToAddFlames;
+	float m_fStrength;
+	float m_fWaterExtinguishCountdown;
+	bool m_bExtinguishedWithWater;
+
+	CFire();
+	~CFire();
+	void ProcessFire(void);
+	void ReportThisFire(void);
+	void Extinguish(void);
+};
+
+class CFireManager
+{
+	enum {
+		MAX_FIREMEN_ATTENDING = 2,
+	};
+public:
+	uint32 m_nTotalFires;
+	CFire m_aFires[NUM_FIRES];
+
+	void StartFire(CVector pos, float size, uint8 propagation);
+	CFire *StartFire(CEntity *entityOnFire, CEntity *fleeFrom, float strength, uint8 propagation);
+	void Update(void);
+	CFire *FindFurthestFire_NeverMindFireMen(CVector coords, float minRange, float maxRange);
+	CFire *FindNearestFire(CVector vecPos, float *pDistance);
+	CFire *GetNextFreeFire(void);
+	uint32 GetTotalActiveFires() const;
+	void ExtinguishPoint(CVector point, float range);
+	bool ExtinguishPointWithWater(CVector point, float range);
+	int32 StartScriptFire(const CVector &pos, CEntity *target, float strength, uint8 propagation);
+	bool IsScriptFireExtinguish(int16 index);
+	void RemoveAllScriptFires(void);
+	void RemoveScriptFire(int16 index);
+	void SetScriptFireAudio(int16 index, bool state);
+};
+extern CFireManager gFireManager;
diff --git a/src/core/FrontEndControls.cpp b/src/core/FrontEndControls.cpp
new file mode 100644
index 0000000..18f6b3b
--- /dev/null
+++ b/src/core/FrontEndControls.cpp
@@ -0,0 +1,1887 @@
+#include "common.h"
+#include "main.h"
+#include "Timer.h"
+#include "Sprite2d.h"
+#include "Text.h"
+#include "Font.h"
+#include "FrontEndControls.h"
+
+#define X SCREEN_SCALE_X
+#define Y(x) SCREEN_SCALE_Y(float(x)*(float(DEFAULT_SCREEN_HEIGHT)/float(SCREEN_HEIGHT_PAL)))
+
+void
+CPlaceableShText::Draw(float x, float y)
+{
+	if(m_text == nil)
+		return;
+
+	if(m_bRightJustify)
+		CFont::SetRightJustifyOn();
+	if(m_bDropShadow){
+		CFont::SetDropShadowPosition(m_shadowOffset.x);
+		CFont::SetDropColor(m_shadowColor);
+	}
+	CFont::SetColor(m_color);
+	CFont::PrintString(x+m_position.x, y+m_position.y, m_text);
+	if(m_bDropShadow)
+		CFont::SetDropShadowPosition(0);
+	if(m_bRightJustify)
+		CFont::SetRightJustifyOff();
+}
+
+void
+CPlaceableShText::Draw(const CRGBA &color, float x, float y)
+{
+	if(m_text == nil)
+		return;
+
+	if(m_bRightJustify)
+		CFont::SetRightJustifyOn();
+	if(m_bDropShadow){
+		CFont::SetDropShadowPosition(m_shadowOffset.x);
+		CFont::SetDropColor(m_shadowColor);
+	}
+	CFont::SetColor(color);
+	CFont::PrintString(x+m_position.x, y+m_position.y, m_text);
+	if(m_bDropShadow)
+		CFont::SetDropShadowPosition(0);
+	if(m_bRightJustify)
+		CFont::SetRightJustifyOff();
+}
+
+void
+CPlaceableShTextTwoLines::Draw(float x, float y)
+{
+	if(m_line1.m_text == nil && m_line2.m_text == nil)
+		return;
+
+	if(m_bRightJustify)
+		CFont::SetRightJustifyOn();
+	if(m_bDropShadow){
+		CFont::SetDropShadowPosition(m_shadowOffset.x);
+		CFont::SetDropColor(m_shadowColor);
+	}
+
+	if(m_line1.m_text){
+		CFont::SetColor(m_line1.m_color);
+		CFont::PrintString(x+m_line1.m_position.x, y+m_line1.m_position.y, m_line1.m_text);
+	}
+	if(m_line2.m_text){
+		CFont::SetColor(m_line2.m_color);
+		CFont::PrintString(x+m_line2.m_position.x, y+m_line2.m_position.y, m_line2.m_text);
+	}
+
+	if(m_bDropShadow)
+		CFont::SetDropShadowPosition(0);
+	if(m_bRightJustify)
+		CFont::SetRightJustifyOff();
+}
+
+void
+CPlaceableShTextTwoLines::Draw(const CRGBA &color, float x, float y)
+{
+	if(m_line1.m_text == nil && m_line2.m_text == nil)
+		return;
+
+	if(m_bRightJustify)
+		CFont::SetRightJustifyOn();
+	if(m_bDropShadow){
+		CFont::SetDropShadowPosition(m_shadowOffset.x);
+		CFont::SetDropColor(m_shadowColor);
+	}
+
+	if(m_line1.m_text){
+		CFont::SetColor(color);
+		CFont::PrintString(x+m_line1.m_position.x, y+m_line1.m_position.y, m_line1.m_text);
+	}
+	if(m_line2.m_text){
+		CFont::SetColor(color);
+		CFont::PrintString(x+m_line2.m_position.x, y+m_line2.m_position.y, m_line2.m_text);
+	}
+
+	if(m_bDropShadow)
+		CFont::SetDropShadowPosition(0);
+	if(m_bRightJustify)
+		CFont::SetRightJustifyOff();
+}
+
+void
+CPlaceableShOption::Draw(const CRGBA &highlightColor, float x, float y, bool bHighlight)
+{
+	if(bHighlight)
+		CPlaceableShText::Draw(highlightColor, x, y);
+	else if(m_bSelected)
+		CPlaceableShText::Draw(m_selectedColor, x, y);
+	else
+		CPlaceableShText::Draw(x, y);
+}
+
+void
+CPlaceableShOptionTwoLines::Draw(const CRGBA &highlightColor, float x, float y, bool bHighlight)
+{
+	if(bHighlight)
+		CPlaceableShTextTwoLines::Draw(highlightColor, x, y);
+	else if(m_bSelected)
+		CPlaceableShTextTwoLines::Draw(m_selectedColor, x, y);
+	else
+		CPlaceableShTextTwoLines::Draw(x, y);
+}
+
+void
+CPlaceableSprite::Draw(float x, float y)
+{
+	Draw(m_color, x, y);
+}
+
+void
+CPlaceableSprite::Draw(const CRGBA &color, float x, float y)
+{
+	if(m_pSprite)
+		m_pSprite->Draw(CRect(m_position.x+x, m_position.y+y,
+		                      m_position.x+x + m_size.x, m_position.y+y + m_size.y),
+		                color);
+}
+
+void
+CPlaceableShSprite::Draw(float x, float y)
+{
+	if(m_bDropShadow)
+		m_shadow.Draw(m_shadow.m_color, m_sprite.m_position.x+x, m_sprite.m_position.y+y);
+	m_sprite.Draw(x, y);
+}
+
+
+/*
+ * CMenuPictureAndText
+ */
+
+void
+CMenuPictureAndText::SetNewOldShadowWrapX(bool bWrapX, float newWrapX, float oldWrapX)
+{
+	m_bWrap = bWrapX;
+	m_wrapX = newWrapX;
+	m_oldWrapx = oldWrapX;
+}
+
+void
+CMenuPictureAndText::SetNewOldTextScale(bool bTextScale, const CVector2D &newScale, const CVector2D &oldScale)
+{
+	m_bSetTextScale = bTextScale;
+	m_textScale = newScale;
+	m_oldTextScale = oldScale;
+}
+
+void
+CMenuPictureAndText::SetTextsColor(CRGBA const &color)
+{
+	int i;
+	for(i = 0; i < m_numTexts; i++)
+		m_texts[i].m_color = color;
+}
+
+void
+CMenuPictureAndText::AddText(wchar *text, float positionX, float positionY, CRGBA const &color, bool bRightJustify)
+{
+	int i;
+	if(m_numTexts >= 20)
+		return;
+	i = m_numTexts++;
+	m_texts[i].m_text = text;
+	m_texts[i].m_position.x = positionX;
+	m_texts[i].m_position.y = positionY;
+	m_texts[i].m_color = color;
+	m_texts[i].m_bRightJustify = bRightJustify;
+}
+
+void
+CMenuPictureAndText::AddPicture(CSprite2d *sprite, CSprite2d *shadow, float positionX, float positionY, float width, float height, CRGBA const &color)
+{
+	int i;
+	if(m_numSprites >= 5)
+		return;
+	i = m_numSprites++;
+	m_sprites[i].m_sprite.m_pSprite = sprite;
+	m_sprites[i].m_shadow.m_pSprite = shadow;
+	m_sprites[i].m_sprite.m_position.x = positionX;
+	m_sprites[i].m_sprite.m_position.y = positionY;
+	m_sprites[i].m_sprite.m_size.x = width;
+	m_sprites[i].m_sprite.m_size.y = height;
+	m_sprites[i].m_shadow.m_size.x = width;
+	m_sprites[i].m_shadow.m_size.y = height;
+	m_sprites[i].m_sprite.m_color = color;
+}
+
+void
+CMenuPictureAndText::AddPicture(CSprite2d *sprite, float positionX, float positionY, float width, float height, CRGBA const &color)
+{
+	int i;
+	if(m_numSprites >= 5)
+		return;
+	i = m_numSprites++;
+	m_sprites[i].m_sprite.m_pSprite = sprite;
+	m_sprites[i].m_shadow.m_pSprite = nil;
+	m_sprites[i].m_sprite.m_position.x = positionX;
+	m_sprites[i].m_sprite.m_position.y = positionY;
+	m_sprites[i].m_sprite.m_size.x = width;
+	m_sprites[i].m_sprite.m_size.y = height;
+	m_sprites[i].m_shadow.m_size.x = width;
+	m_sprites[i].m_shadow.m_size.y = height;
+	m_sprites[i].m_sprite.m_color = color;
+}
+
+void
+CMenuPictureAndText::Draw(CRGBA const &,CRGBA const &, float x, float y)
+{
+	int i;
+
+	for(i = 0; i < m_numSprites; i++)
+		m_sprites[i].Draw(m_position.x+x, m_position.y+y);
+
+	if(m_bSetTextScale)
+		CFont::SetScale(m_textScale.x, m_textScale.y);
+	for(i = 0; i < m_numTexts; i++)
+		if(m_bWrap)
+			m_texts[i].DrawShWrap(m_position.x+x, m_position.y+y, m_wrapX, m_oldWrapx);
+		else
+			m_texts[i].Draw(m_position.x+x, m_position.y+y);
+	if(m_bSetTextScale)
+		CFont::SetScale(m_oldTextScale.x, m_oldTextScale.y);
+}
+
+void
+CMenuPictureAndText::SetAlpha(uint8 alpha)
+{
+	int i;
+
+	for(i = 0; i < m_numSprites; i++)
+		m_sprites[i].SetAlpha(alpha);
+	for(i = 0; i < m_numTexts; i++)
+		m_texts[i].SetAlpha(alpha);
+}
+
+void
+CMenuPictureAndText::SetShadows(bool bDropShadows, const CRGBA &shadowColor, const CVector2D &shadowOffset)
+{
+	int i;
+
+	for(i = 0; i < 5; i++)
+		m_sprites[i].SetShadows(bDropShadows, shadowColor, shadowOffset);
+	for(i = 0; i < 20; i++)
+		m_texts[i].SetShadows(bDropShadows, shadowColor, shadowOffset);
+}
+
+/*
+ * CMenuMultiChoice
+ */
+
+void
+CMenuMultiChoice::AddTitle(wchar *text, float positionX, float positionY, bool bRightJustify)
+{
+	m_title.m_text = text;
+	m_title.SetPosition(positionX, positionY, bRightJustify);
+}
+
+CPlaceableShOption*
+CMenuMultiChoice::AddOption(wchar *text, float positionX, float positionY, bool bSelected, bool bRightJustify)
+{
+	if(m_numOptions == NUM_MULTICHOICE_OPTIONS)
+		return nil;
+	m_options[m_numOptions].m_text = text;
+	m_options[m_numOptions].SetPosition(positionX, positionY);
+	m_options[m_numOptions].m_bSelected = bSelected;
+	m_options[m_numOptions].m_bRightJustify = bRightJustify;
+	return &m_options[m_numOptions++];
+}
+
+void
+CMenuMultiChoice::SetColors(const CRGBA &title, const CRGBA &normal, const CRGBA &selected)
+{
+	int i;
+	m_title.SetColor(title);
+	for(i = 0; i < NUM_MULTICHOICE_OPTIONS; i++)
+		m_options[i].SetColors(normal, selected);
+}
+
+void
+CMenuMultiChoice::SetNewOldTextScale(bool bTextScale, const CVector2D &newScale, const CVector2D &oldScale, bool bTitleTextScale)
+{
+	m_bSetTextScale = bTextScale;
+	m_textScale = newScale;
+	m_oldTextScale = oldScale;
+	m_bSetTitleTextScale = bTitleTextScale;
+}
+
+void
+CMenuMultiChoice::Draw(CRGBA const &optionHighlight ,CRGBA const &titleHighlight, float x, float y)
+{
+	int i;
+
+	if(m_bSetTextScale && m_bSetTitleTextScale)
+		CFont::SetScale(m_textScale.x, m_textScale.y);
+	if(m_cursor == -1)
+		m_title.Draw(m_position.x+x, m_position.y+y);
+	else
+		m_title.Draw(titleHighlight, m_position.x+x, m_position.y+y);
+
+	if(m_bSetTextScale)
+		CFont::SetScale(m_textScale.x, m_textScale.y);
+
+	if(m_cursor == -1)
+		for(i = 0; i < m_numOptions; i++)
+			m_options[i].Draw(CRGBA(0,0,0,0), m_position.x+x, m_position.y+y, false);
+	else
+		for(i = 0; i < m_numOptions; i++){
+			if(i == m_cursor)
+				m_options[i].Draw(optionHighlight, m_position.x+x, m_position.y+y);
+			else
+				m_options[i].Draw(CRGBA(0,0,0,0), m_position.x+x, m_position.y+y, false);
+		}
+
+	if(m_bSetTextScale){
+		CFont::DrawFonts();
+		CFont::SetScale(m_oldTextScale.x, m_oldTextScale.y);
+	}
+}
+
+void
+CMenuMultiChoice::DrawNormal(float x, float y)
+{
+	int i;
+
+	if(m_bSetTextScale && m_bSetTitleTextScale)
+		CFont::SetScale(m_textScale.x, m_textScale.y);
+	m_title.Draw(m_position.x+x, m_position.y+y);
+
+	if(m_bSetTextScale)
+		CFont::SetScale(m_textScale.x, m_textScale.y);
+
+	for(i = 0; i < m_numOptions; i++)
+		m_options[i].Draw(CRGBA(0,0,0,0), m_position.x+x, m_position.y+y, false);
+
+	if(m_bSetTextScale){
+		CFont::DrawFonts();
+		CFont::SetScale(m_oldTextScale.x, m_oldTextScale.y);
+	}
+}
+
+void
+CMenuMultiChoice::DrawHighlighted(CRGBA const &titleHighlight, float x, float y)
+{
+	int i;
+
+	if(m_bSetTextScale && m_bSetTitleTextScale)
+		CFont::SetScale(m_textScale.x, m_textScale.y);
+	if(m_cursor == -1)
+		m_title.Draw(m_position.x+x, m_position.y+y);
+	else
+		m_title.Draw(titleHighlight, m_position.x+x, m_position.y+y);
+
+	if(m_bSetTextScale)
+		CFont::SetScale(m_textScale.x, m_textScale.y);
+
+	for(i = 0; i < m_numOptions; i++)
+		m_options[i].Draw(CRGBA(0,0,0,0), m_position.x+x, m_position.y+y, false);
+
+	if(m_bSetTextScale){
+		CFont::DrawFonts();
+		CFont::SetScale(m_oldTextScale.x, m_oldTextScale.y);
+	}
+}
+
+void
+CMenuMultiChoice::SetAlpha(uint8 alpha)
+{
+	int i;
+	m_title.SetAlpha(alpha);
+	for(i = 0; i < NUM_MULTICHOICE_OPTIONS; i++)
+		m_options[i].SetAlpha(alpha);
+}
+
+void
+CMenuMultiChoice::SetShadows(bool bDropShadows, CRGBA const &shadowColor, CVector2D const &shadowOffset)
+{
+	int i;
+	m_title.SetShadows(bDropShadows, shadowColor, shadowOffset);
+	for(i = 0; i < NUM_MULTICHOICE_OPTIONS; i++)
+		m_options[i].SetShadows(bDropShadows, shadowColor, shadowOffset);
+}
+
+
+bool
+CMenuMultiChoice::GoNext(void)
+{
+	if(m_cursor == m_numOptions-1){
+		m_cursor = -1;
+		return false;
+	}else{
+		m_cursor++;
+		return true;
+	}
+}
+
+bool
+CMenuMultiChoice::GoPrev(void)
+{
+	if(m_cursor == 0){
+		m_cursor = -1;
+		return false;
+	}else{
+		m_cursor--;
+		return true;
+	}
+}
+
+void
+CMenuMultiChoice::SelectCurrentOptionUnderCursor(void)
+{
+	int i;
+	if(m_cursor == -1)
+		return;
+	for(i = 0; i < NUM_MULTICHOICE_OPTIONS; i++)
+		m_options[i].m_bSelected = false;
+	m_options[m_cursor].m_bSelected = true;
+}
+
+int
+CMenuMultiChoice::GetMenuSelection(void)
+{
+	int i;
+	for(i = 0; i < NUM_MULTICHOICE_OPTIONS; i++)
+		if(m_options[i].m_bSelected)
+			return i;
+	return -1;
+}
+
+void
+CMenuMultiChoice::SetMenuSelection(int selection)
+{
+	int i;
+	for(i = 0; i < NUM_MULTICHOICE_OPTIONS; i++)
+		m_options[i].m_bSelected = false;
+	m_options[selection%NUM_MULTICHOICE_OPTIONS].m_bSelected = true;
+}
+
+/*
+ * CMenuMultiChoiceTriggered
+ */
+
+void
+CMenuMultiChoiceTriggered::Initialise(void)
+{
+	int i;
+	for(i = 0; i < NUM_MULTICHOICE_OPTIONS; i++)
+		m_triggers[i] = nil;
+	m_defaultCancel = nil;
+}
+
+CPlaceableShOption*
+CMenuMultiChoiceTriggered::AddOption(wchar *text, float positionX, float positionY, Trigger trigger, bool bSelected, bool bRightJustify)
+{
+	CPlaceableShOption *option;
+	option = CMenuMultiChoice::AddOption(text, positionX, positionY, bSelected, bRightJustify);
+	if(option)
+		m_triggers[m_numOptions-1] = trigger;
+	return option;
+}
+
+void
+CMenuMultiChoiceTriggered::SelectCurrentOptionUnderCursor(void)
+{
+	CMenuMultiChoice::SelectCurrentOptionUnderCursor();
+	if(m_cursor != -1 && m_triggers[m_cursor] != nil )
+		m_triggers[m_cursor](this);
+}
+
+void
+CMenuMultiChoiceTriggered::SelectDefaultCancelAction(void)
+{
+	if(m_defaultCancel)
+		m_defaultCancel(this);
+}
+
+/*
+ * CMenuMultiChoiceTriggeredAlways
+ */
+
+void
+CMenuMultiChoiceTriggeredAlways::Draw(CRGBA const &optionHighlight, CRGBA const &titleHighlight, float x, float y)
+{
+	if(m_alwaysTrigger)
+		m_alwaysTrigger(this);
+	CMenuMultiChoiceTriggered::Draw(optionHighlight, titleHighlight, x, y);
+}
+
+void
+CMenuMultiChoiceTriggeredAlways::DrawNormal(float x, float y)
+{
+	if(m_alwaysNormalTrigger)
+		m_alwaysNormalTrigger(this);
+	CMenuMultiChoiceTriggered::DrawNormal(x, y);
+}
+
+void
+CMenuMultiChoiceTriggeredAlways::DrawHighlighted(CRGBA const &titleHighlight, float x, float y)
+{
+	if(m_alwaysHighlightTrigger)
+		m_alwaysHighlightTrigger(this);
+	CMenuMultiChoiceTriggered::DrawHighlighted(titleHighlight, x, y);
+}
+
+/*
+ * CMenuMultiChoicePictured
+ */
+
+void
+CMenuMultiChoicePictured::Initialise(void)
+{
+	int i;
+	for(i = 0; i < NUM_MULTICHOICE_OPTIONS; i++)
+		m_bHasSprite[i] = false;
+	for(i = 0; i < NUM_MULTICHOICE_OPTIONS; i++)
+		m_sprites[i].m_pSprite = nil;
+}
+
+CPlaceableShOption*
+CMenuMultiChoicePictured::AddOption(CSprite2d *sprite, float positionX, float positionY, const CVector2D &size, bool bSelected)
+{
+	CPlaceableShOption *option;
+	option = CMenuMultiChoice::AddOption(nil, 0.0f, 0.0f, bSelected, false);
+	if(option){
+		m_sprites[m_numOptions-1].m_pSprite = sprite;
+		m_sprites[m_numOptions-1].SetPosition(positionX, positionY);
+		m_sprites[m_numOptions-1].m_size = size;
+		m_bHasSprite[m_numOptions-1] = true;
+	}
+	return option;
+}
+
+void
+CMenuMultiChoicePictured::Draw(const CRGBA &optionHighlight, const CRGBA &titleHighlight, float x, float y)
+{
+	int i;
+
+	// The title and all the text
+	CMenuMultiChoice::Draw(optionHighlight, titleHighlight, x, y);
+
+	CRGBA selectedColor = m_options[0].GetSelectedColor();
+	CRGBA color = m_options[0].GetColor();
+
+	// The sprites
+	if(m_cursor == -1){
+		for(i = 0; i < m_numOptions; i++)
+			if(m_bHasSprite[i]){
+				if(m_options[i].m_bSelected)
+					m_sprites[i].Draw(selectedColor, m_position.x+x, m_position.y+y);
+				else
+					m_sprites[i].Draw(color, m_position.x+x, m_position.y+y);
+			}
+	}else{
+		for(i = 0; i < m_numOptions; i++)
+			if(i == m_cursor){
+				if(m_bHasSprite[i])
+				{
+					uint8 color = Max(Max(optionHighlight.r, optionHighlight.g), optionHighlight.b);
+					m_sprites[i].Draw(CRGBA(color, color, color, optionHighlight.a), m_position.x+x, m_position.y+y);
+				}
+			}else{
+				if(m_bHasSprite[i]){
+					if(m_options[i].m_bSelected)
+						m_sprites[i].Draw(selectedColor, m_position.x+x, m_position.y+y);
+					else
+						m_sprites[i].Draw(color, m_position.x+x, m_position.y+y);
+				}
+			}
+	}
+}
+
+void
+CMenuMultiChoicePictured::DrawNormal(float x, float y)
+{
+	int i;
+
+	// The title and all the text
+	CMenuMultiChoice::DrawNormal(x, y);
+
+	CRGBA selectedColor = m_options[0].GetSelectedColor();
+	CRGBA color = m_options[0].GetColor();
+
+	// The sprites
+	for(i = 0; i < m_numOptions; i++)
+		if(m_bHasSprite[i]){
+			if(m_options[i].m_bSelected)
+				m_sprites[i].Draw(selectedColor, m_position.x+x, m_position.y+y);
+			else
+				m_sprites[i].Draw(color, m_position.x+x, m_position.y+y);
+		}
+}
+
+void
+CMenuMultiChoicePictured::DrawHighlighted(const CRGBA &titleHighlight, float x, float y)
+{
+	int i;
+
+	// The title and all the text
+	CMenuMultiChoice::DrawHighlighted(titleHighlight, x, y);
+
+	CRGBA selectedColor = m_options[0].GetSelectedColor();
+	CRGBA color = m_options[0].GetColor();
+
+	// The sprites
+	for(i = 0; i < m_numOptions; i++)
+		if(m_bHasSprite[i]){
+			if(m_options[i].m_bSelected)
+				m_sprites[i].Draw(selectedColor, m_position.x+x, m_position.y+y);
+			else
+				m_sprites[i].Draw(color, m_position.x+x, m_position.y+y);
+		}
+}
+
+void
+CMenuMultiChoicePictured::SetAlpha(uint8 alpha)
+{
+	int i;
+	CMenuMultiChoice::SetAlpha(alpha);
+	for(i = 0; i < NUM_MULTICHOICE_OPTIONS; i++)
+		m_sprites[i].SetAlpha(alpha);
+
+}
+
+
+/*
+ * CMenuMultiChoicePicturedTriggered
+ */
+
+void
+CMenuMultiChoicePicturedTriggered::Initialise(void)
+{
+	int i;
+	for(i = 0; i < NUM_MULTICHOICE_OPTIONS; i++)
+		m_triggers[i] = nil;
+	m_defaultCancel = nil;	// missing on PS2
+}
+
+CPlaceableShOption*
+CMenuMultiChoicePicturedTriggered::AddOption(CSprite2d *sprite, float positionX, float positionY, const CVector2D &size, Trigger trigger, bool bSelected)
+{
+	CPlaceableShOption *option;
+	option = CMenuMultiChoicePictured::AddOption(sprite, positionX, positionY, size, bSelected);
+	if(option)
+		m_triggers[m_numOptions-1] = trigger;
+	return option;
+}
+
+void
+CMenuMultiChoicePicturedTriggered::SelectCurrentOptionUnderCursor(void)
+{
+	CMenuMultiChoice::SelectCurrentOptionUnderCursor();
+	if(m_cursor != -1)
+		m_triggers[m_cursor](this);
+}
+
+void
+CMenuMultiChoicePicturedTriggered::SelectDefaultCancelAction(void)
+{
+	if(m_defaultCancel)
+		m_defaultCancel(this);
+}
+
+/*
+ * CMenuMultiChoicePicturedTriggeredAnyMove
+ */
+
+void
+CMenuMultiChoicePicturedTriggeredAnyMove::Initialise(void)
+{
+	int i;
+	CMenuMultiChoicePicturedTriggered::Initialise();
+	for(i = 0; i < NUM_MULTICHOICE_OPTIONS; i++){
+		m_moveTab[i].right = -1;
+		m_moveTab[i].left = -1;
+		m_moveTab[i].down = -1;
+		m_moveTab[i].up = -1;
+	}
+}
+
+CPlaceableShOption*
+CMenuMultiChoicePicturedTriggeredAnyMove::AddOption(CSprite2d *sprite, FEC_MOVETAB *moveTab, float positionX, float positionY, const CVector2D &size, Trigger trigger, bool bSelected)
+{
+	CPlaceableShOption *option;
+	option = CMenuMultiChoicePicturedTriggered::AddOption(sprite, positionX, positionY, size, trigger, bSelected);
+	if(option && moveTab)
+		m_moveTab[m_numOptions-1] = *moveTab;
+	return option;
+}
+
+bool
+CMenuMultiChoicePicturedTriggeredAnyMove::GoDown(void)
+{
+	int move = m_moveTab[m_cursor].down;
+	if(move == -1)
+		return GoNext();
+	m_cursor = move;
+	return true;
+}
+
+bool
+CMenuMultiChoicePicturedTriggeredAnyMove::GoUp(void)
+{
+	int move = m_moveTab[m_cursor].up;
+	if(move == -1)
+		return GoPrev();
+	m_cursor = move;
+	return true;
+}
+
+bool
+CMenuMultiChoicePicturedTriggeredAnyMove::GoLeft(void)
+{
+	int move = m_moveTab[m_cursor].left;
+	if(move == -1)
+		return GoPrev();
+	m_cursor = move;
+	return true;
+}
+
+bool
+CMenuMultiChoicePicturedTriggeredAnyMove::GoRight(void)
+{
+	int move = m_moveTab[m_cursor].right;
+	if(move == -1)
+		return GoNext();
+	m_cursor = move;
+	return true;
+}
+
+
+/*
+ * CMenuMultiChoiceTwoLines
+ */
+
+void
+CMenuMultiChoiceTwoLines::AddTitle(wchar *text, float positionX, float positionY, bool bRightJustify)
+{
+	m_title.m_text = text;
+	m_title.SetPosition(positionX, positionY, bRightJustify);
+}
+
+CPlaceableShOptionTwoLines*
+CMenuMultiChoiceTwoLines::AddOption(wchar *text, float positionX, float positionY, bool bSelected, bool bRightJustify)
+{
+	return AddOption(text, positionX, positionY, nil, 0.0f, 0.0f, bSelected, bRightJustify);
+}
+
+CPlaceableShOptionTwoLines*
+CMenuMultiChoiceTwoLines::AddOption(wchar *text1, float positionX1, float positionY1, wchar *text2, float positionX2, float positionY2, bool bSelected, bool bRightJustify)
+{
+	if(m_numOptions == NUM_MULTICHOICE_OPTIONS)
+		return nil;
+	m_options[m_numOptions].m_line1.m_text = text1;
+	m_options[m_numOptions].m_line2.m_text = text2;
+	m_options[m_numOptions].m_line1.SetPosition(positionX1, positionY1);
+	m_options[m_numOptions].m_line2.SetPosition(positionX2, positionY2);
+	m_options[m_numOptions].m_bSelected = bSelected;
+	m_options[m_numOptions].m_bRightJustify = bRightJustify;
+	return &m_options[m_numOptions++];
+}
+
+
+void
+CMenuMultiChoiceTwoLines::SetColors(const CRGBA &title, const CRGBA &normal, const CRGBA &selected)
+{
+	int i;
+	m_title.SetColor(title);
+	for(i = 0; i < NUM_MULTICHOICE_OPTIONS; i++)
+		m_options[i].SetColors(normal, selected);
+}
+
+void
+CMenuMultiChoiceTwoLines::SetNewOldTextScale(bool bTextScale, const CVector2D &newScale, const CVector2D &oldScale, bool bTitleTextScale)
+{
+	m_bSetTextScale = bTextScale;
+	m_textScale = newScale;
+	m_oldTextScale = oldScale;
+	m_bSetTitleTextScale = bTitleTextScale;
+}
+
+void
+CMenuMultiChoiceTwoLines::Draw(CRGBA const &optionHighlight ,CRGBA const &titleHighlight, float x, float y)
+{
+	int i;
+
+	if(m_bSetTextScale && m_bSetTitleTextScale)
+		CFont::SetScale(m_textScale.x, m_textScale.y);
+	if(m_cursor == -1)
+		m_title.Draw(m_position.x+x, m_position.y+y);
+	else
+		m_title.Draw(titleHighlight, m_position.x+x, m_position.y+y);
+
+	if(m_bSetTextScale)
+		CFont::SetScale(m_textScale.x, m_textScale.y);
+
+	if(m_cursor == -1)
+		for(i = 0; i < m_numOptions; i++)
+			m_options[i].Draw(CRGBA(0,0,0,0), m_position.x+x, m_position.y+y, false);
+	else
+		for(i = 0; i < m_numOptions; i++){
+			if(i == m_cursor)
+				m_options[i].Draw(optionHighlight, m_position.x+x, m_position.y+y);
+			else
+				m_options[i].Draw(CRGBA(0,0,0,0), m_position.x+x, m_position.y+y, false);
+		}
+
+	if(m_bSetTextScale){
+		CFont::DrawFonts();
+		CFont::SetScale(m_oldTextScale.x, m_oldTextScale.y);
+	}
+}
+
+void
+CMenuMultiChoiceTwoLines::DrawNormal(float x, float y)
+{
+	int i;
+
+	if(m_bSetTextScale && m_bSetTitleTextScale)
+		CFont::SetScale(m_textScale.x, m_textScale.y);
+	m_title.Draw(m_position.x+x, m_position.y+y);
+
+	if(m_bSetTextScale)
+		CFont::SetScale(m_textScale.x, m_textScale.y);
+
+	for(i = 0; i < m_numOptions; i++)
+		m_options[i].Draw(CRGBA(0,0,0,0), m_position.x+x, m_position.y+y, false);
+
+	if(m_bSetTextScale){
+		CFont::DrawFonts();
+		CFont::SetScale(m_oldTextScale.x, m_oldTextScale.y);
+	}
+}
+
+void
+CMenuMultiChoiceTwoLines::DrawHighlighted(CRGBA const &titleHighlight, float x, float y)
+{
+	int i;
+
+	if(m_bSetTextScale && m_bSetTitleTextScale)
+		CFont::SetScale(m_textScale.x, m_textScale.y);
+	if(m_cursor == -1)
+		m_title.Draw(m_position.x+x, m_position.y+y);
+	else
+		m_title.Draw(titleHighlight, m_position.x+x, m_position.y+y);
+
+	if(m_bSetTextScale)
+		CFont::SetScale(m_textScale.x, m_textScale.y);
+
+	for(i = 0; i < m_numOptions; i++)
+		m_options[i].Draw(CRGBA(0,0,0,0), m_position.x+x, m_position.y+y, false);
+
+	if(m_bSetTextScale){
+		CFont::DrawFonts();
+		CFont::SetScale(m_oldTextScale.x, m_oldTextScale.y);
+	}
+}
+
+void
+CMenuMultiChoiceTwoLines::SetAlpha(uint8 alpha)
+{
+	int i;
+	m_title.SetAlpha(alpha);
+	for(i = 0; i < NUM_MULTICHOICE_OPTIONS; i++)
+		m_options[i].SetAlpha(alpha);
+}
+
+void
+CMenuMultiChoiceTwoLines::SetShadows(bool bDropShadows, CRGBA const &shadowColor, CVector2D const &shadowOffset)
+{
+	int i;
+	m_title.SetShadows(bDropShadows, shadowColor, shadowOffset);
+	for(i = 0; i < NUM_MULTICHOICE_OPTIONS; i++)
+		m_options[i].SetShadows(bDropShadows, shadowColor, shadowOffset);
+}
+
+
+bool
+CMenuMultiChoiceTwoLines::GoNext(void)
+{
+	if(m_cursor == m_numOptions-1){
+		m_cursor = -1;
+		return false;
+	}else{
+		m_cursor++;
+		return true;
+	}
+}
+
+bool
+CMenuMultiChoiceTwoLines::GoPrev(void)
+{
+	if(m_cursor == 0){
+		m_cursor = -1;
+		return false;
+	}else{
+		m_cursor--;
+		return true;
+	}
+}
+
+void
+CMenuMultiChoiceTwoLines::SelectCurrentOptionUnderCursor(void)
+{
+	int i;
+	if(m_cursor == -1)
+		return;
+	for(i = 0; i < NUM_MULTICHOICE_OPTIONS; i++)
+		m_options[i].m_bSelected = false;
+	m_options[m_cursor].m_bSelected = true;
+}
+
+int
+CMenuMultiChoiceTwoLines::GetMenuSelection(void)
+{
+	int i;
+	for(i = 0; i < NUM_MULTICHOICE_OPTIONS; i++)
+		if(m_options[i].m_bSelected)
+			return i;
+	return -1;
+}
+
+void
+CMenuMultiChoiceTwoLines::SetMenuSelection(int selection)
+{
+	int i;
+	for(i = 0; i < NUM_MULTICHOICE_OPTIONS; i++)
+		m_options[i].m_bSelected = false;
+	m_options[selection%NUM_MULTICHOICE_OPTIONS].m_bSelected = true;
+}
+
+/*
+ * CMenuMultiChoiceTwoLinesTriggered
+ */
+
+void
+CMenuMultiChoiceTwoLinesTriggered::Initialise(void)
+{
+	int i;
+	for(i = 0; i < NUM_MULTICHOICE_OPTIONS; i++)
+		m_triggers[i] = nil;
+	m_defaultCancel = nil;
+}
+
+CPlaceableShOptionTwoLines*
+CMenuMultiChoiceTwoLinesTriggered::AddOption(wchar *text, float positionX, float positionY, Trigger trigger, bool bSelected, bool bRightJustify)
+{
+	CPlaceableShOptionTwoLines *option;
+	option = CMenuMultiChoiceTwoLines::AddOption(text, positionX, positionY, bSelected, bRightJustify);
+	if(option)
+		m_triggers[m_numOptions-1] = trigger;
+	return option;
+}
+
+CPlaceableShOptionTwoLines*
+CMenuMultiChoiceTwoLinesTriggered::AddOption(wchar *text1, float positionX1, float positionY1, wchar *text2, float positionX2, float positionY2, Trigger trigger, bool bSelected, bool bRightJustify)
+{
+	CPlaceableShOptionTwoLines *option;
+	option = CMenuMultiChoiceTwoLines::AddOption(text1, positionX1, positionY1, text2, positionX2, positionY2, bSelected, bRightJustify);
+	if(option)
+		m_triggers[m_numOptions-1] = trigger;
+	return option;
+}
+
+void
+CMenuMultiChoiceTwoLinesTriggered::SelectCurrentOptionUnderCursor(void)
+{
+	CMenuMultiChoiceTwoLines::SelectCurrentOptionUnderCursor();
+	if(m_cursor != -1)
+		m_triggers[m_cursor](this);
+}
+
+void
+CMenuMultiChoiceTwoLinesTriggered::SelectDefaultCancelAction(void)
+{
+	if(m_defaultCancel)
+		m_defaultCancel(this);
+}
+
+
+/*
+ * CMenuOnOff
+ */
+
+void
+CMenuOnOff::SetColors(const CRGBA &title, const CRGBA &options)
+{
+	m_title.SetColors(title, title);
+	m_options[0].SetColor(options);
+	m_options[1].SetColor(options);
+}
+
+void
+CMenuOnOff::SetNewOldTextScale(bool bTextScale, const CVector2D &newScale, const CVector2D &oldScale, bool bTitleTextScale)
+{
+	m_bSetTextScale = bTextScale;
+	m_textScale = newScale;
+	m_oldTextScale = oldScale;
+	m_bSetTitleTextScale = bTitleTextScale;
+}
+
+void
+CMenuOnOff::SetOptionPosition(float x, float y, bool bRightJustify)
+{
+	m_options[0].SetPosition(x, y, bRightJustify);
+	m_options[1].SetPosition(x, y, bRightJustify);
+}
+
+void
+CMenuOnOff::AddTitle(wchar *text, bool bSelected, float positionX, float positionY, bool bRightJustify)
+{
+	m_title.m_text = text;
+	m_title.m_bSelected = bSelected;
+	m_title.SetPosition(positionX, positionY, bRightJustify);
+}
+
+void
+CMenuOnOff::Draw(CRGBA const &optionHighlight, CRGBA const &titleHighlight, float x, float y)
+{
+	if(m_type == 1){
+		m_options[0].m_text = TheText.Get("FEM_NO");
+		m_options[1].m_text = TheText.Get("FEM_YES");
+	}else if(m_type == 0){
+		m_options[0].m_text = TheText.Get("FEM_OFF");
+		m_options[1].m_text = TheText.Get("FEM_ON");
+	}
+
+	if(m_bSetTextScale && m_bSetTitleTextScale)
+		CFont::SetScale(m_textScale.x, m_textScale.y);
+	if(m_bActive)
+		m_title.Draw(titleHighlight, m_position.x+x, m_position.y+y);
+	else
+		m_title.Draw(CRGBA(0,0,0,0), m_position.x+x, m_position.y+y, false);
+
+	if(m_bSetTextScale)
+		CFont::SetScale(m_textScale.x, m_textScale.y);
+
+	if(m_bActive){
+		if(m_title.m_bSelected)
+			m_options[1].Draw(optionHighlight, m_position.x+x, m_position.y+y);
+		else
+			m_options[0].Draw(optionHighlight, m_position.x+x, m_position.y+y);
+	}else{
+		if(m_title.m_bSelected)
+			m_options[1].Draw(m_position.x+x, m_position.y+y);
+		else
+			m_options[0].Draw(m_position.x+x, m_position.y+y);
+	}
+
+	if(m_bSetTextScale)
+		CFont::SetScale(m_oldTextScale.x, m_oldTextScale.y);
+}
+
+void
+CMenuOnOff::DrawNormal(float x, float y)
+{
+	if(m_type == 1){
+		m_options[0].m_text = TheText.Get("FEM_NO");
+		m_options[1].m_text = TheText.Get("FEM_YES");
+	}else if(m_type == 0){
+		m_options[0].m_text = TheText.Get("FEM_OFF");
+		m_options[1].m_text = TheText.Get("FEM_ON");
+	}
+
+	if(m_bSetTextScale && m_bSetTitleTextScale)
+		CFont::SetScale(m_textScale.x, m_textScale.y);
+	m_title.Draw(CRGBA(0,0,0,0), m_position.x+x, m_position.y+y, false);
+
+	if(m_bSetTextScale)
+		CFont::SetScale(m_textScale.x, m_textScale.y);
+
+	if(m_title.m_bSelected)
+		m_options[1].Draw(m_position.x+x, m_position.y+y);
+	else
+		m_options[0].Draw(m_position.x+x, m_position.y+y);
+
+	if(m_bSetTextScale)
+		CFont::SetScale(m_oldTextScale.x, m_oldTextScale.y);
+}
+
+void
+CMenuOnOff::DrawHighlighted(CRGBA const &titleHighlight, float x, float y)
+{
+	if(m_type == 1){
+		m_options[0].m_text = TheText.Get("FEM_NO");
+		m_options[1].m_text = TheText.Get("FEM_YES");
+	}else if(m_type == 0){
+		m_options[0].m_text = TheText.Get("FEM_OFF");
+		m_options[1].m_text = TheText.Get("FEM_ON");
+	}
+
+	if(m_bSetTextScale && m_bSetTitleTextScale)
+		CFont::SetScale(m_textScale.x, m_textScale.y);
+	if(m_bActive)
+		m_title.Draw(titleHighlight, m_position.x+x, m_position.y+y);
+	else
+		m_title.Draw(CRGBA(0,0,0,0), m_position.x+x, m_position.y+y, false);
+
+	if(m_bSetTextScale)
+		CFont::SetScale(m_textScale.x, m_textScale.y);
+
+	if(m_title.m_bSelected)
+		m_options[1].Draw(m_position.x+x, m_position.y+y);
+	else
+		m_options[0].Draw(m_position.x+x, m_position.y+y);
+
+	if(m_bSetTextScale)
+		CFont::SetScale(m_oldTextScale.x, m_oldTextScale.y);
+}
+
+void
+CMenuOnOff::SetAlpha(uint8 alpha)
+{
+	m_title.SetAlpha(alpha);
+	m_options[0].SetAlpha(alpha);
+	m_options[1].SetAlpha(alpha);
+}
+
+void
+CMenuOnOff::SetShadows(bool bDropShadows, CRGBA const &shadowColor, CVector2D const &shadowOffset)
+{
+	m_title.SetShadows(bDropShadows, shadowColor, shadowOffset);
+	m_options[0].SetShadows(bDropShadows, shadowColor, shadowOffset);
+	m_options[1].SetShadows(bDropShadows, shadowColor, shadowOffset);
+}
+
+/*
+ * CMenuOnOffTriggered
+ */
+
+void
+CMenuOnOffTriggered::SetOptionPosition(float x, float y, Trigger trigger, bool bRightJustify)
+{
+	CMenuOnOff::SetOptionPosition(x, y, bRightJustify);
+	if(trigger)
+		m_trigger = trigger;
+}
+
+void
+CMenuOnOffTriggered::SelectCurrentOptionUnderCursor(void)
+{
+	CMenuOnOff::SelectCurrentOptionUnderCursor();
+	if(m_trigger)
+		m_trigger(this);
+}
+
+
+
+/*
+ * CMenuSlider
+ */
+
+char CMenuSlider::Buf8[8];
+wchar CMenuSlider::Buf16[8];
+
+void
+CMenuSlider::SetColors(const CRGBA &title, const CRGBA &percentage, const CRGBA &left, const CRGBA &right)
+{
+	m_title.SetColor(title);
+	m_percentageText.SetColor(percentage);
+	m_colors[0] = left;
+	m_colors[1] = right;
+}
+
+
+void
+CMenuSlider::AddTickBox(float positionX, float positionY, float width, float heightLeft, float heightRight)
+{
+	m_box.SetPosition(positionX, positionY);
+	m_size[0].x = width;
+	m_size[0].y = heightLeft;
+	m_size[1].x = width;
+	m_size[1].y = heightRight;
+}
+
+void
+CMenuSlider::AddTitle(wchar *text, float positionX, float positionY)
+{
+	m_title.m_text = text;
+	m_title.SetPosition(positionX, positionY);
+}
+
+static CRGBA SELECTED_TEXT_COLOR_0(255, 182, 48, 255);
+
+void
+CMenuSlider::Draw(const CRGBA &optionHighlight, const CRGBA &titleHighlight, float x, float y)
+{
+	if(m_bActive){
+		CRGBA selectionCol = m_colors[0];
+		if(optionHighlight.red == SELECTED_TEXT_COLOR_0.red &&
+		   optionHighlight.green == SELECTED_TEXT_COLOR_0.green &&
+		   optionHighlight.blue == SELECTED_TEXT_COLOR_0.blue &&
+		   optionHighlight.alpha == SELECTED_TEXT_COLOR_0.alpha)
+			selectionCol = m_colors[1];
+
+		if(m_style == 1){
+			// solid bar
+			CRGBA shadowCol = m_box.GetShadowColor();
+			float f = m_value/1000.0f;
+			CVector2D boxPos = m_box.m_position + m_position + CVector2D(x,y);
+			if(m_box.m_bDropShadow)
+				CSprite2d::DrawRect(
+					CRect(boxPos.x + X(m_box.m_shadowOffset.x),
+					      boxPos.y + Y(m_box.m_shadowOffset.y),
+					      boxPos.x + X(m_box.m_shadowOffset.x) + m_size[0].x,
+					      boxPos.y + Y(m_box.m_shadowOffset.y) + m_size[0].y),
+					shadowCol);
+			CSprite2d::DrawRect(
+				CRect(boxPos.x, boxPos.y,
+				      boxPos.x + m_size[0].x, boxPos.y + m_size[0].y),
+				m_colors[1]);
+			CSprite2d::DrawRect(
+				CRect(boxPos.x, boxPos.y,
+				      boxPos.x + m_size[0].x*f, boxPos.y + m_size[0].y),
+				selectionCol);
+		}else if(m_style == 0){
+			// ticks...
+			CVector2D boxPos = m_box.m_position + m_position + CVector2D(x,y);
+			DrawTicks(boxPos, m_size[0], m_size[1].y,
+				m_value/1000.0f, m_colors[0], selectionCol, m_colors[1],
+				m_box.m_bDropShadow, m_box.m_shadowOffset, m_box.GetShadowColor());
+		}
+
+		m_title.Draw(titleHighlight, m_position.x+x, m_position.y+y);
+
+		if(m_bDrawPercentage){
+			sprintf(Buf8, "%d%%", m_value/10);
+			AsciiToUnicode(Buf8, Buf16);
+			m_percentageText.m_text = Buf16;
+			m_percentageText.Draw(optionHighlight, m_position.x+x, m_position.y+y);
+		}
+	}else
+		CMenuSlider::DrawNormal(x, y);
+}
+
+void
+CMenuSlider::DrawNormal(float x, float y)
+{
+	if(m_style == 1){
+		// solid bar
+		CRGBA shadowCol = m_box.GetShadowColor();
+		float f = m_value/1000.0f;
+		CVector2D boxPos = m_box.m_position + m_position + CVector2D(x,y);
+		if(m_box.m_bDropShadow)
+			CSprite2d::DrawRect(
+				CRect(boxPos.x + X(m_box.m_shadowOffset.x),
+				      boxPos.y + Y(m_box.m_shadowOffset.y),
+				      boxPos.x + X(m_box.m_shadowOffset.x) + m_size[0].x,
+				      boxPos.y + Y(m_box.m_shadowOffset.y) + m_size[0].y),
+				shadowCol);
+		CSprite2d::DrawRect(
+			CRect(boxPos.x, boxPos.y,
+			      boxPos.x + m_size[0].x, boxPos.y + m_size[0].y),
+			m_colors[1]);
+		CSprite2d::DrawRect(
+			CRect(boxPos.x, boxPos.y,
+			      boxPos.x + m_size[0].x*f, boxPos.y + m_size[0].y),
+			m_colors[0]);
+	}else if(m_style == 0){
+		// ticks...
+		CVector2D boxPos = m_box.m_position + m_position + CVector2D(x,y);
+		DrawTicks(boxPos, m_size[0], m_size[1].y,
+			m_value/1000.0f, m_colors[0], m_colors[1],
+			m_box.m_bDropShadow, m_box.m_shadowOffset, m_box.GetShadowColor());
+	}
+
+	m_title.Draw(m_position.x+x, m_position.y+y);
+
+	if(m_bDrawPercentage){
+		sprintf(Buf8, "%d%%", m_value/10);
+		AsciiToUnicode(Buf8, Buf16);
+		m_percentageText.m_text = Buf16;
+		m_percentageText.Draw(m_percentageText.GetColor(), m_position.x+x, m_position.y+y);
+	}
+}
+
+void
+CMenuSlider::DrawHighlighted(const CRGBA &titleHighlight, float x, float y)
+{
+	if(m_bActive)
+		m_title.Draw(titleHighlight, m_position.x+x, m_position.y+y);
+	else
+		m_title.Draw(m_position.x+x, m_position.y+y);
+
+	if(m_style == 1){
+		// solid bar
+		CRGBA shadowCol = m_box.GetShadowColor();
+		float f = m_value/1000.0f;
+		CVector2D boxPos = m_box.m_position + m_position + CVector2D(x,y);
+		if(m_box.m_bDropShadow)
+			CSprite2d::DrawRect(
+				CRect(boxPos.x + X(m_box.m_shadowOffset.x),
+				      boxPos.y + Y(m_box.m_shadowOffset.y),
+				      boxPos.x + X(m_box.m_shadowOffset.x) + m_size[0].x,
+				      boxPos.y + Y(m_box.m_shadowOffset.y) + m_size[0].y),
+				shadowCol);
+		CSprite2d::DrawRect(
+			CRect(boxPos.x, boxPos.y,
+			      boxPos.x + m_size[0].x, boxPos.y + m_size[0].y),
+			m_colors[1]);
+		CSprite2d::DrawRect(
+			CRect(boxPos.x, boxPos.y,
+			      boxPos.x + m_size[0].x*f, boxPos.y + m_size[0].y),
+			m_colors[0]);
+	}else if(m_style == 0){
+		// ticks...
+		CVector2D boxPos = m_box.m_position + m_position + CVector2D(x,y);
+		DrawTicks(boxPos, m_size[0], m_size[1].y,
+			m_value/1000.0f, m_colors[0], m_colors[1],
+			m_box.m_bDropShadow, m_box.m_shadowOffset, m_box.GetShadowColor());
+	}
+
+	if(m_bDrawPercentage){
+		sprintf(Buf8, "%d%%", m_value/10);
+		AsciiToUnicode(Buf8, Buf16);
+		m_percentageText.m_text = Buf16;
+		m_percentageText.Draw(m_percentageText.GetColor(), m_position.x+x, m_position.y+y);
+	}
+}
+
+void
+CMenuSlider::DrawTicks(const CVector2D &position, const CVector2D &size, float heightRight, float level, const CRGBA &leftCol, const CRGBA &selCol, const CRGBA &rightCol, bool bShadow, const CVector2D &shadowOffset, const CRGBA &shadowColor)
+{
+	int i;
+	int numTicks = size.x / X(8.0f);
+	float dy = heightRight - size.y;
+	float stepy = dy / numTicks;
+	int left = level*numTicks;
+	int drewSelection = 0;
+	for(i = 0; i < numTicks; i++){
+		CRect rect(position.x + X(8.0f)*i, position.y + dy - stepy*i,
+		           position.x + X(8.0f)*i + X(4.0f), position.y + dy + size.y);
+		if(bShadow){
+			CRect shadowRect = rect;
+			shadowRect.left += X(shadowOffset.x);
+			shadowRect.right += X(shadowOffset.x);
+			shadowRect.top += Y(shadowOffset.y);
+			shadowRect.bottom += Y(shadowOffset.y);
+			CSprite2d::DrawRect(shadowRect, shadowColor);
+		}
+		if(i < left)
+			CSprite2d::DrawRect(rect, leftCol);
+		else if(!drewSelection){
+			CSprite2d::DrawRect(rect, selCol);
+			drewSelection = 1;
+		}else
+			CSprite2d::DrawRect(rect, rightCol);
+	}
+}
+
+void
+CMenuSlider::DrawTicks(const CVector2D &position, const CVector2D &size, float heightRight, float level, const CRGBA &leftCol, const CRGBA &rightCol, bool bShadow, const CVector2D &shadowOffset, const CRGBA &shadowColor)
+{
+	int i;
+	int numTicks = size.x / X(8.0f);
+	float dy = heightRight - size.y;
+	float stepy = dy / numTicks;
+	int left = level*numTicks;
+	for(i = 0; i < numTicks; i++){
+		CRect rect(position.x + X(8.0f)*i, position.y + dy - stepy*i,
+		           position.x + X(8.0f)*i + X(4.0f), position.y + dy + size.y);
+		if(bShadow){
+			CRect shadowRect = rect;
+			shadowRect.left += X(shadowOffset.x);
+			shadowRect.right += X(shadowOffset.x);
+			shadowRect.top += Y(shadowOffset.y);
+			shadowRect.bottom += Y(shadowOffset.y);
+			CSprite2d::DrawRect(shadowRect, shadowColor);
+		}
+		if(i < left)
+			CSprite2d::DrawRect(rect, leftCol);
+		else
+			CSprite2d::DrawRect(rect, rightCol);
+	}
+}
+
+void
+CMenuSlider::SetAlpha(uint8 alpha)
+{
+	m_title.SetAlpha(alpha);
+	m_box.SetAlpha(alpha);
+	m_someAlpha = alpha;
+	m_percentageText.SetAlpha(alpha);
+	m_colors[0].alpha = alpha;
+	m_colors[1].alpha = alpha;
+}
+
+void
+CMenuSlider::SetShadows(bool bDropShadows, const CRGBA &shadowColor, const CVector2D &shadowOffset)
+{
+	m_title.SetShadows(bDropShadows, shadowColor, shadowOffset);
+	m_box.SetShadows(bDropShadows, shadowColor, shadowOffset);
+	m_percentageText.SetShadows(bDropShadows, shadowColor, shadowOffset);
+}
+
+/*
+ * CMenuSliderTriggered
+ */
+	
+void
+CMenuSliderTriggered::AddTickBox(float positionX, float positionY, float width, float heightLeft, float heightRight, Trigger trigger, Trigger alwaysTrigger)
+{
+	CMenuSlider::AddTickBox(positionX, positionY, width, heightLeft, heightRight);
+	m_trigger = trigger;
+	m_alwaysTrigger = alwaysTrigger;
+}
+
+void
+CMenuSliderTriggered::Draw(const CRGBA &optionHighlight, const CRGBA &titleHighlight, float x, float y)
+{
+	CMenuSlider::Draw(optionHighlight, titleHighlight, x, y);
+	if(m_alwaysTrigger)
+		m_alwaysTrigger(this);
+}
+
+bool
+CMenuSliderTriggered::GoLeft(void)
+{
+	CMenuSlider::GoLeft();
+	if(m_trigger)
+		m_trigger(this);
+	return true;
+}
+
+bool
+CMenuSliderTriggered::GoRight(void)
+{
+	CMenuSlider::GoRight();
+	if(m_trigger)
+		m_trigger(this);
+	return true;
+}
+
+bool
+CMenuSliderTriggered::GoLeftStill(void)
+{
+	CMenuSlider::GoLeftStill();
+	if(m_trigger)
+		m_trigger(this);
+	return true;
+}
+
+bool
+CMenuSliderTriggered::GoRightStill(void)
+{
+	CMenuSlider::GoRightStill();
+	if(m_trigger)
+		m_trigger(this);
+	return true;
+}
+
+/*
+ * CMenuLineLister
+ */
+
+CMenuLineLister::CMenuLineLister(void)
+ : m_numLines(0), m_width(0.0f), m_height(0.0f),
+   m_scrollPosition(0.0f), m_scrollSpeed(1.0f), m_lineSpacing(15.0f), field_10E8(0)
+{
+	int i;
+	for(i = 0; i < NUM_LINELISTER_LINES_TOTAL; i++){
+		m_lineAlphas[i] = 0;
+		m_lineFade[i] = 0;
+	}
+}
+
+
+void
+CMenuLineLister::SetLinesColor(const CRGBA &color)
+{
+	int i;
+	for(i = 0; i < NUM_LINELISTER_LINES_TOTAL; i++){
+		m_linesLeft[i].SetColor(color);
+		m_linesRight[i].SetColor(color);
+	}
+}
+
+void
+CMenuLineLister::ResetNumberOfTextLines(void)
+{
+	int i;
+	m_numLines = 0;
+	for(i = 0; i < NUM_LINELISTER_LINES_TOTAL; i++){
+		m_lineAlphas[i] = 0;
+		m_lineFade[i] = 0;
+	}
+	for(i = 0; i < NUM_LINELISTER_LINES_TOTAL; i++){
+		// note this doesn't clear lines 0-14, probably an oversight
+		GetLeftLine(i)->m_text = nil;
+		GetRightLine(i)->m_text = nil;
+	}
+}
+
+bool
+CMenuLineLister::AddTextLine(wchar *left, wchar *right)
+{
+	CPlaceableShText *leftLine, *rightLine;
+	if(m_numLines == NUM_LINELISTER_LINES)
+		return false;
+	leftLine = GetLeftLine(m_numLines);
+	leftLine->m_text = left;
+	leftLine->SetPosition(0.0f, m_lineSpacing*(m_numLines+15));
+	rightLine = GetRightLine(m_numLines);
+	rightLine->m_text = right;
+	rightLine->SetPosition(leftLine->m_position.x, leftLine->m_position.y);
+	m_numLines++;
+	return true;
+}
+
+void
+CMenuLineLister::Draw(const CRGBA &optionHighlight, const CRGBA &titleHighlight, float x, float y)
+{
+	int i, n;
+
+	m_scrollPosition += m_scrollSpeed;
+	n = m_numLines + 15;
+	if(m_scrollSpeed > 0.0f){
+		if(m_scrollPosition > n*m_lineSpacing)
+			m_scrollPosition = 0.0f;
+	}else{
+		if(m_scrollPosition < 0.0f)
+			m_scrollPosition = n*m_lineSpacing;
+	}
+	// this is a weird condition....
+	for(i = 0;
+	    m_scrollPosition < i*m_lineSpacing || m_scrollPosition >= (i+1)*m_lineSpacing;
+	    i++);
+
+	float screenPos = 0.0f;
+	for(; i < n; i++){
+		CVector2D linePos = m_linesLeft[i].m_position;
+
+		if(linePos.y+m_position.y - (m_scrollPosition+m_position.y) < Y(64.0f))
+			m_lineFade[i] = -4.0f*Abs(m_scrollSpeed);
+		else
+			m_lineFade[i] = 4.0f*Abs(m_scrollSpeed);
+		int newAlpha = m_lineAlphas[i] + m_lineFade[i];
+		if(newAlpha < 0) newAlpha = 0;
+		if(newAlpha > 255) newAlpha = 255;
+		m_lineAlphas[i] = newAlpha;
+
+		uint8 alpha = m_linesLeft[i].m_shadowColor.alpha;
+
+		// apply alpha
+		m_linesLeft[i].SetAlpha((alpha*m_lineAlphas[i])>>8);
+		m_linesRight[i].SetAlpha((alpha*m_lineAlphas[i])>>8);
+
+		m_linesLeft[i].Draw(m_position.x+x, m_position.y+y - m_scrollPosition);
+		CFont::SetRightJustifyOn();
+		m_linesRight[i].Draw(m_position.x+x + m_width, m_position.y+y - m_scrollPosition);
+		CFont::SetRightJustifyOff();
+
+		// restore alpha
+		m_linesLeft[i].SetAlpha(alpha);
+		m_linesRight[i].SetAlpha(alpha);
+
+		screenPos += m_lineSpacing;
+		if(screenPos >= m_height)
+			break;
+	}
+
+	m_scrollSpeed = 1.0f;
+}
+
+void
+CMenuLineLister::SetAlpha(uint8 alpha)
+{
+	int i;
+	for(i = 0; i < NUM_LINELISTER_LINES_TOTAL; i++){
+		m_linesLeft[i].SetAlpha(alpha);
+		m_linesRight[i].SetAlpha(alpha);
+	}
+}
+
+void
+CMenuLineLister::SetShadows(bool bDropShadows, const CRGBA &shadowColor, const CVector2D &shadowOffset)
+{
+	int i;
+	for(i = 0; i < NUM_LINELISTER_LINES_TOTAL; i++){
+		m_linesLeft[i].SetShadows(bDropShadows, shadowColor, shadowOffset);
+		m_linesRight[i].SetShadows(bDropShadows, shadowColor, shadowOffset);
+	}
+}
+
+
+/*
+ * CMenuPage
+ */
+
+void
+CMenuPage::Initialise(void)
+{
+	int i;
+	m_numControls = 0;
+	m_pCurrentControl = nil;
+	m_cursor = 0;
+	for(i = 0; i < NUM_PAGE_WIDGETS; i++)
+		m_controls[i] = nil;
+}
+
+bool
+CMenuPage::AddMenu(CMenuBase *widget)
+{
+	if(m_numControls >= NUM_PAGE_WIDGETS)
+		return false;
+	m_controls[m_numControls] = widget;
+	if(m_numControls == 0){
+		m_pCurrentControl = widget;
+		m_cursor = 0;
+	}
+	m_numControls++;
+	return true;
+}
+
+bool
+CMenuPage::IsActiveMenuTwoState(void)
+{
+	return m_pCurrentControl && m_pCurrentControl->m_bTwoState;
+}
+
+void
+CMenuPage::ActiveMenuTwoState_SelectNextPosition(void)
+{
+	int sel;
+	if(m_pCurrentControl == nil || !m_pCurrentControl->m_bTwoState)
+		return;
+	m_pCurrentControl->GoFirst();
+	sel = m_pCurrentControl->GetMenuSelection();
+	if(sel == 1)
+		m_pCurrentControl->SelectCurrentOptionUnderCursor();
+	else if(sel == 0){
+		if ( m_pCurrentControl )
+		{
+			if ( !m_pCurrentControl->GoNext() )
+				m_pCurrentControl->GoFirst();
+		}
+
+		m_pCurrentControl->SelectCurrentOptionUnderCursor();
+	}
+}
+
+void
+CMenuPage::Draw(const CRGBA &optionHighlight, const CRGBA &titleHighlight, float x, float y)
+{
+	int i;
+	for(i = 0; i < m_numControls; i++)
+		if(m_controls[i]){
+			if(i == m_cursor)
+				m_controls[i]->Draw(optionHighlight, titleHighlight, x, y);
+			else
+				m_controls[i]->DrawNormal(x, y);
+		}
+}
+
+void
+CMenuPage::DrawHighlighted(const CRGBA &titleHighlight, float x, float y)
+{
+	int i;
+	for(i = 0; i< m_numControls; i++)
+		if(m_controls[i]){
+			if(i == m_cursor)
+				m_controls[i]->DrawHighlighted(titleHighlight, x, y);
+			else
+				m_controls[i]->DrawNormal(x, y);
+		}
+}
+
+void
+CMenuPage::DrawNormal(float x, float y)
+{
+	int i;
+	for(i = 0; i< m_numControls; i++)
+		if(m_controls[i])
+			m_controls[i]->DrawNormal(x, y);
+}
+
+void
+CMenuPage::ActivatePage(void)
+{
+	m_cursor = 0;
+	if(m_numControls == 0)
+		return;
+	for(;;){
+		m_pCurrentControl = m_controls[m_cursor];
+		if(m_pCurrentControl->GoFirst())
+			return;
+		if(m_cursor == m_numControls-1)
+			m_cursor = 0;
+		else
+			m_cursor++;
+	}
+}
+
+void
+CMenuPage::SetAlpha(uint8 alpha)
+{
+	int i;
+	for(i = 0; i< m_numControls; i++)
+		if(m_controls[i])
+			m_controls[i]->SetAlpha(alpha);
+}
+
+void
+CMenuPage::SetShadows(bool bDropShadows, const CRGBA &shadowColor, const CVector2D &shadowOffset)
+{
+	int i;
+	for(i = 0; i< m_numControls; i++)
+		if(m_controls[i])
+			m_controls[i]->SetShadows(bDropShadows, shadowColor, shadowOffset);
+}
+
+void
+CMenuPage::GoUpMenuOnPage(void)
+{
+	if(m_pCurrentControl == nil)
+		return;
+	m_pCurrentControl->DeactivateMenu();
+	do{
+		if(m_cursor == 0)
+			m_cursor = m_numControls-1;
+		else
+			m_cursor--;
+		m_pCurrentControl = m_controls[m_cursor];
+	}while(!m_pCurrentControl->GoLast());
+}
+
+void
+CMenuPage::GoDownMenuOnPage(void)
+{
+	if(m_pCurrentControl == nil)
+		return;
+	m_pCurrentControl->DeactivateMenu();
+	do{
+		if(m_cursor == m_numControls-1)
+			m_cursor = 0;
+		else
+			m_cursor++;
+		m_pCurrentControl = m_controls[m_cursor];
+	}while(!m_pCurrentControl->GoFirst());
+}
+
+void
+CMenuPage::GoLeftMenuOnPage(void)
+{
+	// same as up
+	if(m_pCurrentControl == nil)
+		return;
+	m_pCurrentControl->DeactivateMenu();
+	do{
+		if(m_cursor == 0)
+			m_cursor = m_numControls-1;
+		else
+			m_cursor--;
+		m_pCurrentControl = m_controls[m_cursor];
+	}while(!m_pCurrentControl->GoLast());
+}
+
+void
+CMenuPage::GoRightMenuOnPage(void)
+{
+	// same as right
+	if(m_pCurrentControl == nil)
+		return;
+	m_pCurrentControl->DeactivateMenu();
+	do{
+		if(m_cursor == m_numControls-1)
+			m_cursor = 0;
+		else
+			m_cursor++;
+		m_pCurrentControl = m_controls[m_cursor];
+	}while(!m_pCurrentControl->GoFirst());
+}
+
+/*
+ * CMenuPageAnyMove
+ */
+
+void
+CMenuPageAnyMove::Initialise(void)
+{
+	int i;
+	CMenuPage::Initialise();
+	for(i = 0; i < NUM_PAGE_WIDGETS; i++){
+		m_moveTab[i].left = -1;
+		m_moveTab[i].right = -1;
+		m_moveTab[i].up = -1;
+		m_moveTab[i].down = -1;
+	}
+}
+
+bool
+CMenuPageAnyMove::AddMenu(CMenuBase *widget, FEC_MOVETAB *moveTab)
+{
+	if(AddMenu(widget)){
+		m_moveTab[m_numControls-1] = *moveTab;
+		return true;
+	}
+	return false;
+}
+
+void
+CMenuPageAnyMove::GoUpMenuOnPage(void)
+{
+	if(m_pCurrentControl == nil)
+		return;
+	m_pCurrentControl->DeactivateMenu();
+	int move = m_moveTab[m_cursor].up;
+	if(move == -1)
+		CMenuPage::GoUpMenuOnPage();
+	else{	// BUG: no else in original code
+		m_cursor = move;
+		m_pCurrentControl = m_controls[m_cursor];
+		m_pCurrentControl->GoLast();
+	}
+}
+
+void
+CMenuPageAnyMove::GoDownMenuOnPage(void)
+{
+	if(m_pCurrentControl == nil)
+		return;
+	m_pCurrentControl->DeactivateMenu();
+	int move = m_moveTab[m_cursor].down;
+	if(move == -1)
+		CMenuPage::GoDownMenuOnPage();
+	else{	// BUG: no else in original code
+		m_cursor = move;
+		m_pCurrentControl = m_controls[m_cursor];
+		m_pCurrentControl->GoLast();
+	}
+}
+
+void
+CMenuPageAnyMove::GoLeftMenuOnPage(void)
+{
+	if(m_pCurrentControl == nil)
+		return;
+	m_pCurrentControl->DeactivateMenu();
+	int move = m_moveTab[m_cursor].left;
+	if(move == -1)
+		CMenuPage::GoLeftMenuOnPage();
+	else{	// BUG: no else in original code
+		m_cursor = move;
+		m_pCurrentControl = m_controls[m_cursor];
+		m_pCurrentControl->GoLast();
+	}
+}
+
+void
+CMenuPageAnyMove::GoRightMenuOnPage(void)
+{
+	if(m_pCurrentControl == nil)
+		return;
+	m_pCurrentControl->DeactivateMenu();
+	int move = m_moveTab[m_cursor].right;
+	if(move == -1)
+		CMenuPage::GoRightMenuOnPage();
+	else{	// BUG: no else in original code
+		m_cursor = move;
+		m_pCurrentControl = m_controls[m_cursor];
+		m_pCurrentControl->GoLast();
+	}
+}
diff --git a/src/core/FrontEndControls.h b/src/core/FrontEndControls.h
new file mode 100644
index 0000000..68dab90
--- /dev/null
+++ b/src/core/FrontEndControls.h
@@ -0,0 +1,750 @@
+#pragma once
+
+enum {
+	NUM_MULTICHOICE_OPTIONS = 16,
+	// 50 actual lines and 15 for spacing
+	NUM_LINELISTER_LINES = 50,
+	NUM_LINELISTER_LINES_TOTAL = NUM_LINELISTER_LINES + 15,
+	NUM_PAGE_WIDGETS = 10,
+};
+
+class CTriggerCaller
+{
+	bool bHasTrigger;
+	void *pTrigger;
+	void (*pFunc)(void *);
+	int field_C;
+public:
+	
+	CTriggerCaller() : bHasTrigger(false), pFunc(nil)
+	{}
+	
+	void SetTrigger(void *func, void *trigger)
+	{
+		if ( !bHasTrigger )
+		{
+			pFunc = (void (*)(void *))func;
+			pTrigger = trigger;
+			bHasTrigger = true;
+		}
+	}
+	
+	void CallTrigger(void)
+	{
+		if ( bHasTrigger && pFunc != nil )
+			pFunc(pTrigger);
+		
+		bHasTrigger = false;
+		pFunc = nil;
+	}
+	
+	bool CanCall()
+	{
+		return bHasTrigger;
+	}
+};
+
+class CPlaceableText
+{
+public:
+	CVector2D m_position;
+	CRGBA m_color;
+	wchar *m_text;
+
+	CPlaceableText(void)
+	 : m_position(0.0f, 0.0f), m_color(255, 255, 255, 255), m_text(nil) {}
+	void SetPosition(float x, float y) { m_position.x = x; m_position.y = y; }
+	void SetColor(const CRGBA &color) { m_color = color; }
+	CRGBA GetColor(void) { return m_color; }
+	void SetAlpha(uint8 alpha) { m_color.alpha = alpha; }
+};
+
+// No trace of this in the game but it makes the other classes simpler
+class CPlaceableTextTwoLines
+{
+public:
+	CPlaceableText m_line1;
+	CPlaceableText m_line2;
+
+	void SetColor(const CRGBA &color) { m_line1.SetColor(color); m_line2.SetColor(color); }
+	void SetAlpha(uint8 alpha) { m_line1.SetAlpha(alpha); m_line2.SetAlpha(alpha); }
+};
+
+// No trace of this in the game but it makes the other classes simpler
+class CShadowInfo
+{
+public:
+	bool m_bRightJustify;
+	bool m_bDropShadow;
+	CRGBA m_shadowColor;
+	CVector2D m_shadowOffset;
+
+	CShadowInfo(void)
+	 : m_bRightJustify(false), m_bDropShadow(false),
+	   m_shadowColor(255, 255, 255, 255),
+	   m_shadowOffset(-1.0f, -1.0f) {}
+	CRGBA GetShadowColor(void) { return m_shadowColor; }
+	void SetShadows(bool bDropShadows, const CRGBA &shadowColor, const CVector2D &shadowOffset){
+		m_bDropShadow = bDropShadows;
+		m_shadowColor = shadowColor;
+		m_shadowOffset = shadowOffset;
+	}
+};
+
+// No trace of this in the game but it makes the other classes simpler
+class CSelectable
+{
+public:
+	bool m_bSelected;
+	CRGBA m_selectedColor;
+
+	CSelectable(void) : m_bSelected(false) {}
+	CRGBA GetSelectedColor(void) { return m_selectedColor; }
+};
+
+class CPlaceableShText : public CPlaceableText, public CShadowInfo
+{
+public:
+	using CPlaceableText::SetPosition;
+	void SetPosition(float x, float y, bool bRightJustify) { SetPosition(x, y); m_bRightJustify = bRightJustify; }
+	void SetAlpha(uint8 alpha)  { m_shadowColor.alpha = alpha; CPlaceableText::SetAlpha(alpha); }
+
+	void Draw(float x, float y);
+	void Draw(const CRGBA &color, float x, float y);
+	// unused arguments it seems
+	void DrawShWrap(float x, float y, float wrapX, float wrapY) { Draw(x, y); }
+};
+
+class CPlaceableShTextTwoLines : public CPlaceableTextTwoLines, public CShadowInfo
+{
+public:
+	void SetAlpha(uint8 alpha)  { m_shadowColor.alpha = alpha; CPlaceableTextTwoLines::SetAlpha(alpha); }
+
+	void Draw(float x, float y);
+	void Draw(const CRGBA &color, float x, float y);
+};
+
+class CPlaceableShOption : public CPlaceableShText, public CSelectable
+{
+public:
+	void SetColors(const CRGBA &normal, const CRGBA &selection) { CPlaceableShText::SetColor(normal); m_selectedColor = selection; }
+	void SetAlpha(uint8 alpha)  { m_selectedColor.alpha = alpha; CPlaceableShText::SetAlpha(alpha); }
+
+	using CPlaceableShText::Draw;
+	void Draw(const CRGBA &highlightColor, float x, float y, bool bHighlight);
+};
+
+class CPlaceableShOptionTwoLines : public CPlaceableShTextTwoLines, public CSelectable
+{
+public:
+	void SetColors(const CRGBA &normal, const CRGBA &selection) { CPlaceableShTextTwoLines::SetColor(normal); m_selectedColor = selection; }
+	void SetAlpha(uint8 alpha)  { m_selectedColor.alpha = alpha; CPlaceableShTextTwoLines::SetAlpha(alpha); }
+
+	using CPlaceableShTextTwoLines::Draw;
+	void Draw(const CRGBA &highlightColor, float x, float y, bool bHighlight);
+};
+
+class CPlaceableSprite
+{
+public:
+	CSprite2d *m_pSprite;
+	CVector2D m_position;
+	CVector2D m_size;
+	CRGBA m_color;
+
+	CPlaceableSprite(void)
+	 : m_pSprite(nil), m_position(0.0f, 0.0f),
+	   m_size(0.0f, 0.0f), m_color(255, 255, 255, 255) {}
+
+	void SetPosition(float x, float y) { m_position.x = x; m_position.y = y; }
+	void SetAlpha(uint8 alpha) { m_color.alpha = alpha; }
+
+	void Draw(float x, float y);
+	void Draw(const CRGBA &color, float x, float y);
+};
+
+class CPlaceableShSprite
+{
+public:
+	CPlaceableSprite m_sprite;
+	CPlaceableSprite m_shadow;
+	bool m_bDropShadow;
+
+	CPlaceableShSprite(void) : m_bDropShadow(false) {}
+
+	void SetShadows(bool bDropShadows, const CRGBA &shadowColor, const CVector2D &shadowOffset){
+		m_bDropShadow = bDropShadows;
+		m_shadow.m_color = shadowColor;
+		m_shadow.m_position = shadowOffset;
+	}
+	void SetAlpha(uint8 alpha)  { m_sprite.SetAlpha(alpha); m_shadow.SetAlpha(alpha); }
+
+	void Draw(float x, float y);
+};
+
+
+class CMenuBase
+{
+public:
+	CVector2D m_position;
+	bool m_bTwoState;
+
+	CMenuBase(void)
+	 : m_position(0.0f, 0.0f), m_bTwoState(false) {}
+	void SetPosition(float x, float y) { m_position.x = x; m_position.y = y; }
+
+	virtual void Draw(const CRGBA &optionHighlight, const CRGBA &titleHighlight, float x, float y) = 0;
+	virtual void DrawNormal(float x, float y) = 0;
+	virtual void DrawHighlighted(const CRGBA &titleHighlight, float x, float y) = 0;
+	virtual void SetAlpha(uint8 alpha) = 0;
+	virtual void SetShadows(bool bDropShadows, const CRGBA &shadowColor, const CVector2D &shadowOffset) = 0;
+	virtual bool GoNext(void) = 0;
+	virtual bool GoPrev(void) = 0;
+	virtual bool GoDown(void) = 0;
+	virtual bool GoUp(void) = 0;
+	virtual bool GoDownStill(void) = 0;
+	virtual bool GoUpStill(void) = 0;
+	virtual bool GoLeft(void) = 0;
+	virtual bool GoRight(void) = 0;
+	virtual bool GoLeftStill(void) = 0;
+	virtual bool GoRightStill(void) = 0;
+	virtual bool GoFirst(void) = 0;
+	virtual bool GoLast(void) = 0;
+	virtual void SelectCurrentOptionUnderCursor(void) = 0;
+	virtual void SelectDefaultCancelAction(void) = 0;
+	virtual void ActivateMenu(bool first) = 0;
+	virtual void DeactivateMenu(void) = 0;
+	virtual int GetMenuSelection(void) = 0;
+	virtual void SetMenuSelection(int selection) = 0;
+};
+
+class CMenuDummy : public CMenuBase
+{
+public:
+	bool m_bActive;
+
+	virtual void Draw(const CRGBA &, const CRGBA &, float x, float y) {}
+	virtual void DrawNormal(float x, float y) {}
+	virtual void DrawHighlighted(const CRGBA &, float x, float y) {}
+	virtual void SetAlpha(uint8 alpha) {}
+	virtual void SetShadows(bool bDropShadows, const CRGBA &shadowColor, const CVector2D &shadowOffset) {}
+	virtual bool GoNext(void) { DeactivateMenu(); return false; }
+	virtual bool GoPrev(void) { DeactivateMenu(); return false; }
+	virtual bool GoDown(void) { return GoNext(); }
+	virtual bool GoUp(void) { return GoPrev(); }
+	virtual bool GoDownStill(void) { return false; }
+	virtual bool GoUpStill(void) { return false; }
+	virtual bool GoLeft(void) { return true; }
+	virtual bool GoRight(void) { return true; }
+	virtual bool GoLeftStill(void) { return true; }
+	virtual bool GoRightStill(void) { return true; }
+	virtual bool GoFirst(void) { ActivateMenu(true); return true; }
+	virtual bool GoLast(void) { ActivateMenu(true); return true; }
+	virtual void SelectCurrentOptionUnderCursor(void) {}
+	virtual void SelectDefaultCancelAction(void) {}
+	virtual void ActivateMenu(bool first) { m_bActive = true; }
+	virtual void DeactivateMenu(void) { m_bActive = false; }
+	virtual int GetMenuSelection(void) { return -1; }
+	virtual void SetMenuSelection(int) {}
+};
+
+class CMenuPictureAndText : public CMenuBase
+{
+public:
+	int m_numSprites;
+	CPlaceableShSprite m_sprites[5];
+	int m_numTexts;
+	CPlaceableShText m_texts[20];
+
+	CVector2D m_oldTextScale;
+	CVector2D m_textScale;
+	bool m_bSetTextScale;
+
+	float m_wrapX;
+	float m_oldWrapx;
+	bool m_bWrap;
+	// missing some?
+
+
+	CMenuPictureAndText(void)
+	 : m_numSprites(0), m_numTexts(0),
+	   m_bSetTextScale(false), m_bWrap(false) {}
+
+	void SetNewOldShadowWrapX(bool bWrapX, float newWrapX, float oldWrapX);
+	void SetNewOldTextScale(bool bTextScale, const CVector2D &newScale, const CVector2D &oldScale);
+	void SetTextsColor(const CRGBA &color);
+	void AddText(wchar *text, float positionX, float positionY, const CRGBA &color, bool bRightJustify);
+	void AddPicture(CSprite2d *sprite, CSprite2d *shadow, float positionX, float positionY, float width, float height, const CRGBA &color);
+	void AddPicture(CSprite2d *sprite, float positionX, float positionY, float width, float height, const CRGBA &color);
+
+	virtual void Draw(const CRGBA &, const CRGBA &, float x, float y);
+	virtual void DrawNormal(float x, float y) { Draw(CRGBA(0,0,0,0), CRGBA(0,0,0,0), x, y); }
+	virtual void DrawHighlighted(const CRGBA &, float x, float y) { Draw(CRGBA(0,0,0,0), CRGBA(0,0,0,0), x, y); }
+	virtual void SetAlpha(uint8 alpha);
+	virtual void SetShadows(bool bDropShadows, const CRGBA &shadowColor, const CVector2D &shadowOffset);
+	virtual bool GoNext(void) { return false; }
+	virtual bool GoPrev(void) { return false; }
+	virtual bool GoDown(void) { return GoNext(); }
+	virtual bool GoUp(void) { return GoPrev(); }
+	virtual bool GoDownStill(void) { return false; }
+	virtual bool GoUpStill(void) { return false; }
+	virtual bool GoLeft(void) { return true; }
+	virtual bool GoRight(void) { return true; }
+	virtual bool GoLeftStill(void) { return true; }
+	virtual bool GoRightStill(void) { return true; }
+	virtual bool GoFirst(void) { return false; }
+	virtual bool GoLast(void) { return false; }
+	virtual void SelectCurrentOptionUnderCursor(void) {}
+	virtual void SelectDefaultCancelAction(void) {}
+	virtual void ActivateMenu(bool first) {}
+	virtual void DeactivateMenu(void) {}
+	virtual int GetMenuSelection(void) { return -1; }
+	virtual void SetMenuSelection(int) {}
+};
+
+class CMenuMultiChoice : public CMenuBase
+{
+public:
+	int m_numOptions;
+	CPlaceableShText m_title;
+	CPlaceableShOption m_options[NUM_MULTICHOICE_OPTIONS];
+	int m_cursor;
+	CVector2D m_oldTextScale;
+	CVector2D m_textScale;
+	bool m_bSetTextScale;
+	bool m_bSetTitleTextScale;
+
+	CMenuMultiChoice(void)
+	 : m_numOptions(0), m_cursor(-1),
+	   m_bSetTextScale(false), m_bSetTitleTextScale(false) {}
+
+	void AddTitle(wchar *text, float positionX, float positionY, bool bRightJustify);
+	CPlaceableShOption *AddOption(wchar *text, float positionX, float positionY, bool bSelected, bool bRightJustify);
+	void SetColors(const CRGBA &title, const CRGBA &normal, const CRGBA &selected);
+	void SetNewOldTextScale(bool bTextScale, const CVector2D &newScale, const CVector2D &oldScale, bool bTitleTextScale);
+
+	virtual void Draw(const CRGBA &optionHighlight, const CRGBA &titleHighlight, float x, float y);
+	virtual void DrawNormal(float x, float y);
+	virtual void DrawHighlighted(const CRGBA &titleHighlight, float x, float y);
+	virtual void SetAlpha(uint8 alpha);
+	virtual void SetShadows(bool bDropShadows, const CRGBA &shadowColor, const CVector2D &shadowOffset);
+	virtual bool GoNext(void);
+	virtual bool GoPrev(void);
+	virtual bool GoDown(void) { return GoNext(); }
+	virtual bool GoUp(void) { return GoPrev(); }
+	virtual bool GoDownStill(void) { return false; }
+	virtual bool GoUpStill(void) { return false; }
+	virtual bool GoLeft(void) { return GoPrev(); }
+	virtual bool GoRight(void) { return GoNext(); }
+	virtual bool GoLeftStill(void) { return true; }
+	virtual bool GoRightStill(void) { return true; }
+	virtual bool GoFirst(void) { m_cursor = 0; return true; }
+	virtual bool GoLast(void) { m_cursor = m_numOptions-1; return true; }
+	virtual void SelectCurrentOptionUnderCursor(void);
+	virtual void SelectDefaultCancelAction(void) {}
+	virtual void ActivateMenu(bool first) { m_cursor = first ? 0 : m_numOptions-1; }
+	virtual void DeactivateMenu(void) { m_cursor = -1; }
+	virtual int GetMenuSelection(void);
+	virtual void SetMenuSelection(int selection);
+};
+
+class CMenuMultiChoiceTriggered : public CMenuMultiChoice
+{
+public:
+	typedef void (*Trigger)(CMenuMultiChoiceTriggered *);
+
+	Trigger m_triggers[NUM_MULTICHOICE_OPTIONS];
+	Trigger m_defaultCancel;
+
+	CMenuMultiChoiceTriggered(void) { Initialise(); }
+
+	void Initialise(void);
+	CPlaceableShOption *AddOption(wchar *text, float positionX, float positionY, Trigger trigger, bool bSelected, bool bRightJustify);
+
+	virtual void SelectCurrentOptionUnderCursor(void);
+	virtual void SelectDefaultCancelAction(void);
+};
+
+class CMenuMultiChoiceTriggeredAlways : public CMenuMultiChoiceTriggered
+{
+public:
+	Trigger m_alwaysNormalTrigger;
+	Trigger m_alwaysHighlightTrigger;
+	Trigger m_alwaysTrigger;
+
+	CMenuMultiChoiceTriggeredAlways(void)
+	 : m_alwaysNormalTrigger(nil), m_alwaysHighlightTrigger(nil), m_alwaysTrigger(nil) {}
+
+	virtual void Draw(const CRGBA &optionHighlight, const CRGBA &titleHighlight, float x, float y);
+	virtual void DrawNormal(float x, float y);
+	virtual void DrawHighlighted(const CRGBA &titleHighlight, float x, float y);
+};
+
+class CMenuMultiChoicePictured : public CMenuMultiChoice
+{
+public:
+	CPlaceableSprite m_sprites[NUM_MULTICHOICE_OPTIONS];
+	bool m_bHasSprite[NUM_MULTICHOICE_OPTIONS];
+
+	CMenuMultiChoicePictured(void) { Initialise(); }
+	void Initialise(void);
+	using CMenuMultiChoice::AddOption;
+	CPlaceableShOption *AddOption(CSprite2d *sprite, float positionX, float positionY, const CVector2D &size, bool bSelected);
+
+	virtual void Draw(const CRGBA &optionHighlight, const CRGBA &titleHighlight, float x, float y);
+	virtual void DrawNormal(float x, float y);
+	virtual void DrawHighlighted(const CRGBA &titleHighlight, float x, float y);
+	virtual void SetAlpha(uint8 alpha);
+	// unnecessary - same as base class
+//	virtual void SetShadows(bool bDropShadows, const CRGBA &shadowColor, const CVector2D &shadowOffset);
+};
+
+class CMenuMultiChoicePicturedTriggered : public CMenuMultiChoicePictured
+{
+public:
+	typedef void (*Trigger)(CMenuMultiChoicePicturedTriggered *);
+
+	Trigger m_triggers[NUM_MULTICHOICE_OPTIONS];
+	Trigger m_defaultCancel;
+
+	CMenuMultiChoicePicturedTriggered(void) { Initialise(); }
+
+	void Initialise(void);
+	using CMenuMultiChoicePictured::AddOption;
+	CPlaceableShOption *AddOption(CSprite2d *sprite, float positionX, float positionY, const CVector2D &size, Trigger trigger, bool bSelected);
+
+	virtual void SelectCurrentOptionUnderCursor(void);
+	virtual void SelectDefaultCancelAction(void);
+};
+
+struct FEC_MOVETAB
+{
+	int8 right;
+	int8 left;
+	int8 down;
+	int8 up;
+};
+
+class CMenuMultiChoicePicturedTriggeredAnyMove : public CMenuMultiChoicePicturedTriggered
+{
+public:
+	FEC_MOVETAB m_moveTab[NUM_MULTICHOICE_OPTIONS];
+
+	CMenuMultiChoicePicturedTriggeredAnyMove(void) { Initialise(); }
+
+	void Initialise(void);
+	using CMenuMultiChoicePicturedTriggered::AddOption;
+	CPlaceableShOption *AddOption(CSprite2d *sprite, FEC_MOVETAB *moveTab, float positionX, float positionY, const CVector2D &size, Trigger trigger, bool bSelected);
+
+	virtual bool GoDown(void);
+	virtual bool GoUp(void);
+	virtual bool GoLeft(void);
+	virtual bool GoRight(void);
+};
+
+// copy of CMenuMultiChoice pretty much except for m_options type
+class CMenuMultiChoiceTwoLines : public CMenuBase
+{
+public:
+	int m_numOptions;
+	CPlaceableShText m_title;
+	CPlaceableShOptionTwoLines m_options[NUM_MULTICHOICE_OPTIONS];
+	int m_cursor;
+	CVector2D m_oldTextScale;
+	CVector2D m_textScale;
+	bool m_bSetTextScale;
+	bool m_bSetTitleTextScale;
+
+	CMenuMultiChoiceTwoLines(void)
+	 : m_numOptions(0), m_cursor(-1),
+	   m_bSetTextScale(false), m_bSetTitleTextScale(false) {}
+
+	void AddTitle(wchar *text, float positionX, float positionY, bool bRightJustify);
+	CPlaceableShOptionTwoLines *AddOption(wchar *text, float positionX, float positionY, bool bSelected, bool bRightJustify);
+	CPlaceableShOptionTwoLines *AddOption(wchar *text1, float positionX1, float positionY1, wchar *text2, float positionX2, float positionY2, bool bSelected, bool bRightJustify);
+	void SetColors(const CRGBA &title, const CRGBA &normal, const CRGBA &selected);
+	void SetNewOldTextScale(bool bTextScale, const CVector2D &newScale, const CVector2D &oldScale, bool bTitleTextScale);
+
+	virtual void Draw(const CRGBA &optionHighlight, const CRGBA &titleHighlight, float x, float y);
+	virtual void DrawNormal(float x, float y);
+	virtual void DrawHighlighted(const CRGBA &titleHighlight, float x, float y);
+	virtual void SetAlpha(uint8 alpha);
+	virtual void SetShadows(bool bDropShadows, const CRGBA &shadowColor, const CVector2D &shadowOffset);
+	virtual bool GoNext(void);
+	virtual bool GoPrev(void);
+	virtual bool GoDown(void) { return GoNext(); }
+	virtual bool GoUp(void) { return GoPrev(); }
+	virtual bool GoDownStill(void) { return true; }
+	virtual bool GoUpStill(void) { return true; }
+	virtual bool GoLeft(void) { return GoPrev(); }
+	virtual bool GoRight(void) { return GoNext(); }
+	virtual bool GoLeftStill(void) { return true; }
+	virtual bool GoRightStill(void) { return true; }
+	virtual bool GoFirst(void) { m_cursor = 0; return true; }
+	virtual bool GoLast(void) { m_cursor = m_numOptions-1; return true; }
+	virtual void SelectCurrentOptionUnderCursor(void);
+	virtual void SelectDefaultCancelAction(void) {}
+	virtual void ActivateMenu(bool first) { m_cursor = first ? 0 : m_numOptions-1; }
+	virtual void DeactivateMenu(void) { m_cursor = -1; }
+	virtual int GetMenuSelection(void);
+	virtual void SetMenuSelection(int selection);
+};
+
+// copy of CMenuMultiChoiceTriggered except for m_options
+class CMenuMultiChoiceTwoLinesTriggered : public CMenuMultiChoiceTwoLines
+{
+public:
+	typedef void (*Trigger)(CMenuMultiChoiceTwoLinesTriggered *);
+
+	Trigger m_triggers[NUM_MULTICHOICE_OPTIONS];
+	Trigger m_defaultCancel;
+
+	CMenuMultiChoiceTwoLinesTriggered(void) { Initialise(); }
+
+	void Initialise(void);
+	CPlaceableShOptionTwoLines *AddOption(wchar *text, float positionX, float positionY, Trigger trigger, bool bSelected, bool bRightJustify);
+	CPlaceableShOptionTwoLines *AddOption(wchar *text1, float positionX1, float positionY1, wchar *text2, float positionX2, float positionY2, Trigger trigger, bool bSelected, bool bRightJustify);
+
+	virtual void SelectCurrentOptionUnderCursor(void);
+	virtual void SelectDefaultCancelAction(void);
+};
+
+
+class CMenuOnOff : public CMenuBase
+{
+public:
+	CPlaceableShOption m_title;
+	CPlaceableShText m_options[2];
+	bool m_bActive;
+	bool m_bSetTextScale;
+	bool m_bSetTitleTextScale;
+	CVector2D m_textScale;
+	CVector2D m_oldTextScale;
+	int m_type;	// 0: on/off 1: yes/no
+
+	void SetColors(const CRGBA &title, const CRGBA &options);
+	void SetNewOldTextScale(bool bTextScale, const CVector2D &newScale, const CVector2D &oldScale, bool bTitleTextScale);
+	void SetOptionPosition(float x, float y, bool bRightJustify);
+	void AddTitle(wchar *text, bool bSelected, float positionX, float positionY, bool bRightJustify);
+
+	virtual void Draw(const CRGBA &optionHighlight, const CRGBA &titleHighlight, float x, float y);
+	virtual void DrawNormal(float x, float y);
+	virtual void DrawHighlighted(const CRGBA &titleHighlight, float x, float y);
+	virtual void SetAlpha(uint8 alpha);
+	virtual void SetShadows(bool bDropShadows, const CRGBA &shadowColor, const CVector2D &shadowOffset);
+	virtual bool GoNext(void) { DeactivateMenu(); return false; }
+	virtual bool GoPrev(void) { DeactivateMenu(); return false; }
+	virtual bool GoDown(void) { return GoNext(); }
+	virtual bool GoUp(void) { return GoPrev(); }
+	virtual bool GoDownStill(void) { return false; }
+	virtual bool GoUpStill(void) { return false; }
+	virtual bool GoLeft(void) { SelectCurrentOptionUnderCursor(); return true; }
+	virtual bool GoRight(void) { SelectCurrentOptionUnderCursor(); return true; }
+	virtual bool GoLeftStill(void) { return true; }
+	virtual bool GoRightStill(void) { return true; }
+	virtual bool GoFirst(void) { ActivateMenu(true); return true; }
+	virtual bool GoLast(void) { ActivateMenu(true); return true; }
+	virtual void SelectCurrentOptionUnderCursor(void) { m_title.m_bSelected ^= 1; }
+	virtual void SelectDefaultCancelAction(void) {}
+	virtual void ActivateMenu(bool first) { m_bActive = true; }
+	virtual void DeactivateMenu(void) { m_bActive = false; }
+	virtual int GetMenuSelection(void) { return m_title.m_bSelected; }
+	virtual void SetMenuSelection(int selection) { m_title.m_bSelected = selection; }
+};
+
+class CMenuOnOffTriggered : public CMenuOnOff
+{
+public:
+	typedef void (*Trigger)(CMenuOnOffTriggered *);
+
+	Trigger m_trigger;
+
+	void SetOptionPosition(float x, float y, Trigger trigger, bool bRightJustify);
+
+	virtual void SelectCurrentOptionUnderCursor(void);
+};
+
+class CMenuSlider : public CMenuBase
+{
+public:
+	CPlaceableShText m_title;
+	CPlaceableShText m_box;	// not really a text
+	CRGBA m_colors[2];	// left and right
+	CVector2D m_size[2];	// left and right
+	int m_value;
+	CPlaceableShText m_percentageText;
+	bool m_bDrawPercentage;
+//	char field_8D;
+//	char field_8E;
+//	char field_8F;
+	uint8 m_someAlpha;
+//	char field_91;
+//	char field_92;
+//	char field_93;
+	bool m_bActive;
+	int m_style;
+
+	static char Buf8[8];
+	static wchar Buf16[8];
+
+	CMenuSlider(void)
+	 : m_value(0), m_bDrawPercentage(false), m_bActive(false), m_style(0)
+	{
+		AddTickBox(0.0f, 0.0f, 100.0f, 10.0f, 10.0f); //todo
+	}
+
+	void SetColors(const CRGBA &title, const CRGBA &percentage, const CRGBA &left, const CRGBA &right);
+	void DrawTicks(const CVector2D &position, const CVector2D &size, float heightRight, float level, const CRGBA &leftCol, const CRGBA &selCol, const CRGBA &rightCol, bool bShadow, const CVector2D &shadowOffset, const CRGBA &shadowColor);
+	void DrawTicks(const CVector2D &position, const CVector2D &size, float heightRight, float level, const CRGBA &leftCol, const CRGBA &rightCol,                      bool bShadow, const CVector2D &shadowOffset, const CRGBA &shadowColor);
+	void AddTickBox(float positionX, float positionY, float width, float heigthLeft, float heightRight);
+	void AddTitle(wchar *text, float positionX, float positionY);
+
+	virtual void Draw(const CRGBA &optionHighlight, const CRGBA &titleHighlight, float x, float y);
+	virtual void DrawNormal(float x, float y);
+	virtual void DrawHighlighted(const CRGBA &titleHighlight, float x, float y);
+	virtual void SetAlpha(uint8 alpha);
+	virtual void SetShadows(bool bDropShadows, const CRGBA &shadowColor, const CVector2D &shadowOffset);
+	virtual bool GoNext(void) { DeactivateMenu(); return false; }
+	virtual bool GoPrev(void) { DeactivateMenu(); return false; }
+	virtual bool GoDown(void) { return GoNext(); }
+	virtual bool GoUp(void) { return GoPrev(); }
+	virtual bool GoDownStill(void) { return false; }
+	virtual bool GoUpStill(void) { return false; }
+	virtual bool GoLeft(void) { if(m_value < 0) m_value = 0; return true; }
+	virtual bool GoRight(void) { if(m_value > 1000) m_value = 1000; return true; }
+	virtual bool GoLeftStill(void) { m_value -= 8; if(m_value < 0) m_value = 0; return true; }
+	virtual bool GoRightStill(void) { m_value += 8; if(m_value > 1000) m_value = 1000; return true; }
+	virtual bool GoFirst(void) { ActivateMenu(true); return true; }
+	virtual bool GoLast(void) { ActivateMenu(true); return true; }
+	virtual void SelectCurrentOptionUnderCursor(void) {}
+	virtual void SelectDefaultCancelAction(void) {}
+	virtual void ActivateMenu(bool first) { m_bActive = true; }
+	virtual void DeactivateMenu(void) { m_bActive = false; }
+	virtual int GetMenuSelection(void) { return m_value/10; }
+	virtual void SetMenuSelection(int selection) { m_value = selection*10; }
+};
+
+class CMenuSliderTriggered : public CMenuSlider
+{
+public:
+	typedef void (*Trigger)(CMenuSliderTriggered *);
+
+	Trigger m_trigger;
+	Trigger m_alwaysTrigger;
+
+	CMenuSliderTriggered(void)
+	 : m_trigger(nil), m_alwaysTrigger(nil) {}
+
+	void AddTickBox(float positionX, float positionY, float width, float heigthLeft, float heightRight, Trigger trigger, Trigger alwaysTrigger);
+
+	virtual void Draw(const CRGBA &optionHighlight, const CRGBA &titleHighlight, float x, float y);
+	virtual bool GoLeft(void);
+	virtual bool GoRight(void);
+	virtual bool GoLeftStill(void);
+	virtual bool GoRightStill(void);
+};
+
+
+class CMenuLineLister : public CMenuBase
+{
+public:
+	float m_width;
+	float m_height;
+	int m_numLines;
+	CPlaceableShText m_linesLeft[NUM_LINELISTER_LINES_TOTAL];
+	CPlaceableShText m_linesRight[NUM_LINELISTER_LINES_TOTAL];
+	uint8 m_lineAlphas[NUM_LINELISTER_LINES_TOTAL];
+	int8 m_lineFade[NUM_LINELISTER_LINES_TOTAL];
+	float m_scrollPosition;
+	float m_scrollSpeed;
+	int field_10E8;
+	float m_lineSpacing;
+
+	CMenuLineLister(void);
+
+	void SetLinesColor(const CRGBA &color);
+	void ResetNumberOfTextLines(void);
+	bool AddTextLine(wchar *left, wchar *right);
+
+	CPlaceableShText *GetLeftLine(int i) { return &m_linesLeft[(i%NUM_LINELISTER_LINES) + 15]; };
+	CPlaceableShText *GetRightLine(int i) { return &m_linesRight[(i%NUM_LINELISTER_LINES) + 15]; };
+
+	virtual void Draw(const CRGBA &optionHighlight, const CRGBA &titleHighlight, float x, float y);
+	virtual void DrawNormal(float x, float y) { Draw(CRGBA(0,0,0,0), CRGBA(0,0,0,0), x, y); }
+	virtual void DrawHighlighted(const CRGBA &titleHighlight, float x, float y) { Draw(CRGBA(0,0,0,0), CRGBA(0,0,0,0), x, y); }
+	virtual void SetAlpha(uint8 alpha);
+	virtual void SetShadows(bool bDropShadows, const CRGBA &shadowColor, const CVector2D &shadowOffset);
+	virtual bool GoNext(void) { return false; }
+	virtual bool GoPrev(void) { return false; }
+	virtual bool GoDown(void) { return GoNext(); }
+	virtual bool GoUp(void) { return GoPrev(); }
+	virtual bool GoDownStill(void) { m_scrollSpeed = 0.0f; return true; }
+	virtual bool GoUpStill(void) { m_scrollSpeed *= 6.0f; return true; }
+	virtual bool GoLeft(void) { return true; }
+	virtual bool GoRight(void) { return true; }
+	virtual bool GoLeftStill(void) { return true; }
+	virtual bool GoRightStill(void) { return true; }
+	virtual bool GoFirst(void) { return true; }
+	virtual bool GoLast(void) { return true; }
+	virtual void SelectCurrentOptionUnderCursor(void) {}
+	virtual void SelectDefaultCancelAction(void) {}
+	virtual void ActivateMenu(bool first) {}
+	virtual void DeactivateMenu(void) {}
+	virtual int GetMenuSelection(void) { return -1; }
+	virtual void SetMenuSelection(int selection) {}
+};
+
+class CMenuPage
+{
+public:
+	CMenuBase *m_controls[NUM_PAGE_WIDGETS];
+	int m_numControls;
+	CMenuBase *m_pCurrentControl;
+	int m_cursor;
+
+	CMenuPage(void) { Initialise(); }
+	void Initialise(void);
+	bool AddMenu(CMenuBase *widget);
+
+	bool IsActiveMenuTwoState(void);
+	void ActiveMenuTwoState_SelectNextPosition(void);
+	void Draw(const CRGBA &,const CRGBA &, float, float);
+	void DrawHighlighted(const CRGBA &titleHighlight, float x, float y);
+	void DrawNormal(float x, float y);
+	void ActivatePage(void);
+	void SetAlpha(uint8 alpha);
+	void SetShadows(bool, const CRGBA &, const CVector2D &);
+	void GoPrev(void) { if(m_pCurrentControl) { if(!m_pCurrentControl->GoPrev()) m_pCurrentControl->GoLast(); } }
+	void GoNext(void) { if(m_pCurrentControl) { if(!m_pCurrentControl->GoNext()) m_pCurrentControl->GoFirst(); } }
+	void GoLeft(void) { if(m_pCurrentControl) { if(!m_pCurrentControl->GoLeft()) m_pCurrentControl->GoLast(); } }
+	void GoRight(void) { if(m_pCurrentControl) { if(!m_pCurrentControl->GoRight()) m_pCurrentControl->GoFirst(); } }
+	void GoUp(void) { if(m_pCurrentControl) { if(!m_pCurrentControl->GoUp()) m_pCurrentControl->GoLast(); } }
+	void GoDown(void) { if(m_pCurrentControl) { if(!m_pCurrentControl->GoDown()) m_pCurrentControl->GoFirst(); } }
+	void GoLeftStill(void) { if(m_pCurrentControl) m_pCurrentControl->GoLeftStill(); }
+	void GoRightStill(void) { if(m_pCurrentControl) m_pCurrentControl->GoRightStill(); }
+	void GoUpStill(void) { if(m_pCurrentControl) m_pCurrentControl->GoUpStill(); }
+	void GoDownStill(void) { if(m_pCurrentControl) m_pCurrentControl->GoDownStill(); }
+	void SelectDefaultCancelAction(void) { if(m_pCurrentControl) m_pCurrentControl->SelectDefaultCancelAction(); }
+	void SelectCurrentOptionUnderCursor(void) { if(m_pCurrentControl) m_pCurrentControl->SelectCurrentOptionUnderCursor(); }
+
+	virtual void GoUpMenuOnPage(void);
+	virtual void GoDownMenuOnPage(void);
+	virtual void GoLeftMenuOnPage(void);
+	virtual void GoRightMenuOnPage(void);
+};
+
+class CMenuPageAnyMove : public CMenuPage
+{
+public:
+	FEC_MOVETAB m_moveTab[NUM_PAGE_WIDGETS];
+
+	CMenuPageAnyMove(void) { Initialise(); }
+	void Initialise(void);
+	using CMenuPage::AddMenu;
+	bool AddMenu(CMenuBase *widget, FEC_MOVETAB *moveTab);
+
+	virtual void GoUpMenuOnPage(void);
+	virtual void GoDownMenuOnPage(void);
+	virtual void GoLeftMenuOnPage(void);
+	virtual void GoRightMenuOnPage(void);
+};
\ No newline at end of file
diff --git a/src/core/Frontend.cpp b/src/core/Frontend.cpp
new file mode 100644
index 0000000..d6c2649
--- /dev/null
+++ b/src/core/Frontend.cpp
@@ -0,0 +1,6612 @@
+#define FORCE_PC_SCALING
+#define WITHWINDOWS
+#define WITHDINPUT
+#include "common.h"
+#ifndef PS2_MENU
+#include "crossplatform.h"
+#include "platform.h"
+#include "Frontend.h"
+#include "Font.h"
+#include "Pad.h"
+#include "Text.h"
+#include "main.h"
+#include "RwHelper.h"
+#include "Timer.h"
+#include "Game.h"
+#include "DMAudio.h"
+#include "FileMgr.h"
+#include "Streaming.h"
+#include "TxdStore.h"
+#include "General.h"
+#include "GenericGameStorage.h"
+#include "Script.h"
+#include "Camera.h"
+#include "ControllerConfig.h"
+#include "Vehicle.h"
+#include "MBlur.h"
+#include "PlayerSkin.h"
+#include "PlayerInfo.h"
+#include "World.h"
+#include "Renderer.h"
+#include "CdStream.h"
+#include "Radar.h"
+#include "Stats.h"
+#include "Messages.h"
+#include "FileLoader.h"
+#include "User.h"
+#include "sampman.h"
+
+// Similar story to Hud.cpp:
+// Game has colors inlined in code.
+// For easier modification we collect them here:
+const CRGBA LABEL_COLOR(255, 150, 225, 255);
+const CRGBA SELECTIONBORDER_COLOR(25, 130, 70, 255);
+const CRGBA MENUOPTION_COLOR = LABEL_COLOR;
+const CRGBA SELECTEDMENUOPTION_COLOR = LABEL_COLOR;
+const CRGBA HEADER_COLOR = LABEL_COLOR;
+const CRGBA DARKMENUOPTION_COLOR(195, 90, 165, 255);
+const CRGBA SLIDERON_COLOR(97, 194, 247, 255);
+const CRGBA SLIDEROFF_COLOR(27, 89, 130, 255);
+const CRGBA LIST_BACKGROUND_COLOR(49, 101, 148, 130);
+const CRGBA LIST_OPTION_COLOR(155, 155, 155, 255);
+const CRGBA RADIO_SELECTOR_COLOR = SLIDEROFF_COLOR;
+const CRGBA INACTIVE_RADIO_COLOR(100, 100, 255, 100);
+const CRGBA SCROLLBAR_COLOR = LABEL_COLOR;
+
+#define MAP_MIN_SIZE 162.f
+#define MAP_SIZE_TO_ALLOW_X_MOVE 297.f
+
+#define MAX_VISIBLE_LIST_ROW 30
+#define SCROLLBAR_MAX_HEIGHT 263.0f // not in end result
+#define SCROLLABLE_PAGES
+
+#define hasNativeList(screen) (screen == MENUPAGE_SKIN_SELECT || screen == MENUPAGE_KEYBOARD_CONTROLS)
+
+#ifdef SCROLLABLE_PAGES
+#define MAX_VISIBLE_OPTION 12
+#define MAX_VISIBLE_OPTION_ON_SCREEN (hasNativeList(m_nCurrScreen) ? MAX_VISIBLE_LIST_ROW : MAX_VISIBLE_OPTION)
+#define SCREEN_HAS_AUTO_SCROLLBAR (m_nTotalListRow > MAX_VISIBLE_OPTION && !hasNativeList(m_nCurrScreen))
+
+int GetOptionCount(int screen)
+{
+	int i = 0;
+	for (; i < NUM_MENUROWS && aScreens[screen].m_aEntries[i].m_Action != MENUACTION_NOTHING; i++);
+	return i;
+}
+
+#define SETUP_SCROLLING(screen) \
+		if (!hasNativeList(screen)) { \
+			m_nTotalListRow = GetOptionCount(screen); \
+			if (m_nTotalListRow > MAX_VISIBLE_OPTION) { \
+				m_nSelectedListRow = 0; \
+				m_nFirstVisibleRowOnList = 0; \
+				m_nScrollbarTopMargin = 0; \
+			} \
+		}
+
+#define MINUS_SCROLL_OFFSET - scrollOffset
+#else
+#define MAX_VISIBLE_OPTION_ON_SCREEN MAX_VISIBLE_LIST_ROW
+#define SETUP_SCROLLING(screen)
+#define MINUS_SCROLL_OFFSET
+#endif
+
+#ifdef TRIANGLE_BACK_BUTTON
+#define GetBackJustUp GetTriangleJustUp
+#define GetBackJustDown GetTriangleJustDown
+#elif defined(CIRCLE_BACK_BUTTON)
+#define GetBackJustUp GetCircleJustUp
+#define GetBackJustDown GetCircleJustDown
+#else
+#define GetBackJustUp GetSquareJustUp
+#define GetBackJustDown GetSquareJustDown
+#endif
+
+#ifdef MAP_ENHANCEMENTS
+CVector2D mapCrosshair;
+#endif
+
+#ifdef CUTSCENE_BORDERS_SWITCH
+bool CMenuManager::m_PrefsCutsceneBorders = true;
+#endif
+
+bool holdingScrollBar; // *(bool*)0x7039B9; // not original name
+
+CMenuManager FrontEndMenuManager;
+MenuTrapezoid menuBg(CGeneral::GetRandomNumber() % 40 + 65, CGeneral::GetRandomNumber() % 40 + 21,
+	CGeneral::GetRandomNumber() % 40 + 568, CGeneral::GetRandomNumber() % 40 + 44,
+	CGeneral::GetRandomNumber() % 40 + 36, CGeneral::GetRandomNumber() % 40 + 352,
+	CGeneral::GetRandomNumber() % 40 + 593, CGeneral::GetRandomNumber() % 40 + 312);
+
+MenuTrapezoid menuOptionHighlight(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f);
+
+#ifndef MASTER
+bool CMenuManager::m_PrefsMarketing = false;
+bool CMenuManager::m_PrefsDisableTutorials = false;
+#endif // !MASTER
+
+#ifdef GAMEPAD_MENU
+uint32 TimeToStopPadShaking;
+#endif
+
+const char* FrontendFilenames[][2] = {
+	{"background", ""},
+	{"vc_logo", "vc_logom"},
+	{"mouse", "mousea"},
+	{"mapTop01", "mapTop01A"},
+	{"mapTop02", "mapTop02A"},
+	{"mapTop03", "mapTop03A"},
+	{"mapMid01", "mapMid01A"},
+	{"mapMid02", "mapMid02A"},
+	{"mapMid03", "mapMid03A"},
+	{"mapBot01", "mapBot01A"},
+	{"mapBot02", "mapBot02A"},
+	{"mapBot03", "mapBot03A"},
+	{"wildstyle", "wildstyleA"},
+	{"flash", "flashA"},
+	{"kchat", "kchatA"},
+	{"fever", "feverA"},
+	{"vrock", "vrockA"},
+	{"vcpr", "vcprA"},
+	{"espantoso", "espantosoA"},
+	{"emotion", "emotionA"},
+	{"wave103", "wave103A"},
+	{"mp3", "mp3A"},
+	{"downOff", "buttonA"},
+	{"downOn", "buttonA"},
+	{"upOff", "buttonA"},
+	{"upOn", "buttonA"},
+#ifdef GAMEPAD_MENU
+	{"fe_controller", "" },
+	{"fe_arrows1", "" },
+	{"fe_arrows2", "" },
+	{"fe_arrows3", "" },
+	{"fe_arrows4", "" },
+#endif
+};
+
+#define MENU_X_RIGHT_ALIGNED(x) SCALE_AND_CENTER_X(DEFAULT_SCREEN_WIDTH - (x))
+
+#ifdef ASPECT_RATIO_SCALE
+// All of the defines below replace the StretchX function. Otherwise use SCREEN_SCALE_X.
+#define MENU_X_LEFT_ALIGNED(x) SCALE_AND_CENTER_X(x)
+#define MENU_X(x) SCREEN_SCALE_X(x)
+#define MENU_Y(y) SCREEN_SCALE_Y(y)
+#else
+#define MENU_X_LEFT_ALIGNED(x) StretchX(x)
+#define MENU_X(x) StretchX(x)
+#define MENU_Y(y) StretchY(y)
+#endif
+
+#ifdef XBOX_MESSAGE_SCREEN
+bool CMenuManager::m_bDialogOpen = false;
+uint32 CMenuManager::m_nDialogHideTimer = 0;
+PauseModeTime CMenuManager::m_nDialogHideTimerPauseMode = 0;
+bool CMenuManager::m_bSaveWasSuccessful = false;
+wchar* CMenuManager::m_pDialogText = nil;
+#endif
+
+#define SET_FONT_FOR_MENU_HEADER \
+	CFont::SetRightJustifyOn(); \
+	CFont::SetFontStyle(FONT_LOCALE(FONT_HEADING)); \
+	CFont::SetScale(MENU_X(MENUHEADER_WIDTH), MENU_Y(MENUHEADER_HEIGHT)); \
+	CFont::SetDropShadowPosition(0);
+
+#define SET_FONT_FOR_LIST_ITEM \
+	CFont::SetRightJustifyOff(); \
+	CFont::SetScale(MENU_X(LISTITEM_X_SCALE), MENU_Y(LISTITEM_Y_SCALE)); \
+	CFont::SetFontStyle(FONT_LOCALE(FONT_STANDARD));
+
+#define RESET_FONT_FOR_NEW_PAGE \
+	CFont::SetBackgroundOff(); \
+	CFont::SetScale(MENU_X(MENUACTION_SCALE_MULT), MENU_Y(MENUACTION_SCALE_MULT)); \
+	CFont::SetPropOn(); \
+	CFont::SetCentreOff(); \
+	CFont::SetJustifyOn(); \
+	CFont::SetRightJustifyOff(); \
+	CFont::SetBackGroundOnlyTextOn(); \
+	CFont::SetWrapx(MENU_X_RIGHT_ALIGNED(MENU_X_MARGIN)); \
+	CFont::SetRightJustifyWrap(MENU_X_LEFT_ALIGNED(MENU_X_MARGIN));
+
+#define ProcessSlider(value, origY, increaseAction, decreaseAction, hoverEndX, onlyWhenHoveringRow) \
+	do { \
+		float y = origY MINUS_SCROLL_OFFSET; \
+		lastActiveBarX = DisplaySlider(MENU_X_LEFT_ALIGNED(MENUSLIDER_X), MENU_Y(y), MENU_Y(MENUSLIDER_SMALLEST_BAR), MENU_Y(MENUSLIDER_BIGGEST_BAR), MENU_X(MENUSLIDER_UNK), value, MENU_X(3.0f)); \
+		if (i != m_nCurrOption || !itemsAreSelectable) \
+			break; \
+		 \
+		if (CheckHover(0, lastActiveBarX - MENU_X(3.0f), MENU_Y(y), MENU_Y(MENUSLIDER_BIGGEST_BAR + y))) { \
+			m_nHoverOption = decreaseAction; \
+			break; \
+		} \
+		if (!CheckHover(MENU_X(3.0f) + lastActiveBarX, hoverEndX, MENU_Y(y), MENU_Y(MENUSLIDER_BIGGEST_BAR + y))) { \
+			m_nHoverOption = HOVEROPTION_NOT_HOVERING; \
+			break; \
+		} \
+		m_nHoverOption = increaseAction; \
+		if (m_nMousePosX < MENU_X_LEFT_ALIGNED(MENUSLIDER_X)) \
+			m_nHoverOption = HOVEROPTION_NOT_HOVERING; \
+		\
+		if (onlyWhenHoveringRow && (m_nMousePosY < MENU_Y(y) || m_nMousePosY > MENU_Y(MENUSLIDER_BIGGEST_BAR + y))) \
+			m_nHoverOption = HOVEROPTION_NOT_HOVERING; \
+	} while(0)
+
+// --- Functions not in the game/inlined starts
+
+inline void
+CMenuManager::ScrollUpListByOne() 
+{
+	if (m_nSelectedListRow == m_nFirstVisibleRowOnList) {
+		if (m_nFirstVisibleRowOnList > 0) {
+			m_nSelectedListRow--;
+			m_nFirstVisibleRowOnList--;
+			m_nScrollbarTopMargin -= SCROLLBAR_MAX_HEIGHT / m_nTotalListRow;
+		}
+	} else {
+		m_nSelectedListRow--;
+	}
+}
+
+inline void
+CMenuManager::ScrollDownListByOne()
+{
+	if (m_nSelectedListRow == m_nFirstVisibleRowOnList + MAX_VISIBLE_OPTION_ON_SCREEN - 1) {
+		if (m_nFirstVisibleRowOnList < m_nTotalListRow - MAX_VISIBLE_OPTION_ON_SCREEN) {
+			m_nSelectedListRow++;
+			m_nFirstVisibleRowOnList++;
+			m_nScrollbarTopMargin += SCROLLBAR_MAX_HEIGHT / m_nTotalListRow;
+		}
+	} else {
+		if (m_nSelectedListRow < m_nTotalListRow - 1) {
+			m_nSelectedListRow++;
+		}
+	}
+}
+
+inline void
+CMenuManager::PageUpList(bool playSoundOnSuccess)
+{
+	if (m_nTotalListRow > MAX_VISIBLE_OPTION_ON_SCREEN) {
+		if (m_nFirstVisibleRowOnList > 0) {
+			if(playSoundOnSuccess)
+				DMAudio.PlayFrontEndSound(SOUND_FRONTEND_HIGHLIGHT_OPTION, 0);
+
+			m_nFirstVisibleRowOnList = Max(0, m_nFirstVisibleRowOnList - MAX_VISIBLE_OPTION_ON_SCREEN);
+			m_nSelectedListRow = Min(m_nSelectedListRow, m_nFirstVisibleRowOnList + MAX_VISIBLE_OPTION_ON_SCREEN - 1);
+		} else {
+			m_nFirstVisibleRowOnList = 0;
+			m_nSelectedListRow = 0;
+		}
+		m_nScrollbarTopMargin = (SCROLLBAR_MAX_HEIGHT / m_nTotalListRow) * m_nFirstVisibleRowOnList;
+	}
+}
+
+inline void
+CMenuManager::PageDownList(bool playSoundOnSuccess)
+{
+	if (m_nTotalListRow > MAX_VISIBLE_OPTION_ON_SCREEN) {
+		if (m_nFirstVisibleRowOnList < m_nTotalListRow - MAX_VISIBLE_OPTION_ON_SCREEN) {
+			if(playSoundOnSuccess)
+				DMAudio.PlayFrontEndSound(SOUND_FRONTEND_HIGHLIGHT_OPTION, 0);
+
+			m_nFirstVisibleRowOnList = Min(m_nFirstVisibleRowOnList + MAX_VISIBLE_OPTION_ON_SCREEN, m_nTotalListRow - MAX_VISIBLE_OPTION_ON_SCREEN);
+			m_nSelectedListRow = Max(m_nSelectedListRow, m_nFirstVisibleRowOnList);
+		} else {
+			m_nFirstVisibleRowOnList = m_nTotalListRow - MAX_VISIBLE_OPTION_ON_SCREEN;
+			m_nSelectedListRow = m_nTotalListRow - 1;
+		}
+		m_nScrollbarTopMargin = (SCROLLBAR_MAX_HEIGHT / m_nTotalListRow) * m_nFirstVisibleRowOnList;
+	}
+}
+
+#ifdef CUSTOM_FRONTEND_OPTIONS
+#define PLUS_LINE_HEIGHT_ON_SCREEN + (aScreens[m_nCurrScreen].layout ? aScreens[m_nCurrScreen].layout->lineHeight : MENU_DEFAULT_LINE_HEIGHT)
+bool ScreenHasOption(int screen, const char* gxtKey)
+{
+	for (int i = 0; i < NUM_MENUROWS; i++) {
+		if (strcmp(gxtKey, aScreens[screen].m_aEntries[i].m_EntryName) == 0)
+			return true;
+	}
+	return false;
+}
+
+inline void
+CMenuManager::ThingsToDoBeforeLeavingPage()
+{
+	if ((m_nCurrScreen == MENUPAGE_SKIN_SELECT) && strcmp(m_aSkinName, m_PrefsSkinFile) != 0) {
+		CWorld::Players[0].SetPlayerSkin(m_PrefsSkinFile);
+
+	} else if (m_nCurrScreen == MENUPAGE_SOUND_SETTINGS) {
+		if (m_nPrefsAudio3DProviderIndex != NO_AUDIO_PROVIDER)
+			m_nPrefsAudio3DProviderIndex = DMAudio.GetCurrent3DProviderIndex();
+
+		DMAudio.StopFrontEndTrack();
+		OutputDebugString("FRONTEND AUDIO TRACK STOPPED");
+
+	} else if (ScreenHasOption(m_nCurrScreen, "FED_RES")) {
+		m_nDisplayVideoMode = m_nPrefsVideoMode;
+	}
+
+	if (m_nCurrScreen == MENUPAGE_SKIN_SELECT) {
+		CPlayerSkin::EndFrontendSkinEdit();
+	}
+
+#ifdef SCROLLABLE_PAGES
+	if (SCREEN_HAS_AUTO_SCROLLBAR) {
+		m_nSelectedListRow = 0;
+		m_nFirstVisibleRowOnList = 0;
+		m_nScrollbarTopMargin = 0;
+	}
+#endif
+
+	CMenuScreenCustom::CMenuEntry &option = aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption];
+
+	if (option.m_Action == MENUACTION_CFO_DYNAMIC)
+		if(option.m_CFODynamic->buttonPressFunc)
+			option.m_CFODynamic->buttonPressFunc(FEOPTION_ACTION_FOCUSLOSS);
+
+	if (option.m_Action == MENUACTION_CFO_SELECT && option.m_CFOSelect->onlyApplyOnEnter && option.m_CFOSelect->lastSavedValue != option.m_CFOSelect->displayedValue)
+		option.m_CFOSelect->displayedValue = *option.m_CFO->value = option.m_CFOSelect->lastSavedValue;
+
+	if (aScreens[m_nCurrScreen].returnPrevPageFunc) {
+		aScreens[m_nCurrScreen].returnPrevPageFunc();
+	}
+}
+
+inline int8
+CMenuManager::GetPreviousPageOption()
+{
+	int8 prevPage = !m_bGameNotLoaded ? aScreens[m_nCurrScreen].m_PreviousPage :
+		(m_nCurrScreen == MENUPAGE_NEW_GAME || m_nCurrScreen == MENUPAGE_OPTIONS || m_nCurrScreen == MENUPAGE_EXIT ? MENUPAGE_START_MENU : aScreens[m_nCurrScreen].m_PreviousPage);
+
+	if (prevPage == -1) // Game also does same
+		return 0;
+
+	prevPage = prevPage == MENUPAGE_NONE ? (!m_bGameNotLoaded ? MENUPAGE_PAUSE_MENU : MENUPAGE_START_MENU) : prevPage;
+
+	for (int i = 0; i < NUM_MENUROWS; i++) {
+		if (aScreens[prevPage].m_aEntries[i].m_Action >= MENUACTION_NOTHING) { // CFO check
+			if (aScreens[prevPage].m_aEntries[i].m_TargetMenu == m_nCurrScreen) {
+				return i;
+			}
+		}
+	}
+	
+	// This shouldn't happen
+	return 0;
+}
+
+#else
+#define PLUS_LINE_HEIGHT_ON_SCREEN + MENU_DEFAULT_LINE_HEIGHT
+inline void
+CMenuManager::ThingsToDoBeforeLeavingPage()
+{
+	switch (m_nCurrScreen) {
+		case MENUPAGE_SOUND_SETTINGS:
+			if (m_nPrefsAudio3DProviderIndex != NO_AUDIO_PROVIDER)
+				m_nPrefsAudio3DProviderIndex = DMAudio.GetCurrent3DProviderIndex();
+
+			DMAudio.StopFrontEndTrack();
+			OutputDebugString("FRONTEND AUDIO TRACK STOPPED");
+			break;
+		case MENUPAGE_DISPLAY_SETTINGS:
+			m_nDisplayVideoMode = m_nPrefsVideoMode;
+			break;
+		case MENUPAGE_SKIN_SELECT:
+			if (strcmp(m_aSkinName, m_PrefsSkinFile) != 0)
+				CWorld::Players[0].SetPlayerSkin(m_PrefsSkinFile);
+
+			CPlayerSkin::EndFrontendSkinEdit();
+			break;
+	}
+
+#ifdef SCROLLABLE_PAGES
+	if (SCREEN_HAS_AUTO_SCROLLBAR) {
+		m_nSelectedListRow = 0;
+		m_nFirstVisibleRowOnList = 0;
+		m_nScrollbarTopMargin = 0;
+	}
+#endif
+}
+
+inline int8
+CMenuManager::GetPreviousPageOption()
+{
+	return (!m_bGameNotLoaded ? aScreens[m_nCurrScreen].m_ParentEntry :
+		(m_nCurrScreen == MENUPAGE_NEW_GAME ? 0 : (m_nCurrScreen == MENUPAGE_OPTIONS ? 1 : (m_nCurrScreen == MENUPAGE_EXIT ? 2 : aScreens[m_nCurrScreen].m_ParentEntry))));
+}
+#endif
+
+// ------ Functions not in the game/inlined ends
+
+bool DoRWStuffStartOfFrame(int16 TopRed, int16 TopGreen, int16 TopBlue, int16 BottomRed, int16 BottomGreen, int16 BottomBlue, int16 Alpha);
+void DoRWStuffEndOfFrame(void);
+
+void
+CMenuManager::SwitchToNewScreen(int8 screen)
+{
+	bMenuChangeOngoing = true;
+	DoRWStuffStartOfFrame(0, 0, 0, 0, 0, 0, 255);
+	DrawBackground(true);
+	DoRWStuffEndOfFrame();
+	DoRWStuffStartOfFrame(0, 0, 0, 0, 0, 0, 255);
+	DrawBackground(true);
+	DoRWStuffEndOfFrame();
+	m_nPrevScreen = m_nCurrScreen;
+	m_ShowEmptyBindingError = false;
+	ResetHelperText();
+
+	ThingsToDoBeforeLeavingPage();
+
+	if (screen == -2) {
+		int oldScreen = aScreens[m_nCurrScreen].m_PreviousPage;
+		int oldOption = GetPreviousPageOption();
+
+		m_nCurrOption = oldOption;
+		m_nCurrScreen = oldScreen;
+	} else if (screen == 0) {
+		m_nCurrScreen = aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_TargetMenu;
+		m_nCurrOption = 0;
+	} else {
+		m_nCurrOption = 0;
+		m_nCurrScreen = screen;
+	}
+	SETUP_SCROLLING(m_nCurrScreen)
+	
+	if (hasNativeList(m_nPrevScreen))
+		m_nTotalListRow = 0;
+
+	if (m_nCurrScreen == MENUPAGE_CHOOSE_SAVE_SLOT)
+		m_nCurrOption = 8;
+	m_nMenuFadeAlpha = 0;
+	m_nOptionHighlightTransitionBlend = 0;
+	m_LastScreenSwitch = CTimer::GetTimeInMillisecondsPauseMode();
+}
+
+CMenuManager::CMenuManager()
+{
+	m_StatsScrollSpeed = 150.0f;
+	m_StatsScrollDirection = 1;
+	m_PrefsSfxVolume = 49;
+	m_PrefsMusicVolume = 49;
+	m_PrefsRadioStation = 0;
+	m_PrefsStereoMono = 1;
+	m_PrefsBrightness = 256;
+	m_PrefsLOD = CRenderer::ms_lodDistScale;
+	m_KeyPressedCode = -1;
+	m_bFrontEnd_ReloadObrTxtGxt = false;
+	m_PrefsMP3BoostVolume = 0;
+	m_PrefsShowSubtitles = 0;
+	m_PrefsShowLegends = 1;
+#ifdef ASPECT_RATIO_SCALE
+	m_PrefsUseWideScreen = AR_AUTO;
+#else
+	m_PrefsUseWideScreen = 0;
+#endif
+	m_PrefsVsync = 0;
+	m_PrefsVsyncDisp = 1;
+	m_PrefsFrameLimiter = 1;
+	m_PrefsLanguage = 0;
+	field_54 = 0;
+	m_PrefsAllowNastyGame = 1;
+	m_PrefsSpeakers = 0;
+	field_8 = 0;
+	m_PrefsUseVibration = 0;
+	m_PrefsShowHud = 1;
+	m_PrefsRadarMode = 0;
+	m_DisplayControllerOnFoot = false;
+	m_bShutDownFrontEndRequested = false;
+	m_bStartUpFrontEndRequested = false;
+	pEditString = nil;
+	pControlEdit = nil;
+	DisplayComboButtonErrMsg = false;
+	m_PrefsDMA = 1;
+	OS_Language = LANG_ENGLISH;
+	m_ControlMethod = CONTROL_STANDARD;
+#ifdef PC_PLAYER_CONTROLS
+	CCamera::m_bUseMouse3rdPerson = true;
+#else
+	CCamera::m_bUseMouse3rdPerson = false;
+#endif
+	m_lastWorking3DAudioProvider = 0;
+	m_nFirstVisibleRowOnList = 0;
+	m_nScrollbarTopMargin = 0.0f;
+	m_nSelectedListRow = 0;
+	m_nSkinsTotal = 0;
+	m_nPrefsAudio3DProviderIndex = AUDIO_PROVIDER_NOT_DETERMINED;
+	m_bGameNotLoaded = true;
+	m_nMousePosX = m_nMouseTempPosX;
+	m_nMousePosY = m_nMouseTempPosY;
+	m_nMouseOldPosX = m_nMousePosX;
+	m_nMouseOldPosY = m_nMousePosY;
+	m_bShowMouse = true;
+	m_nHoverOption = HOVEROPTION_NOT_HOVERING;
+
+	DMAudio.SetMP3BoostVolume(m_PrefsMP3BoostVolume);
+	m_bMenuActive = false;
+	m_bActivateSaveMenu = false;
+	m_bWantToLoad = false;
+	m_nMenuFadeAlpha = 0;
+	m_OnlySaveMenu = false;
+	m_fMapSize = MENU_Y(162.0f); // Y because of HOR+
+	m_fMapCenterX = MENU_X_LEFT_ALIGNED(320.0f);
+	m_fMapCenterY = MENU_Y(225.0f);
+	DMAudio.SetMusicMasterVolume(m_PrefsMusicVolume);
+	DMAudio.SetEffectsMasterVolume(m_PrefsSfxVolume);
+
+#ifdef NO_ISLAND_LOADING
+	m_PrefsIslandLoading = ISLAND_LOADING_LOW;
+#endif
+
+#ifdef GAMEPAD_MENU
+	m_PrefsControllerType = CONTROLLER_XBOXONE;
+#endif
+}
+
+void
+CMenuManager::SetFrontEndRenderStates(void)
+{
+	RwRenderStateSet(rwRENDERSTATETEXTUREFILTER, (void*)rwFILTERLINEAR);
+	RwRenderStateSet(rwRENDERSTATETEXTUREADDRESS, (void*)rwTEXTUREADDRESSCLAMP);
+	RwRenderStateSet(rwRENDERSTATEZTESTENABLE, (void*)FALSE);
+	RwRenderStateSet(rwRENDERSTATEZWRITEENABLE, (void*)FALSE);
+	RwRenderStateSet(rwRENDERSTATESRCBLEND, (void*)rwBLENDSRCALPHA);
+	RwRenderStateSet(rwRENDERSTATEDESTBLEND, (void*)rwBLENDINVSRCALPHA);
+	RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void*)TRUE);
+}
+
+void
+CMenuManager::Initialise(void)
+{
+	DoRWStuffStartOfFrame(0, 0, 0, 0, 0, 0, 255);
+	DoRWStuffEndOfFrame();
+	m_AllowNavigation = false;
+	m_firstStartCounter = -50; // to start from black
+	m_nMenuFadeAlpha = 0;
+	m_nCurrOption = 0;
+	m_nOptionHighlightTransitionBlend = 0;
+	CentreMousePointer();
+	m_bShowMouse = true;
+	m_fMapSize = MENU_Y(162.0f); // Y because of HOR+
+	m_fMapCenterX = MENU_X_LEFT_ALIGNED(320.0f);
+	m_fMapCenterY = MENU_Y(225.0f);
+	CPad::StopPadsShaking();
+	if (!m_OnlySaveMenu)
+		m_nCurrScreen = MENUPAGE_NONE;
+	DMAudio.ChangeMusicMode(MUSICMODE_FRONTEND);
+	DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_STARTING, 0);
+	DMAudio.Service();
+	DMAudio.SetMusicMasterVolume(m_PrefsMusicVolume);
+	DMAudio.SetEffectsMasterVolume(m_PrefsSfxVolume);
+#ifdef FIX_BUGS
+	static bool firstTime = true;
+	if (firstTime) {
+		DMAudio.SetRadioInCar(m_PrefsRadioStation);
+		firstTime = false;
+	} else
+#endif
+	m_PrefsRadioStation = DMAudio.GetRadioInCar();
+
+	DMAudio.SetMP3BoostVolume(m_PrefsMP3BoostVolume);
+	if (DMAudio.IsMP3RadioChannelAvailable()) {
+		if (m_PrefsRadioStation < WILDSTYLE || m_PrefsRadioStation > USERTRACK)
+			m_PrefsRadioStation = CGeneral::GetRandomNumber() % (USERTRACK + 1);
+	} else if (m_PrefsRadioStation < WILDSTYLE || m_PrefsRadioStation > WAVE)
+		m_PrefsRadioStation = CGeneral::GetRandomNumber() % (WAVE + 1);
+
+	CFileMgr::SetDir("");
+	//CFileMgr::SetDir("");
+	PcSaveHelper.PopulateSlotInfo();
+	CTimer::StartUserPause();
+}
+
+void
+CMenuManager::CentreMousePointer()
+{
+	if (SCREEN_WIDTH * 0.5f != 0.0f && 0.0f != SCREEN_HEIGHT * 0.5f) {
+#if defined RW_D3D9 || defined RWLIBS
+		tagPOINT Point;
+		Point.x = SCREEN_WIDTH / 2;
+		Point.y = SCREEN_HEIGHT / 2;
+		ClientToScreen(PSGLOBAL(window), &Point);
+		SetCursorPos(Point.x, Point.y);
+#elif defined RW_GL3
+		glfwSetCursorPos(PSGLOBAL(window), SCREEN_WIDTH / 2, SCREEN_HEIGHT / 2);
+#endif
+
+		PSGLOBAL(lastMousePos.x) = SCREEN_WIDTH / 2;
+		PSGLOBAL(lastMousePos.y) = SCREEN_HEIGHT / 2;
+	}
+}
+
+void
+CMenuManager::CheckCodesForControls(int typeOfControl)
+{
+	DisplayComboButtonErrMsg = false;
+	bool invalidKey = false;
+	bool escPressed = false;
+	eControllerType typeToSave;
+	// GetStartOptionsCntrlConfigScreens();
+	e_ControllerAction action = (e_ControllerAction) m_CurrCntrlAction;
+
+	if (typeOfControl == KEYBOARD) {
+		if (*pControlEdit == rsESC) {
+			escPressed = true;
+		} else if (*pControlEdit != rsF1 && *pControlEdit != rsF2 && *pControlEdit != rsF3 && *pControlEdit != rsF9 &&
+			*pControlEdit != rsLWIN && *pControlEdit != rsRWIN && *pControlEdit != rsRALT) {
+			typeToSave = KEYBOARD;
+			if (ControlsManager.GetControllerKeyAssociatedWithAction(action, KEYBOARD) != rsNULL &&
+				*pControlEdit != ControlsManager.GetControllerKeyAssociatedWithAction(action, KEYBOARD)) {
+				typeToSave = OPTIONAL_EXTRA;
+			}
+		} else {
+			invalidKey = true;
+		}
+	} else if (typeOfControl == MOUSE) {
+		typeToSave = MOUSE;
+	} else if (typeOfControl == JOYSTICK) {
+		typeToSave = JOYSTICK;
+		if (ControlsManager.GetIsActionAButtonCombo(action))
+			DisplayComboButtonErrMsg = true;
+	}
+
+#ifdef FIX_BUGS
+	if(!escPressed && !invalidKey)
+#endif
+		ControlsManager.ClearSettingsAssociatedWithAction(action, typeToSave);
+
+	if (!DisplayComboButtonErrMsg && !escPressed && !invalidKey) {
+		if (typeOfControl == KEYBOARD) {
+			ControlsManager.DeleteMatchingActionInitiators(action, *pControlEdit, KEYBOARD);
+			ControlsManager.DeleteMatchingActionInitiators(action, *pControlEdit, OPTIONAL_EXTRA);
+		} else if (typeOfControl == MOUSE) {
+			ControlsManager.DeleteMatchingActionInitiators(action, MouseButtonJustClicked, MOUSE);
+		} else if (typeOfControl == JOYSTICK) {
+			ControlsManager.DeleteMatchingActionInitiators(action, JoyButtonJustClicked, JOYSTICK);
+		}
+
+		if (typeOfControl == KEYBOARD) {
+			ControlsManager.SetControllerKeyAssociatedWithAction(action, *pControlEdit, typeToSave);
+		} else if (typeOfControl == MOUSE) {
+			ControlsManager.SetControllerKeyAssociatedWithAction(action, MouseButtonJustClicked, typeToSave);
+		} else if (typeOfControl == JOYSTICK) {
+			ControlsManager.SetControllerKeyAssociatedWithAction(action, JoyButtonJustClicked, typeToSave);
+		}
+		pControlEdit = nil;
+		m_bWaitingForNewKeyBind = false;
+		m_KeyPressedCode = -1;
+		m_bStartWaitingForKeyBind = false;
+#ifdef LOAD_INI_SETTINGS
+		SaveINIControllerSettings();
+#else
+		SaveSettings();
+#endif
+	}
+}
+
+bool
+CMenuManager::CheckHover(int x1, int x2, int y1, int y2)
+{
+	return m_nMousePosX > x1 && m_nMousePosX < x2 &&
+	       m_nMousePosY > y1 && m_nMousePosY < y2;
+}
+
+void
+CMenuManager::CheckSliderMovement(int value)
+{
+	switch (aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_Action) {
+	case MENUACTION_BRIGHTNESS:
+		m_PrefsBrightness += value * 24.19f;
+		m_PrefsBrightness = clamp(m_PrefsBrightness, 0, 384);
+		break;
+	case MENUACTION_DRAWDIST:
+		if(value > 0)
+			m_PrefsLOD += ((1.8f - 0.925f) / 16.0f);
+		else
+			m_PrefsLOD -= ((1.8f - 0.925f) / 16.0f);
+		m_PrefsLOD = clamp(m_PrefsLOD, 0.925f, 1.8f);
+		CRenderer::ms_lodDistScale = m_PrefsLOD;
+		break;
+	case MENUACTION_MUSICVOLUME:
+		if (m_nPrefsAudio3DProviderIndex != NO_AUDIO_PROVIDER) {
+			m_PrefsMusicVolume += value * (128 / 32);
+			m_PrefsMusicVolume = clamp(m_PrefsMusicVolume, 0, 65);
+			DMAudio.SetMusicMasterVolume(m_PrefsMusicVolume);
+		}
+		break;
+	case MENUACTION_SFXVOLUME:
+		if (m_nPrefsAudio3DProviderIndex != NO_AUDIO_PROVIDER) {
+			m_PrefsSfxVolume += value * (128 / 32);
+			m_PrefsSfxVolume = clamp(m_PrefsSfxVolume, 0, 65);
+			DMAudio.SetEffectsMasterVolume(m_PrefsSfxVolume);
+		}
+		break;
+	case MENUACTION_MP3VOLUMEBOOST:
+		if (m_nPrefsAudio3DProviderIndex != NO_AUDIO_PROVIDER) {
+			if (DMAudio.IsMP3RadioChannelAvailable()) {
+				m_PrefsMP3BoostVolume += value * (128 / 32);
+				m_PrefsMP3BoostVolume = clamp(m_PrefsMP3BoostVolume, 0, 65);
+				DMAudio.SetMP3BoostVolume(m_PrefsMP3BoostVolume);
+			}
+		}
+		break;
+	case MENUACTION_MOUSESENS:
+		TheCamera.m_fMouseAccelHorzntl += value * 1.0f/200.0f/15.0f;	// ???
+		TheCamera.m_fMouseAccelHorzntl = clamp(TheCamera.m_fMouseAccelHorzntl, 1.0f/3200.0f, 1.0f/200.0f);
+#ifdef FIX_BUGS
+		TheCamera.m_fMouseAccelVertical = TheCamera.m_fMouseAccelHorzntl + 0.0005f;
+#endif
+		break;
+	default:
+		return;
+	}
+	SaveSettings();
+}
+
+void
+CMenuManager::DisplayHelperText(char *text)
+{
+	if (m_nMenuFadeAlpha != 255)
+		return;
+
+	// there was a unused static bool
+	static PauseModeTime LastFlash = 0;
+	int32 alpha = 255;
+
+	CFont::SetRightJustifyOn();
+	CFont::SetScale(SCREEN_SCALE_X(SMALLESTTEXT_X_SCALE), SCREEN_SCALE_Y(SMALLESTTEXT_Y_SCALE));
+	CFont::SetFontStyle(FONT_LOCALE(FONT_STANDARD));
+	CFont::SetDropShadowPosition(0);
+
+	// We're using SCREEN_STRETCH_FROM_RIGHT, because we also stretch black borders
+	if (text) {
+		CFont::SetColor(CRGBA(255, 255, 255, 255));
+		CFont::PrintString(SCREEN_STRETCH_FROM_RIGHT(HELPER_TEXT_RIGHT_MARGIN), SCREEN_SCALE_FROM_BOTTOM(HELPER_TEXT_BOTTOM_MARGIN), TheText.Get(text));
+		return;
+	}
+
+	if (m_nHelperTextMsgId != 0 && m_nHelperTextMsgId != 1) {
+		if (CTimer::GetTimeInMillisecondsPauseMode() - LastFlash > 10) {
+			LastFlash = CTimer::GetTimeInMillisecondsPauseMode();
+			m_nHelperTextAlpha -= 2;
+		}
+
+		if (m_nHelperTextAlpha < 1)
+			ResetHelperText();
+
+		alpha = m_nHelperTextAlpha > 255 ? 255 : m_nHelperTextAlpha;
+	}
+
+	CFont::SetColor(CRGBA(255, 255, 255, alpha));
+	// TODO: name this cases?
+	switch (m_nHelperTextMsgId) {
+		case 1:
+			CFont::PrintString(SCREEN_STRETCH_FROM_RIGHT(HELPER_TEXT_RIGHT_MARGIN), SCREEN_SCALE_FROM_BOTTOM(HELPER_TEXT_BOTTOM_MARGIN), TheText.Get("FET_APP"));
+			break;
+		case 2:
+			CFont::PrintString(SCREEN_STRETCH_FROM_RIGHT(HELPER_TEXT_RIGHT_MARGIN), SCREEN_SCALE_FROM_BOTTOM(HELPER_TEXT_BOTTOM_MARGIN), TheText.Get("FET_HRD"));
+			break;
+		case 3:
+			CFont::PrintString(SCREEN_STRETCH_FROM_RIGHT(HELPER_TEXT_RIGHT_MARGIN), SCREEN_SCALE_FROM_BOTTOM(HELPER_TEXT_BOTTOM_MARGIN), TheText.Get("FET_RSO"));
+			break;
+		case 4:
+			CFont::PrintString(SCREEN_STRETCH_FROM_RIGHT(HELPER_TEXT_RIGHT_MARGIN), SCREEN_SCALE_FROM_BOTTOM(HELPER_TEXT_BOTTOM_MARGIN), TheText.Get("FET_STS"));
+			break;
+		case 5:
+			CFont::PrintString(SCREEN_STRETCH_FROM_RIGHT(HELPER_TEXT_RIGHT_MARGIN), SCREEN_SCALE_FROM_BOTTOM(HELPER_TEXT_BOTTOM_MARGIN), TheText.Get("FET_RSC"));
+			break;
+		default:
+			if (aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_Action == MENUACTION_NO)
+				return;
+
+			if (aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_Action == MENUACTION_MUSICVOLUME ||
+				aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_Action == MENUACTION_SFXVOLUME) {
+
+				CFont::PrintString(SCREEN_STRETCH_FROM_RIGHT(HELPER_TEXT_RIGHT_MARGIN), SCREEN_SCALE_FROM_BOTTOM(HELPER_TEXT_BOTTOM_MARGIN),
+					m_nPrefsAudio3DProviderIndex == NO_AUDIO_PROVIDER ? TheText.Get("FEH_NA") : TheText.Get("FET_MIG"));
+				return;
+			}
+
+			if (aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_Action == MENUACTION_KEYBOARDCTRLS)
+				return;
+
+			if (aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_Action == MENUACTION_SCREENRES) {
+				CFont::PrintString(SCREEN_STRETCH_FROM_RIGHT(HELPER_TEXT_RIGHT_MARGIN), SCREEN_SCALE_FROM_BOTTOM(HELPER_TEXT_BOTTOM_MARGIN),
+					m_bGameNotLoaded ? TheText.Get("FET_MIG") : TheText.Get("FEH_NA"));
+				return;
+			}
+
+			if (aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_Action == MENUACTION_AUDIOHW ||
+				aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_Action == MENUACTION_SPEAKERCONF) {
+
+				CFont::PrintString(SCREEN_STRETCH_FROM_RIGHT(HELPER_TEXT_RIGHT_MARGIN), SCREEN_SCALE_FROM_BOTTOM(HELPER_TEXT_BOTTOM_MARGIN),
+					m_nPrefsAudio3DProviderIndex == NO_AUDIO_PROVIDER ? TheText.Get("FEH_NA") : TheText.Get("FET_MIG"));
+				return;
+			}
+
+			if (aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_Action == MENUACTION_RESTOREDEF)
+				return;
+
+			if (aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_Action == MENUACTION_MP3VOLUMEBOOST) {
+				CFont::PrintString(SCREEN_STRETCH_FROM_RIGHT(HELPER_TEXT_RIGHT_MARGIN), SCREEN_SCALE_FROM_BOTTOM(HELPER_TEXT_BOTTOM_MARGIN),
+					m_nPrefsAudio3DProviderIndex == NO_AUDIO_PROVIDER ? TheText.Get("FEH_NA") : TheText.Get("FET_MIG"));
+				return;
+			}
+
+			CFont::PrintString(SCREEN_STRETCH_FROM_RIGHT(HELPER_TEXT_RIGHT_MARGIN), SCREEN_SCALE_FROM_BOTTOM(HELPER_TEXT_BOTTOM_MARGIN),
+				m_nCurrScreen != MENUPAGE_STATS ? TheText.Get("FET_MIG") : TheText.Get("FEH_SSA"));
+
+			break;
+	}
+}
+
+int
+CMenuManager::DisplaySlider(float x, float y, float mostLeftBarSize, float mostRightBarSize, float rectSize, float progress, float spacing) 
+{
+	CRGBA color;
+	float maxBarHeight;
+
+	int lastActiveBarX = 0;
+	float curBarX = 0.0f;
+	for (int i = 0; i < 16; i++) {
+		curBarX = i * rectSize/16.0f + x;
+
+		if (i / 16.0f + 1 / 32.0f < progress) {
+			color = CRGBA(SLIDERON_COLOR.r, SLIDERON_COLOR.g, SLIDERON_COLOR.b, FadeIn(255));
+			lastActiveBarX = curBarX;
+		} else
+			color = CRGBA(SLIDEROFF_COLOR.r, SLIDEROFF_COLOR.g, SLIDEROFF_COLOR.b, FadeIn(255));
+
+		maxBarHeight = Max(mostLeftBarSize, mostRightBarSize);
+
+		float curBarFreeSpace = ((16 - i) * mostLeftBarSize + i * mostRightBarSize) / 16.0f;
+		float left = curBarX;
+		float top = y + maxBarHeight - curBarFreeSpace;
+		float right = spacing + curBarX;
+		float bottom = y + maxBarHeight;
+		float shadowOffset = SCREEN_SCALE_X(2.0f);
+		CSprite2d::DrawRect(CRect(left + shadowOffset, top + shadowOffset, right + shadowOffset, bottom + shadowOffset), CRGBA(0, 0, 0, FadeIn(200))); // Shadow
+		CSprite2d::DrawRect(CRect(left, top, right, bottom), color);
+	}
+	return lastActiveBarX;
+}
+
+void
+CMenuManager::DoSettingsBeforeStartingAGame()
+{
+#ifdef LEGACY_MENU_OPTIONS
+	if (m_PrefsVsyncDisp != m_PrefsVsync)
+		m_PrefsVsync = m_PrefsVsyncDisp;
+#endif
+	DMAudio.DestroyAllGameCreatedEntities();
+	DMAudio.Service();
+	m_bShutDownFrontEndRequested = true;
+	m_bWantToRestart = true;
+	DMAudio.SetEffectsFadeVol(0);
+	DMAudio.SetMusicFadeVol(0);
+	for (int i = 0; i < NUM_RADIOS; i++)
+		CStats::FavoriteRadioStationList[i] = 0.0f;
+
+	SwitchMenuOnAndOff();
+	DMAudio.ResetTimers(CTimer::GetTimeInMilliseconds());
+}
+
+void
+CMenuManager::DrawStandardMenus(bool activeScreen)
+{
+	float nextYToUse = 0.0f; // III leftover, set but unused in VC
+	bool itemsAreSelectable = true;
+	CFont::SetBackgroundOff();
+	CFont::SetPropOn();
+	CFont::SetCentreOff();
+	CFont::SetJustifyOn();
+	CFont::SetBackGroundOnlyTextOff();
+
+#ifdef CUSTOM_FRONTEND_OPTIONS
+	const int xMargin = aScreens[m_nCurrScreen].layout && aScreens[m_nCurrScreen].layout->xMargin != 0 ? aScreens[m_nCurrScreen].layout->xMargin : MENU_X_MARGIN;
+#else
+	const int xMargin = MENU_X_MARGIN;
+#endif
+
+	CFont::SetWrapx(MENU_X_RIGHT_ALIGNED(xMargin));
+	CFont::SetRightJustifyWrap(MENU_X_LEFT_ALIGNED(xMargin));
+#ifdef ASPECT_RATIO_SCALE
+	CFont::SetCentreSize(SCREEN_SCALE_X(DEFAULT_SCREEN_WIDTH));
+#else
+	CFont::SetCentreSize(SCREEN_WIDTH);
+#endif
+
+	switch (m_nCurrScreen) {
+		case MENUPAGE_CHOOSE_LOAD_SLOT:
+		case MENUPAGE_CHOOSE_DELETE_SLOT:
+		case MENUPAGE_CHOOSE_SAVE_SLOT:
+			CSprite2d::Draw2DPolygon(MENU_X_LEFT_ALIGNED(38.0f), MENU_Y(85.0f),
+				MENU_X_LEFT_ALIGNED(615.0f), MENU_Y(75.0f),
+				MENU_X_LEFT_ALIGNED(30.0f), MENU_Y(320.0f), 
+				MENU_X_LEFT_ALIGNED(605.0f), MENU_Y(330.0f), CRGBA(LIST_BACKGROUND_COLOR.r, LIST_BACKGROUND_COLOR.g, LIST_BACKGROUND_COLOR.b, FadeIn(LIST_BACKGROUND_COLOR.a)));
+			break;
+		case MENUPAGE_SOUND_SETTINGS:
+			PrintRadioSelector();
+			break;
+		case MENUPAGE_STATS:
+			PrintStats();
+			break;
+		case MENUPAGE_BRIEFS:
+			PrintBriefs();
+			break;
+	}
+
+	// Page name
+	if (aScreens[m_nCurrScreen].m_ScreenName[0] != '\0') {
+
+		SET_FONT_FOR_MENU_HEADER
+		CFont::SetColor(CRGBA(30, 30, 30, FadeIn(255)));
+		CFont::PrintString(SCREEN_STRETCH_FROM_RIGHT(MENUHEADER_POS_X) - MENU_X(7.f), SCREEN_SCALE_Y(MENUHEADER_POS_Y + 7.f), TheText.Get(aScreens[m_nCurrScreen].m_ScreenName));
+
+		CFont::SetColor(CRGBA(HEADER_COLOR.r, HEADER_COLOR.g, HEADER_COLOR.b, FadeIn(255)));
+		CFont::PrintString(SCREEN_STRETCH_FROM_RIGHT(MENUHEADER_POS_X), SCREEN_SCALE_Y(MENUHEADER_POS_Y), TheText.Get(aScreens[m_nCurrScreen].m_ScreenName));
+	}
+
+	// Label
+	wchar *str;
+	if (aScreens[m_nCurrScreen].m_aEntries[0].m_Action == MENUACTION_LABEL) {
+		CFont::SetWrapx(MENU_X_RIGHT_ALIGNED(MENULABEL_X_MARGIN));
+		CFont::SetRightJustifyWrap(MENU_X_LEFT_ALIGNED(MENULABEL_X_MARGIN));
+		CFont::SetFontStyle(FONT_LOCALE(FONT_STANDARD));
+		CFont::SetScale(MENU_X(BIGTEXT2_X_SCALE), MENU_Y(BIGTEXT2_Y_SCALE));
+		CFont::SetRightJustifyOff();
+		CFont::SetDropShadowPosition(2);
+		CFont::SetDropColor(CRGBA(0, 0, 0, FadeIn(255)));
+		CFont::SetColor(CRGBA(LABEL_COLOR.r, LABEL_COLOR.g, LABEL_COLOR.b, FadeIn(255)));
+
+		switch (m_nCurrScreen) {
+		case MENUPAGE_LOAD_SLOT_CONFIRM:
+			if (m_bGameNotLoaded)
+				str = TheText.Get("FES_LCG");
+			else
+				str = TheText.Get(aScreens[m_nCurrScreen].m_aEntries[0].m_EntryName);
+			break;
+		case MENUPAGE_DELETE_SLOT_CONFIRM:
+			str = TheText.Get(aScreens[MENUPAGE_DELETE_SLOT_CONFIRM].m_aEntries[0].m_EntryName);
+			break;
+		case MENUPAGE_SAVE_OVERWRITE_CONFIRM:
+			if (Slots[m_nCurrSaveSlot] == SLOT_OK)
+				str = TheText.Get("FESZ_QO");
+			else if (Slots[m_nCurrSaveSlot] == SLOT_CORRUPTED)
+				str = TheText.Get("FESZ_QZ");
+			else
+				str = TheText.Get(aScreens[m_nCurrScreen].m_aEntries[0].m_EntryName);
+			break;
+		case MENUPAGE_EXIT:
+			if (m_bGameNotLoaded)
+				str = TheText.Get("FEQ_SRW");
+			else
+				str = TheText.Get(aScreens[m_nCurrScreen].m_aEntries[0].m_EntryName);
+			break;
+		default:
+			str = TheText.Get(aScreens[m_nCurrScreen].m_aEntries[0].m_EntryName);
+			break;
+		}
+
+		CFont::PrintString(MENU_X_LEFT_ALIGNED(100.0f), MENU_Y(97.0f), str);
+		CFont::SetWrapx(MENU_X_RIGHT_ALIGNED(xMargin));
+		CFont::SetRightJustifyWrap(MENU_X_LEFT_ALIGNED(xMargin));
+	}
+
+	if (m_nCurrScreen == MENUPAGE_KEYBOARD_CONTROLS) {
+		if (m_bWaitingForNewKeyBind)
+			itemsAreSelectable = false;
+
+		DrawControllerScreenExtraText(-8.0f, MENU_X_LEFT_ALIGNED(350), MENU_DEFAULT_LINE_HEIGHT);
+	}
+
+	wchar unicodeTemp[64];
+#ifdef ASPECT_RATIO_SCALE
+	char asciiTemp[32];
+#endif
+
+	bool weHaveLabel = aScreens[m_nCurrScreen].m_aEntries[0].m_Action == MENUACTION_LABEL;
+	uint8 section = 0; // 0: highlight trapezoid  1: texts
+
+	while (section < 2) {
+#endif
+
+#ifdef SCROLLABLE_PAGES
+		int firstOption = SCREEN_HAS_AUTO_SCROLLBAR ? m_nFirstVisibleRowOnList : 0;
+		int scrollOffset = aScreens[m_nCurrScreen].m_aEntries[firstOption].m_Y - aScreens[m_nCurrScreen].m_aEntries[0].m_Y;
+		for (int i = firstOption; i < firstOption + MAX_VISIBLE_OPTION && i < NUM_MENUROWS; ++i) {
+#else
+		for (int i = 0; i < NUM_MENUROWS; ++i) {
+#endif
+			wchar* rightText = nil;
+			wchar* leftText;
+			if (aScreens[m_nCurrScreen].m_aEntries[i].m_SaveSlot >= SAVESLOT_1 && aScreens[m_nCurrScreen].m_aEntries[i].m_SaveSlot <= SAVESLOT_8) {
+				CFont::SetColor(CRGBA(0, 0, 0, FadeIn(255)));
+				CFont::SetFontStyle(FONT_LOCALE(FONT_STANDARD));
+				CFont::SetScale(MENU_X(MEDIUMTEXT_X_SCALE), MENU_Y(MEDIUMTEXT_Y_SCALE));
+				CFont::SetDropShadowPosition(0);
+			} else {
+				CFont::SetFontStyle(FONT_LOCALE(FONT_HEADING));
+				CFont::SetScale(MENU_X(BIGTEXT_X_SCALE), MENU_Y(BIGTEXT_Y_SCALE));
+				CFont::SetDropShadowPosition(2);
+				CFont::SetDropColor(CRGBA(0, 0, 0, FadeIn(255)));
+				CFont::SetColor(CRGBA(MENUOPTION_COLOR.r, MENUOPTION_COLOR.g, MENUOPTION_COLOR.b, FadeIn(255)));
+			}
+			if (aScreens[m_nCurrScreen].m_aEntries[i].m_Align == MENUALIGN_LEFT) {
+				CFont::SetCentreOff();
+				CFont::SetRightJustifyOff();
+			} else if (aScreens[m_nCurrScreen].m_aEntries[i].m_Align == MENUALIGN_RIGHT) {
+				CFont::SetCentreOff();
+				CFont::SetRightJustifyOn();
+			} else {
+				CFont::SetRightJustifyOff();
+				CFont::SetCentreOn();
+			}
+			if (aScreens[m_nCurrScreen].m_aEntries[i].m_X == 0 && aScreens[m_nCurrScreen].m_aEntries[i].m_Y == 0) {
+				if (i == 0 || (i == 1 && weHaveLabel)) {
+#ifdef CUSTOM_FRONTEND_OPTIONS
+					aScreens[m_nCurrScreen].m_aEntries[i].m_X = (aScreens[m_nCurrScreen].layout ? aScreens[m_nCurrScreen].layout->startX : MENU_DEFAULT_CONTENT_X);
+					aScreens[m_nCurrScreen].m_aEntries[i].m_Y = (aScreens[m_nCurrScreen].layout ? aScreens[m_nCurrScreen].layout->startY : MENU_DEFAULT_CONTENT_Y);
+#else
+					aScreens[m_nCurrScreen].m_aEntries[i].m_X = MENU_DEFAULT_CONTENT_X;
+					aScreens[m_nCurrScreen].m_aEntries[i].m_Y = MENU_DEFAULT_CONTENT_Y;
+#endif
+					
+				} else {
+					aScreens[m_nCurrScreen].m_aEntries[i].m_X = aScreens[m_nCurrScreen].m_aEntries[i-1].m_X;
+					aScreens[m_nCurrScreen].m_aEntries[i].m_Y = aScreens[m_nCurrScreen].m_aEntries[i-1].m_Y PLUS_LINE_HEIGHT_ON_SCREEN;
+				}
+			}
+#ifdef CUSTOM_FRONTEND_OPTIONS
+			else if (aScreens[m_nCurrScreen].m_aEntries[i].m_Y == 0) {
+				aScreens[m_nCurrScreen].m_aEntries[i].m_Y = aScreens[m_nCurrScreen].m_aEntries[i-1].m_Y PLUS_LINE_HEIGHT_ON_SCREEN;
+			}
+#endif
+
+			if (aScreens[m_nCurrScreen].m_aEntries[i].m_Action != MENUACTION_LABEL && aScreens[m_nCurrScreen].m_aEntries[i].m_EntryName[0] != '\0') {
+
+				if (aScreens[m_nCurrScreen].m_aEntries[i].m_SaveSlot >= SAVESLOT_1 && aScreens[m_nCurrScreen].m_aEntries[i].m_SaveSlot <= SAVESLOT_8) {
+					CFont::SetRightJustifyOff();
+
+					leftText = nil;
+					if (Slots[i] == SLOT_OK) {
+						leftText = GetNameOfSavedGame(i);
+						rightText = GetSavedGameDateAndTime(i);
+					}
+
+					if (!leftText || leftText[0] == '\0') {
+						sprintf(gString, "FEM_SL%d", i + 1);
+						leftText = TheText.Get(gString);
+					}
+				} else {
+					leftText = TheText.Get(aScreens[m_nCurrScreen].m_aEntries[i].m_EntryName);
+				}
+
+				if (m_nPrefsAudio3DProviderIndex == NO_AUDIO_PROVIDER) {
+					if (strcmp(aScreens[m_nCurrScreen].m_aEntries[i].m_EntryName, "FEO_AUD") == 0) {
+						CFont::SetColor(CRGBA(DARKMENUOPTION_COLOR.r, DARKMENUOPTION_COLOR.g, DARKMENUOPTION_COLOR.b, FadeIn(255)));
+					}
+				}
+
+				switch (aScreens[m_nCurrScreen].m_aEntries[i].m_Action) {
+#ifdef GAMEPAD_MENU
+				case MENUACTION_CTRLVIBRATION:
+					if (m_PrefsUseVibration)
+						rightText = TheText.Get("FEM_ON");
+					else
+						rightText = TheText.Get("FEM_OFF");
+					break;
+				case MENUACTION_CTRLCONFIG:
+					switch (CPad::GetPad(0)->Mode) {
+					case 0:
+						rightText = TheText.Get("FEC_CF1");
+						break;
+					case 1:
+						rightText = TheText.Get("FEC_CF2");
+						break;
+					case 2:
+						rightText = TheText.Get("FEC_CF3");
+						break;
+					case 3:
+						rightText = TheText.Get("FEC_CF4");
+						break;
+					}
+					break;
+				// This one is still in enum and ProcessOnOffMenuOptions, but removed from other places
+				case MENUACTION_CTRLDISPLAY:
+					if (m_DisplayControllerOnFoot)
+						rightText = TheText.Get("FEC_ONF");
+					else
+						rightText = TheText.Get("FEC_INC");
+					break;
+#endif
+				case MENUACTION_FRAMESYNC:
+					rightText = TheText.Get(m_PrefsVsyncDisp ? "FEM_ON" : "FEM_OFF");
+					break;
+				case MENUACTION_FRAMELIMIT:
+					rightText = TheText.Get(m_PrefsFrameLimiter ? "FEM_ON" : "FEM_OFF");
+					break;
+				case MENUACTION_TRAILS:
+					rightText = TheText.Get(CMBlur::BlurOn ? "FEM_ON" : "FEM_OFF");
+					break;
+				case MENUACTION_SUBTITLES:
+					rightText = TheText.Get(m_PrefsShowSubtitles ? "FEM_ON" : "FEM_OFF");
+					break;
+				case MENUACTION_WIDESCREEN:
+#ifndef ASPECT_RATIO_SCALE
+					rightText = TheText.Get(m_PrefsUseWideScreen ? "FEM_ON" : "FEM_OFF");
+#else
+					switch (m_PrefsUseWideScreen) {
+					case AR_AUTO:
+						rightText = TheText.Get("FEM_AUT");
+						break;
+					case AR_4_3:
+						sprintf(asciiTemp, "4:3");
+						AsciiToUnicode(asciiTemp, unicodeTemp);
+						rightText = unicodeTemp;
+						break;
+					case AR_5_4:
+						sprintf(asciiTemp, "5:4");
+						AsciiToUnicode(asciiTemp, unicodeTemp);
+						rightText = unicodeTemp;
+						break;
+					case AR_16_10:
+						sprintf(asciiTemp, "16:10");
+						AsciiToUnicode(asciiTemp, unicodeTemp);
+						rightText = unicodeTemp;
+						break;
+					case AR_16_9:
+						sprintf(asciiTemp, "16:9");
+						AsciiToUnicode(asciiTemp, unicodeTemp);
+						rightText = unicodeTemp;
+						break;
+					case AR_21_9:
+						sprintf(asciiTemp, "21:9");
+						AsciiToUnicode(asciiTemp, unicodeTemp);
+						rightText = unicodeTemp;
+						break;
+					}
+#endif
+					break;
+
+				case MENUACTION_MUSICVOLUME:
+				case MENUACTION_SFXVOLUME:
+					if (m_nPrefsAudio3DProviderIndex == NO_AUDIO_PROVIDER)
+						rightText = TheText.Get("FEA_NAH");
+
+					break;
+				case MENUACTION_RADIO:
+					switch (m_PrefsRadioStation) {
+						case WILDSTYLE:
+							rightText = TheText.Get("FEA_FM0");
+							break;
+						case FLASH_FM:
+							rightText = TheText.Get("FEA_FM1");
+							break;
+						case KCHAT:
+							rightText = TheText.Get("FEA_FM2");
+							break;
+						case FEVER:
+							rightText = TheText.Get("FEA_FM3");
+							break;
+						case V_ROCK:
+							rightText = TheText.Get("FEA_FM4");
+							break;
+						case VCPR:
+							rightText = TheText.Get("FEA_FM5");
+							break;
+						case RADIO_ESPANTOSO:
+							rightText = TheText.Get("FEA_FM6");
+							break;
+						case EMOTION:
+							rightText = TheText.Get("FEA_FM7");
+							break;
+						case WAVE:
+							rightText = TheText.Get("FEA_FM8");
+							break;
+						case USERTRACK:
+							rightText = TheText.Get("FEA_MP3");
+							break;
+					}
+					break;
+				case MENUACTION_LEGENDS:
+					rightText = TheText.Get(m_PrefsShowLegends ? "FEM_ON" : "FEM_OFF");
+					break;
+				case MENUACTION_RADARMODE:
+					switch (m_PrefsRadarMode) {
+						case 0:
+							rightText = TheText.Get("FED_RDM");
+							break;
+						case 1:
+							rightText = TheText.Get("FED_RDB");
+							break;
+						case 2:
+							rightText = TheText.Get("FEM_OFF");
+							break;
+					}
+					break;
+				case MENUACTION_HUD:
+					rightText = TheText.Get(m_PrefsShowHud ? "FEM_ON" : "FEM_OFF");
+					break;
+#ifdef LEGACY_MENU_OPTIONS
+				case MENUACTION_SETDBGFLAG:
+					rightText = TheText.Get(CTheScripts::IsDebugOn() ? "FEM_ON" : "FEM_OFF");
+					break;
+				case MENUACTION_SWITCHBIGWHITEDEBUGLIGHT:
+					rightText = TheText.Get(gbBigWhiteDebugLightSwitchedOn ? "FEM_ON" : "FEM_OFF");
+					break;
+				case MENUACTION_COLLISIONPOLYS:
+					rightText = TheText.Get(gbShowCollisionPolys ? "FEM_ON" : "FEM_OFF");
+					break;
+#endif
+				case MENUACTION_SHOWHEADBOB:
+					rightText = TheText.Get(TheCamera.m_bHeadBob ? "FEM_ON" : "FEM_OFF");
+					break;
+				case MENUACTION_INVVERT:
+					rightText = TheText.Get(MousePointerStateHelper.bInvertVertically ? "FEM_OFF" : "FEM_ON");
+					break;
+				case MENUACTION_SCREENRES:
+					AsciiToUnicode(_psGetVideoModeList()[m_nDisplayVideoMode], unicodeTemp);
+					rightText = unicodeTemp;
+
+					if (!m_bGameNotLoaded) {
+						CFont::SetColor(CRGBA(DARKMENUOPTION_COLOR.r, DARKMENUOPTION_COLOR.g, DARKMENUOPTION_COLOR.b, FadeIn(255)));
+					}
+					break;
+				case MENUACTION_AUDIOHW:
+					if (m_nPrefsAudio3DProviderIndex == NO_AUDIO_PROVIDER)
+						rightText = TheText.Get("FEA_NAH");
+					else if (m_nPrefsAudio3DProviderIndex == -1)
+						rightText = TheText.Get("FEA_ADP");
+					else {
+						char *rawProvider = DMAudio.Get3DProviderName(m_nPrefsAudio3DProviderIndex);
+						AsciiToUnicode(rawProvider, unicodeTemp);
+						char *provider = UnicodeToAscii(unicodeTemp); // genius
+						strupr(provider);
+						if (!strcmp(provider, "DIRECTSOUND3D HARDWARE SUPPORT")) {
+							strcpy(provider, "DSOUND3D HARDWARE SUPPORT");
+						} else if (!strcmp(provider, "DIRECTSOUND3D SOFTWARE EMULATION")) {
+							strcpy(provider, "DSOUND3D SOFTWARE EMULATION");
+						}
+						AsciiToUnicode(provider, unicodeTemp);
+						rightText = unicodeTemp;
+					}
+					break;
+				case MENUACTION_SPEAKERCONF: {
+					if (m_nPrefsAudio3DProviderIndex == NO_AUDIO_PROVIDER)
+						rightText = TheText.Get("FEA_NAH");
+					else {
+						switch (m_PrefsSpeakers) {
+						case 0:
+							rightText = TheText.Get("FEA_2SP");
+							break;
+						case 1:
+							rightText = TheText.Get("FEA_EAR");
+							break;
+						case 2:
+							rightText = TheText.Get("FEA_4SP");
+							break;
+						}
+					}
+					break;
+				}
+				case MENUACTION_CTRLMETHOD: {
+					switch (m_ControlMethod) {
+					case CONTROL_STANDARD:
+						leftText = TheText.Get("FET_STI");
+						break;
+					case CONTROL_CLASSIC:
+						leftText = TheText.Get("FET_CTI");
+						break;
+					}
+					break;
+				}
+				case MENUACTION_DYNAMICACOUSTIC:
+					rightText = TheText.Get(m_PrefsDMA ? "FEM_ON" : "FEM_OFF");
+					break;
+				case MENUACTION_MOUSESTEER:
+					rightText = TheText.Get(CVehicle::m_bDisableMouseSteering ? "FEM_OFF" : "FEM_ON");
+					if (m_ControlMethod == CONTROL_CLASSIC) {
+						CFont::SetColor(CRGBA(DARKMENUOPTION_COLOR.r, DARKMENUOPTION_COLOR.g, DARKMENUOPTION_COLOR.b, FadeIn(255)));
+					}
+					break;
+				case MENUACTION_MP3VOLUMEBOOST:
+					if (!DMAudio.IsMP3RadioChannelAvailable()) {
+						rightText = TheText.Get("FEA_NM3");
+					}
+					break;
+#ifdef CUSTOM_FRONTEND_OPTIONS
+				case MENUACTION_CFO_DYNAMIC:
+				case MENUACTION_CFO_SELECT:
+					CMenuScreenCustom::CMenuEntry &option = aScreens[m_nCurrScreen].m_aEntries[i];
+					if (option.m_Action == MENUACTION_CFO_SELECT) {
+						if (option.m_CFOSelect->disableIfGameLoaded && !m_bGameNotLoaded)
+							CFont::SetColor(CRGBA(DARKMENUOPTION_COLOR.r, DARKMENUOPTION_COLOR.g, DARKMENUOPTION_COLOR.b, FadeIn(255)));
+
+						// To whom manipulate option.m_CFO->value of static options externally (like RestoreDef functions)
+						if (*option.m_CFO->value != option.m_CFOSelect->lastSavedValue)
+							option.m_CFOSelect->displayedValue = option.m_CFOSelect->lastSavedValue = *option.m_CFO->value;
+
+						if (option.m_CFOSelect->displayedValue >= option.m_CFOSelect->numRightTexts || option.m_CFOSelect->displayedValue < 0)
+							option.m_CFOSelect->displayedValue = 0;
+
+						rightText = TheText.Get(option.m_CFOSelect->rightTexts[option.m_CFOSelect->displayedValue]);
+
+					} else if (option.m_Action == MENUACTION_CFO_DYNAMIC) {
+						if (option.m_CFODynamic->drawFunc) {
+							bool isOptionDisabled = false;
+							rightText = option.m_CFODynamic->drawFunc(&isOptionDisabled, m_nCurrOption == i);
+							if (isOptionDisabled)
+								CFont::SetColor(CRGBA(DARKMENUOPTION_COLOR.r, DARKMENUOPTION_COLOR.g, DARKMENUOPTION_COLOR.b, FadeIn(255)));
+						}
+					}
+					break;
+#endif
+				}
+
+				// Highlight trapezoid
+				if (activeScreen && i == m_nCurrOption && itemsAreSelectable && section == 0) {
+
+					int leftXMax, rightXMin;
+
+					// FIX: Let's don't scale those so GetStringWidth can give us unscaled width, which will be handy to other calculations below that's done without scaling in mind,
+					//		and scaling will be done eventually.
+					// CFont::SetScale(MENU_X(BIGTEXT_X_SCALE), MENU_Y(BIGTEXT_Y_SCALE));
+					CFont::SetScale(BIGTEXT_X_SCALE, BIGTEXT_Y_SCALE);
+					
+					wchar *curOptionName = TheText.Get(aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_EntryName);
+					float curOptionWidth = CFont::GetStringWidth(curOptionName, true);
+
+					if (CFont::Details.centre) {
+						leftXMax = Max(0, aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_X - curOptionWidth / 2.f);
+						rightXMin = Min(DEFAULT_SCREEN_WIDTH, curOptionWidth / 2.f + aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_X);
+
+					} else if (!CFont::Details.rightJustify) {
+						leftXMax = aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_X;
+						rightXMin = Min(DEFAULT_SCREEN_WIDTH, curOptionWidth + aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_X);
+
+					} else {
+						leftXMax = Max(0, aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_X - curOptionWidth);
+						rightXMin = aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_X;
+					}
+					CFont::SetScale(MENU_X(BIGTEXT_X_SCALE), MENU_Y(BIGTEXT_Y_SCALE));
+
+					int action = aScreens[m_nCurrScreen].m_aEntries[i].m_Action;
+					int saveSlot = aScreens[m_nCurrScreen].m_aEntries[i].m_SaveSlot;
+					if (rightText || action == MENUACTION_DRAWDIST || action == MENUACTION_BRIGHTNESS || action == MENUACTION_MUSICVOLUME ||
+						action == MENUACTION_SFXVOLUME || action == MENUACTION_MP3VOLUMEBOOST || action == MENUACTION_MOUSESENS ||
+						saveSlot >= SAVESLOT_1 && saveSlot <= SAVESLOT_8) {
+						rightXMin = 600;
+						leftXMax = 40;
+					}
+
+					int y = aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_Y MINUS_SCROLL_OFFSET;
+					int topYMax = y;
+					uint32 bottomYMin = y + MENU_DEFAULT_LINE_HEIGHT - 7; // Decreasing is not recommended. Because this actually is dependent to font scale, not line height.
+
+					// Actually bottomRight and bottomLeft should be exchanged here(although this is original code).
+					// So this shows us either R* didn't use same struct for menu BG and highlight, or they just kept fields as x1,y1 etc. Yikes.
+
+					if (m_nOptionHighlightTransitionBlend == 0) {
+						if (m_firstStartCounter == 255 && m_nMenuFadeAlpha == 255 && !bMenuChangeOngoing) {
+							CSprite2d::Draw2DPolygon(MENU_X_LEFT_ALIGNED(menuOptionHighlight.topLeft_x), MENU_Y(menuOptionHighlight.topLeft_y),
+								MENU_X_LEFT_ALIGNED(menuOptionHighlight.topRight_x), MENU_Y(menuOptionHighlight.topRight_y),
+								MENU_X_LEFT_ALIGNED(menuOptionHighlight.bottomRight_x), MENU_Y(menuOptionHighlight.bottomRight_y),
+								MENU_X_LEFT_ALIGNED(menuOptionHighlight.bottomLeft_x), MENU_Y(menuOptionHighlight.bottomLeft_y), SELECTIONBORDER_COLOR);
+						}
+						menuOptionHighlight.SaveCurrentCoors();
+						menuOptionHighlight.topLeft_x = leftXMax - 5 - CGeneral::GetRandomNumber() % 10;
+						menuOptionHighlight.topLeft_y = topYMax - CGeneral::GetRandomNumber() % 7;
+						menuOptionHighlight.topRight_x = rightXMin + 5 + CGeneral::GetRandomNumber() % 10;
+						menuOptionHighlight.topRight_y = topYMax - CGeneral::GetRandomNumber() % 7;
+						menuOptionHighlight.bottomLeft_x = rightXMin + 5 + CGeneral::GetRandomNumber() % 10;
+						menuOptionHighlight.bottomLeft_y = bottomYMin + CGeneral::GetRandomNumber() % 7;
+						menuOptionHighlight.bottomRight_x = leftXMax - 5 - CGeneral::GetRandomNumber() % 10;
+						menuOptionHighlight.bottomRight_y = bottomYMin + CGeneral::GetRandomNumber() % 7;
+						menuOptionHighlight.UpdateMultipliers();
+						menuOptionHighlight.Translate(m_nOptionHighlightTransitionBlend);
+
+					} else if (m_nOptionHighlightTransitionBlend < 255) {
+						menuOptionHighlight.Translate(m_nOptionHighlightTransitionBlend);
+						if (m_firstStartCounter == 255 && m_nMenuFadeAlpha == 255 && !bMenuChangeOngoing) {
+							CSprite2d::Draw2DPolygon(MENU_X_LEFT_ALIGNED(menuOptionHighlight.topLeft_x), MENU_Y(menuOptionHighlight.topLeft_y),
+								MENU_X_LEFT_ALIGNED(menuOptionHighlight.topRight_x), MENU_Y(menuOptionHighlight.topRight_y),
+								MENU_X_LEFT_ALIGNED(menuOptionHighlight.bottomRight_x), MENU_Y(menuOptionHighlight.bottomRight_y),
+								MENU_X_LEFT_ALIGNED(menuOptionHighlight.bottomLeft_x), MENU_Y(menuOptionHighlight.bottomLeft_y), SELECTIONBORDER_COLOR);
+						}
+					} else {
+						m_nOptionHighlightTransitionBlend = 255;
+						menuOptionHighlight.Translate(m_nOptionHighlightTransitionBlend);
+						if (m_firstStartCounter == 255 && m_nMenuFadeAlpha == 255 && !bMenuChangeOngoing) {
+							CSprite2d::Draw2DPolygon(MENU_X_LEFT_ALIGNED(menuOptionHighlight.topLeft_x), MENU_Y(menuOptionHighlight.topLeft_y),
+								MENU_X_LEFT_ALIGNED(menuOptionHighlight.topRight_x), MENU_Y(menuOptionHighlight.topRight_y),
+								MENU_X_LEFT_ALIGNED(menuOptionHighlight.bottomRight_x), MENU_Y(menuOptionHighlight.bottomRight_y),
+								MENU_X_LEFT_ALIGNED(menuOptionHighlight.bottomLeft_x), MENU_Y(menuOptionHighlight.bottomLeft_y), SELECTIONBORDER_COLOR);
+						}
+					}
+
+					static PauseModeTime lastBlendChange = 0;
+					if (m_nOptionHighlightTransitionBlend <= 255) {
+						static uint32 blendChangeCounter = 0;
+						if (CTimer::GetTimeInMillisecondsPauseMode() - lastBlendChange > 20
+#ifndef FIX_HIGH_FPS_BUGS_ON_FRONTEND // Dirty dirty hack
+							|| blendChangeCounter > 20
+#endif
+							) {
+							m_nOptionHighlightTransitionBlend += 50;
+							lastBlendChange = CTimer::GetTimeInMillisecondsPauseMode();
+							blendChangeCounter = 0;
+						}
+						++blendChangeCounter;
+					}
+				}
+
+				if (section == 1) {
+					if (leftText) {
+						CFont::PrintString(MENU_X_LEFT_ALIGNED(aScreens[m_nCurrScreen].m_aEntries[i].m_X), MENU_Y(aScreens[m_nCurrScreen].m_aEntries[i].m_Y MINUS_SCROLL_OFFSET), leftText);
+					}
+
+					if (rightText) {
+						CFont::SetCentreOff();
+						CFont::SetRightJustifyOn();
+						if (aScreens[m_nCurrScreen].m_aEntries[i].m_SaveSlot >= SAVESLOT_1 && aScreens[m_nCurrScreen].m_aEntries[i].m_SaveSlot <= SAVESLOT_8) {
+							CFont::SetFontStyle(FONT_LOCALE(FONT_STANDARD));
+							CFont::SetScale(MENU_X(MEDIUMTEXT_X_SCALE), MENU_Y(MEDIUMTEXT_Y_SCALE));
+						} else {
+							CFont::SetFontStyle(FONT_LOCALE(FONT_HEADING));
+							CFont::SetScale(MENU_X(BIGTEXT_X_SCALE), MENU_Y(BIGTEXT_Y_SCALE));
+						}
+						CFont::PrintString(MENU_X_LEFT_ALIGNED(DEFAULT_SCREEN_WIDTH - RIGHT_ALIGNED_TEXT_RIGHT_MARGIN(xMargin)), MENU_Y(aScreens[m_nCurrScreen].m_aEntries[i].m_Y MINUS_SCROLL_OFFSET), rightText);
+					}
+
+					if (m_nPrefsAudio3DProviderIndex == DMAudio.GetCurrent3DProviderIndex()) {
+						if (!strcmp(aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_EntryName, "FEA_3DH") && m_nHelperTextMsgId == 1)
+							ResetHelperText();
+					}
+					if (m_nDisplayVideoMode == m_nPrefsVideoMode) {
+						if (!strcmp(aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_EntryName, "FED_RES") && m_nHelperTextMsgId == 1)
+							ResetHelperText();
+					}
+					if (m_nPrefsAudio3DProviderIndex != DMAudio.GetCurrent3DProviderIndex()) {
+						if (!strcmp(aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_EntryName, "FEA_3DH"))
+							SetHelperText(1);
+					}
+					if (m_nDisplayVideoMode != m_nPrefsVideoMode) {
+						if (!strcmp(aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_EntryName, "FED_RES"))
+							SetHelperText(1);
+					}
+					if (m_nPrefsAudio3DProviderIndex != DMAudio.GetCurrent3DProviderIndex()) {
+						if (strcmp(aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_EntryName, "FEA_3DH") != 0
+#ifdef CUSTOM_FRONTEND_OPTIONS
+							&& ScreenHasOption(m_nCurrScreen, "FEA_3DH")
+#else
+							&& m_nCurrScreen == MENUPAGE_SOUND_SETTINGS
+#endif
+							&& m_nPrefsAudio3DProviderIndex != NO_AUDIO_PROVIDER) {
+
+							m_nPrefsAudio3DProviderIndex = DMAudio.GetCurrent3DProviderIndex();
+							SetHelperText(3);
+						}
+					}
+					if (m_nDisplayVideoMode != m_nPrefsVideoMode) {
+						if (strcmp(aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_EntryName, "FED_RES") != 0
+#ifdef CUSTOM_FRONTEND_OPTIONS
+							&& ScreenHasOption(m_nCurrScreen, "FED_RES")) {
+#else
+							&& m_nCurrScreen == MENUPAGE_DISPLAY_SETTINGS) {
+#endif
+							m_nDisplayVideoMode = m_nPrefsVideoMode;
+							SetHelperText(3);
+						}
+					}
+
+					// Sliders
+					int lastActiveBarX;
+					switch (aScreens[m_nCurrScreen].m_aEntries[i].m_Action) {
+						case MENUACTION_BRIGHTNESS:
+							ProcessSlider(m_PrefsBrightness / 384.0f, 70.0f, HOVEROPTION_INCREASE_BRIGHTNESS, HOVEROPTION_DECREASE_BRIGHTNESS, SCREEN_WIDTH, true);
+							break;
+						case MENUACTION_DRAWDIST:
+							ProcessSlider((m_PrefsLOD - 0.925f) / 0.875f, 99.0f, HOVEROPTION_INCREASE_DRAWDIST, HOVEROPTION_DECREASE_DRAWDIST, SCREEN_WIDTH, true);
+							break;
+						case MENUACTION_MUSICVOLUME:
+							if(m_nPrefsAudio3DProviderIndex != NO_AUDIO_PROVIDER)
+								ProcessSlider(m_PrefsMusicVolume / 64.0f, 70.0f, HOVEROPTION_INCREASE_MUSICVOLUME, HOVEROPTION_DECREASE_MUSICVOLUME, SCREEN_WIDTH, true);
+							break;
+						case MENUACTION_SFXVOLUME:
+							if (m_nPrefsAudio3DProviderIndex != NO_AUDIO_PROVIDER)
+								ProcessSlider(m_PrefsSfxVolume / 64.0f, 99.0f, HOVEROPTION_INCREASE_SFXVOLUME, HOVEROPTION_DECREASE_SFXVOLUME, SCREEN_WIDTH, true);
+							break;
+						case MENUACTION_MOUSESENS:
+							ProcessSlider(TheCamera.m_fMouseAccelHorzntl * 200.0f, 170.0f, HOVEROPTION_INCREASE_MOUSESENS, HOVEROPTION_DECREASE_MOUSESENS, SCREEN_WIDTH, false);
+							break;
+						case MENUACTION_MP3VOLUMEBOOST:
+							if(m_nPrefsAudio3DProviderIndex != NO_AUDIO_PROVIDER && DMAudio.IsMP3RadioChannelAvailable())
+								ProcessSlider(m_PrefsMP3BoostVolume / 64.f, 128.0f, HOVEROPTION_INCREASE_MP3BOOST, HOVEROPTION_DECREASE_MP3BOOST, SCREEN_WIDTH, true);
+							break;
+					}
+					
+					// Not just unused, but also collides with the bug fix in Font.cpp. Yikes.
+#ifndef FIX_BUGS
+					nextYToUse += MENU_DEFAULT_LINE_HEIGHT * CFont::GetNumberLines(MENU_X_LEFT_ALIGNED(60.0f), MENU_Y(nextYToUse), leftText);
+#endif
+
+					if (aScreens[m_nCurrScreen].m_aEntries[i].m_Action == MENUACTION_RADIO) {
+						nextYToUse += MENURADIO_SELECTOR_HEIGHT + 5.f; // unused
+					}
+				}
+			}
+		}
+		section++;
+	}
+
+#ifdef SCROLLABLE_PAGES
+	#define SCROLLBAR_BOTTOM_Y 105.0f // only for background, scrollbar's itself is calculated
+	#define SCROLLBAR_RIGHT_X 26.0f
+	#define SCROLLBAR_WIDTH 9.5f
+	#define SCROLLBAR_TOP_Y 84
+
+	if (activeScreen && SCREEN_HAS_AUTO_SCROLLBAR) {
+		// Scrollbar background
+		CSprite2d::DrawRect(CRect(MENU_X_RIGHT_ALIGNED(SCROLLBAR_RIGHT_X - 2), MENU_Y(SCROLLBAR_TOP_Y),
+			MENU_X_RIGHT_ALIGNED(SCROLLBAR_RIGHT_X - 2 - SCROLLBAR_WIDTH), SCREEN_SCALE_FROM_BOTTOM(SCROLLBAR_BOTTOM_Y)), CRGBA(30, 30, 30, FadeIn(150)));
+		
+		float scrollbarHeight = SCROLLBAR_MAX_HEIGHT / (m_nTotalListRow / (float) MAX_VISIBLE_OPTION);
+		float scrollbarBottom, scrollbarTop;
+
+		scrollbarBottom = MENU_Y(SCROLLBAR_TOP_Y - 6 + m_nScrollbarTopMargin + scrollbarHeight);
+		scrollbarTop = MENU_Y(SCROLLBAR_TOP_Y + 2 + m_nScrollbarTopMargin);
+		// Scrollbar shadow
+		CSprite2d::DrawRect(CRect(MENU_X_RIGHT_ALIGNED(SCROLLBAR_RIGHT_X - 4), scrollbarTop,
+			MENU_X_RIGHT_ALIGNED(SCROLLBAR_RIGHT_X - 1 - SCROLLBAR_WIDTH), scrollbarBottom + MENU_Y(1.0f)),
+			CRGBA(50, 50, 50, FadeIn(255)));
+
+		// Scrollbar
+		CSprite2d::DrawRect(CRect(MENU_X_RIGHT_ALIGNED(SCROLLBAR_RIGHT_X - 4), scrollbarTop,
+			MENU_X_RIGHT_ALIGNED(SCROLLBAR_RIGHT_X - SCROLLBAR_WIDTH), scrollbarBottom),
+			CRGBA(SCROLLBAR_COLOR.r, SCROLLBAR_COLOR.g, SCROLLBAR_COLOR.b, FadeIn(255)));
+			
+	}
+#endif
+
+	switch (m_nCurrScreen) {
+#ifdef GAMEPAD_MENU
+		case MENUPAGE_CONTROLLER_SETTINGS:
+			PrintController();
+			break;
+#endif
+		case MENUPAGE_STATS:
+		case MENUPAGE_CONTROLLER_PC:
+		case MENUPAGE_SOUND_SETTINGS:
+		case MENUPAGE_DISPLAY_SETTINGS:
+		case MENUPAGE_MOUSE_CONTROLS:
+			DisplayHelperText(nil);
+			break;
+		case MENUPAGE_OPTIONS:
+			if (m_nPrefsAudio3DProviderIndex == NO_AUDIO_PROVIDER && aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_Action == MENUACTION_LOADRADIO)
+				DisplayHelperText("FEA_NAH");
+			break;
+#ifdef CUSTOM_FRONTEND_OPTIONS
+		default:
+			if (aScreens[m_nCurrScreen].layout) {
+				if (aScreens[m_nCurrScreen].layout->showLeftRightHelper) {
+					DisplayHelperText(nil);
+				}
+			}
+			break;
+#endif
+	}
+
+	if (m_nCurrScreen == MENUPAGE_DELETING_IN_PROGRESS) {
+		SmallMessageScreen("FEDL_WR");
+	}
+#ifndef XBOX_MESSAGE_SCREEN
+	else if (m_nCurrScreen == MENUPAGE_SAVING_IN_PROGRESS) {
+		SmallMessageScreen("FESZ_WR");
+	}
+#endif
+}
+
+int
+CMenuManager::GetNumOptionsCntrlConfigScreens(void)
+{
+	int number = 0;
+	switch (m_nCurrScreen) {
+#ifdef LEGACY_MENU_OPTIONS
+		case MENUPAGE_CONTROLLER_PC_OLD3:
+			number = 2;
+			break;
+		case MENUPAGE_CONTROLLER_DEBUG:
+			number = 4;
+			break;
+#endif
+		case MENUPAGE_KEYBOARD_CONTROLS:
+			switch (m_ControlMethod) {
+				case CONTROL_STANDARD:
+					number = 27;
+					break;
+				case CONTROL_CLASSIC:
+					number = 32;
+					break;
+			}
+			break;
+	}
+	return number;
+}
+
+void
+CMenuManager::DrawControllerBound(int32 yStart, int32 xStart, int32 unused, int8 column)
+{
+	int controllerAction = PED_FIREWEAPON;
+	// GetStartOptionsCntrlConfigScreens();
+	int numOptions = GetNumOptionsCntrlConfigScreens();
+	int nextY = MENU_Y(yStart);
+	int bindingMargin = MENU_X(3.0f);
+	float rowHeight;
+	switch (m_ControlMethod) {
+		case CONTROL_STANDARD:
+			rowHeight = CONTSETUP_STANDARD_ROW_HEIGHT;
+			break;
+		case CONTROL_CLASSIC:
+			rowHeight = CONTSETUP_CLASSIC_ROW_HEIGHT;
+			break;
+		default:
+			break;
+	}
+
+	for (int optionIdx = 0; optionIdx < numOptions; nextY = MENU_Y(++optionIdx * rowHeight + yStart)) {
+		int nextX = xStart;
+		int bindingsForThisOpt = 0;
+		int contSetOrder = SETORDER_1;
+		CFont::SetColor(CRGBA(255, 255, 255, FadeIn(255)));
+
+		if (column == CONTSETUP_PED_COLUMN) {
+			switch (optionIdx) {
+				case 0:
+					controllerAction = PED_FIREWEAPON;
+					break;
+				case 1:
+					controllerAction = PED_CYCLE_WEAPON_RIGHT;
+					break;
+				case 2:
+					controllerAction = PED_CYCLE_WEAPON_LEFT;
+					break;
+				case 3:
+					controllerAction = GO_FORWARD;
+					break;
+				case 4:
+					controllerAction = GO_BACK;
+					break;
+				case 5:
+					controllerAction = GO_LEFT;
+					break;
+				case 6:
+					controllerAction = GO_RIGHT;
+					break;
+				case 7:
+					controllerAction = PED_SNIPER_ZOOM_IN;
+					break;
+				case 8:
+					controllerAction = PED_SNIPER_ZOOM_OUT;
+					break;
+				case 9:
+					controllerAction = VEHICLE_ENTER_EXIT;
+					break;
+				case 10:
+				case 11:
+				case 12:
+				case 16:
+				case 20:
+				case 21:
+				case 22:
+				case 23:
+					controllerAction = -1;
+					break;
+				case 13:
+					controllerAction = CAMERA_CHANGE_VIEW_ALL_SITUATIONS;
+					break;
+				case 14:
+					controllerAction = PED_JUMPING;
+					break;
+				case 15:
+					controllerAction = PED_SPRINT;
+					break;
+				case 17:
+					controllerAction = PED_LOCK_TARGET;
+					break;
+				case 18:
+					controllerAction = PED_DUCK;
+					break;
+				case 19:
+					controllerAction = PED_ANSWER_PHONE;
+					break;
+				case 24:
+					controllerAction = PED_LOOKBEHIND;
+					break;
+				case 25:
+					if (m_ControlMethod == CONTROL_STANDARD)
+						controllerAction = -1;
+					else
+						controllerAction = PED_1RST_PERSON_LOOK_LEFT;
+					break;
+				case 26:
+					if (m_ControlMethod == CONTROL_STANDARD)
+						controllerAction = -1;
+					else
+						controllerAction = PED_1RST_PERSON_LOOK_RIGHT;
+					break;
+				case 27:
+					controllerAction = PED_1RST_PERSON_LOOK_UP;
+					break;
+				case 28:
+					controllerAction = PED_1RST_PERSON_LOOK_DOWN;
+					break;
+				case 29:
+					controllerAction = PED_CYCLE_TARGET_LEFT;
+					break;
+				case 30:
+					controllerAction = PED_CYCLE_TARGET_RIGHT;
+					break;
+				case 31:
+					controllerAction = PED_CENTER_CAMERA_BEHIND_PLAYER;
+					break;
+				default:
+					break;
+			}
+		} else if (column == CONTSETUP_VEHICLE_COLUMN) {
+			switch (optionIdx) {
+				case 0:
+#ifdef BIND_VEHICLE_FIREWEAPON
+ 					controllerAction = VEHICLE_FIREWEAPON;
+#else
+ 					controllerAction = PED_FIREWEAPON;
+#endif
+					break;
+				case 1:
+				case 2:
+				case 7:
+				case 8:
+				case 14:
+				case 15:
+				case 17:
+				case 18:
+				case 19:
+				case 27:
+				case 28:
+				case 29:
+				case 30:
+				case 31:
+					controllerAction = -1;
+					break;
+				case 3:
+					controllerAction = VEHICLE_ACCELERATE;
+					break;
+				case 4:
+					controllerAction = VEHICLE_BRAKE;
+					break;
+				case 5:
+					controllerAction = GO_LEFT;
+					break;
+				case 6:
+					controllerAction = GO_RIGHT;
+					break;
+				case 9:
+					controllerAction = VEHICLE_ENTER_EXIT;
+					break;
+				case 10:
+					controllerAction = VEHICLE_CHANGE_RADIO_STATION;
+					break;
+				case 11:
+					controllerAction = VEHICLE_HORN;
+					break;
+				case 12:
+					controllerAction = TOGGLE_SUBMISSIONS;
+					break;
+				case 13:
+					controllerAction = CAMERA_CHANGE_VIEW_ALL_SITUATIONS;
+					break;
+				case 16:
+					controllerAction = VEHICLE_HANDBRAKE;
+					break;
+				case 20:
+					controllerAction = VEHICLE_TURRETLEFT;
+					break;
+				case 21:
+					controllerAction = VEHICLE_TURRETRIGHT;
+					break;
+				case 22:
+					controllerAction = VEHICLE_TURRETUP;
+					break;
+				case 23:
+					controllerAction = VEHICLE_TURRETDOWN;
+					break;
+				case 24:
+					controllerAction = -2;
+					break;
+				case 25:
+					controllerAction = VEHICLE_LOOKLEFT;
+					break;
+				case 26:
+					controllerAction = VEHICLE_LOOKRIGHT;
+					break;
+				default:
+					break;
+			}
+		}
+
+		// Highlight selected column(and make its text black)
+		if (m_nSelectedListRow == optionIdx) {
+			int bgY = m_nSelectedListRow * rowHeight + yStart + 1.0f;
+			if (m_nCurrExLayer == HOVEROPTION_LIST) {
+
+				if (column == CONTSETUP_PED_COLUMN && m_nSelectedContSetupColumn == CONTSETUP_PED_COLUMN) {
+#ifdef FIX_BUGS
+					CSprite2d::DrawRect(CRect(nextX, MENU_Y(bgY), nextX + MENU_X(CONTSETUP_BOUND_COLUMN_WIDTH),
+						MENU_Y(bgY + CONTSETUP_BOUND_HIGHLIGHT_HEIGHT)), CRGBA(SELECTIONBORDER_COLOR.r, SELECTIONBORDER_COLOR.g, SELECTIONBORDER_COLOR.b, FadeIn(255)));
+#else
+					CSprite2d::DrawRect(CRect(MENU_X_LEFT_ALIGNED(210.0f), MENU_Y(bgY),
+						MENU_X_LEFT_ALIGNED(400.0f), MENU_Y(bgY + CONTSETUP_BOUND_HIGHLIGHT_HEIGHT)),
+						CRGBA(SELECTIONBORDER_COLOR.r, SELECTIONBORDER_COLOR.g, SELECTIONBORDER_COLOR.b, FadeIn(255)));
+#endif
+					CFont::SetColor(CRGBA(255, 255, 255, FadeIn(255)));
+
+				} else if (column == CONTSETUP_VEHICLE_COLUMN && m_nSelectedContSetupColumn == CONTSETUP_VEHICLE_COLUMN) {
+#ifdef FIX_BUGS
+					CSprite2d::DrawRect(CRect(nextX, MENU_Y(bgY), nextX + MENU_X(CONTSETUP_BOUND_COLUMN_WIDTH),
+						MENU_Y(bgY + CONTSETUP_BOUND_HIGHLIGHT_HEIGHT)), CRGBA(SELECTIONBORDER_COLOR.r, SELECTIONBORDER_COLOR.g, SELECTIONBORDER_COLOR.b, FadeIn(255)));
+#else
+					CSprite2d::DrawRect(CRect(MENU_X_LEFT_ALIGNED(410.0f), MENU_Y(bgY), MENU_X_LEFT_ALIGNED(600.0f), MENU_Y(bgY + CONTSETUP_BOUND_HIGHLIGHT_HEIGHT)),
+						CRGBA(SELECTIONBORDER_COLOR.r, SELECTIONBORDER_COLOR.g, SELECTIONBORDER_COLOR.b, FadeIn(255)));
+#endif
+					CFont::SetColor(CRGBA(255, 255, 255, FadeIn(255)));
+				}
+			}
+		}
+
+		// Print bindings, including seperator (-) between them
+
+		CFont::SetScale(MENU_X(0.25f), MENU_Y(LISTITEM_Y_SCALE));
+#ifdef FIX_BUGS
+		for (; contSetOrder < MAX_SETORDERS && controllerAction >= 0; contSetOrder++) {
+#else
+		for (; contSetOrder < MAX_SETORDERS && controllerAction != -1; contSetOrder++) {
+#endif
+			wchar *settingText = ControlsManager.GetControllerSettingTextWithOrderNumber((e_ControllerAction)controllerAction, (eContSetOrder)contSetOrder);
+			if (settingText) {
+				++bindingsForThisOpt;
+				if (bindingsForThisOpt > 1) {
+					wchar *seperator = TheText.Get("FEC_IBT");
+					CFont::SetColor(CRGBA(255, 255, 255, FadeIn(255)));
+					CFont::PrintString(nextX, nextY, seperator);
+					nextX += CFont::GetStringWidth(seperator, true) + bindingMargin;
+				}
+				CFont::PrintString(nextX, nextY, settingText);
+#ifdef MORE_LANGUAGES
+				if (CFont::IsJapanese())
+					nextX += CFont::GetStringWidth_Jap(settingText) + bindingMargin;
+				else
+#endif
+					nextX += CFont::GetStringWidth(settingText, true) + bindingMargin;
+			}
+		}
+		if (controllerAction == -1) {
+			CFont::SetColor(CRGBA(0, 0, 0, FadeIn(255)));
+			CFont::PrintString(nextX, nextY, TheText.Get("FEC_NUS")); // not used
+
+		} else if (controllerAction == -2) {
+			CFont::SetColor(CRGBA(0, 0, 0, FadeIn(255)));
+			CFont::PrintString(nextX, nextY, TheText.Get("FEC_CMP")); // combo: l+r
+
+		} else if (bindingsForThisOpt == 0) {
+			m_NoEmptyBinding = false;
+			if (m_nSelectedListRow != optionIdx) {
+				CFont::SetColor(CRGBA(0, 0, 0, FadeIn(255)));
+				CFont::PrintString(nextX, nextY, TheText.Get("FEC_UNB")); // unbound
+
+			} else if (m_bWaitingForNewKeyBind) {
+				if (column != m_nSelectedContSetupColumn) {
+					CFont::SetColor(CRGBA(0, 0, 0, FadeIn(255)));
+					CFont::PrintString(nextX, nextY, TheText.Get("FEC_UNB")); // unbound
+				}
+			} else {
+				if (column != m_nSelectedContSetupColumn) {
+					CFont::SetColor(CRGBA(0, 0, 0, FadeIn(255)));
+				}
+				CFont::PrintString(nextX, nextY, TheText.Get("FEC_UNB")); // unbound
+			}
+		}
+
+		if (column == CONTSETUP_PED_COLUMN && m_nSelectedContSetupColumn == CONTSETUP_PED_COLUMN ||
+			column == CONTSETUP_VEHICLE_COLUMN && m_nSelectedContSetupColumn == CONTSETUP_VEHICLE_COLUMN) {
+
+			if (optionIdx == m_nSelectedListRow && controllerAction != -1 && controllerAction != -2) {
+				m_CurrCntrlAction = controllerAction; 
+				if (m_bWaitingForNewKeyBind) {
+					static bool showWaitingText = false;
+					if (bindingsForThisOpt > 0) {
+						wchar *seperator = TheText.Get("FEC_IBT");
+						CFont::PrintString(nextX, nextY, seperator);
+						nextX += CFont::GetStringWidth(seperator, true) + bindingMargin;
+					}
+					static PauseModeTime lastWaitingTextFlash = 0;
+					if (CTimer::GetTimeInMillisecondsPauseMode() - lastWaitingTextFlash > 150) {
+						showWaitingText = !showWaitingText;
+						lastWaitingTextFlash = CTimer::GetTimeInMillisecondsPauseMode();
+					}
+					if (showWaitingText) {
+						CFont::SetColor(CRGBA(255, 255, 255, FadeIn(255)));
+						CFont::PrintString(nextX, nextY, TheText.Get("FEC_QUE")); // "???"
+					}
+					if (m_bKeyChangeNotProcessed)
+						DisplayHelperText("FET_CIG");
+					else
+						DisplayHelperText("FET_RIG");
+
+					SET_FONT_FOR_LIST_ITEM
+
+					m_bKeyIsOK = true;
+				} else {
+					DisplayHelperText("FET_CIG");
+					SET_FONT_FOR_LIST_ITEM
+
+					m_bKeyIsOK = false;
+					m_bKeyChangeNotProcessed = false;
+				}
+			} else if (optionIdx == m_nSelectedListRow) {
+				DisplayHelperText("FET_EIG");
+				SET_FONT_FOR_LIST_ITEM
+			}
+		}
+	}
+}
+
+void
+CMenuManager::DrawControllerScreenExtraText(int yStart, int xStart, int lineHeight)
+{
+	int extraTextStart = GetStartOptionsCntrlConfigScreens();
+	int numOpts = GetNumOptionsCntrlConfigScreens();
+	int spacing = MENU_X(10.0f);
+	for (int i = extraTextStart; i < extraTextStart + numOpts; i++) {
+		int numTextsPrinted = 0;
+		int nextX = xStart;
+		for (int j = 1; j < 5; j++) {
+			wchar *text = ControlsManager.GetControllerSettingTextWithOrderNumber((e_ControllerAction)i, (eContSetOrder)j);
+			if (text)
+				++numTextsPrinted;
+
+			if (text) {
+				// Seperator
+				if (numTextsPrinted > 1) {
+					CFont::PrintString(nextX, MENU_Y(yStart), TheText.Get("FEC_IBT"));
+					nextX = CFont::GetStringWidth(TheText.Get("FEC_IBT"), true) + spacing + nextX;
+				}
+				CFont::PrintString(nextX, MENU_Y(yStart), text);
+			}
+			if (text)
+				nextX = CFont::GetStringWidth(text, true) + spacing + nextX;
+		}
+		if (m_nCurrOption == i - extraTextStart && m_bWaitingForNewKeyBind) {
+			static bool waitingTextVisible = false;
+
+			// Seperator
+			if (numTextsPrinted > 0) {
+				CFont::PrintString(nextX, MENU_Y(yStart), TheText.Get("FEC_IBT"));
+				nextX = CFont::GetStringWidth(TheText.Get("FEC_IBT"), true) + spacing + nextX;
+			}
+			static PauseModeTime lastStateChange = 0;
+			if (CTimer::GetTimeInMillisecondsPauseMode() - lastStateChange > 150) {
+				waitingTextVisible = !waitingTextVisible;
+				lastStateChange = CTimer::GetTimeInMillisecondsPauseMode();
+			}
+			if (waitingTextVisible) {
+				CFont::SetColor(CRGBA(255, 255, 0, FadeIn(255)));
+				CFont::PrintString(nextX, MENU_Y(yStart), TheText.Get("FEC_QUE"));
+				CFont::SetColor(CRGBA(LABEL_COLOR.r, LABEL_COLOR.g, LABEL_COLOR.b, FadeIn(255)));
+			}
+		}
+		yStart += lineHeight;
+	}
+	wchar *error = nil;
+	if (DisplayComboButtonErrMsg)
+		error = ControlsManager.GetButtonComboText((e_ControllerAction)(m_nCurrOption + extraTextStart));
+
+	if (error) {
+		CFont::SetColor(CRGBA(233, 22, 159, 255));
+		CFont::PrintString(xStart, MENU_Y(yStart + 10), error);
+	}
+}
+
+void
+CMenuManager::DrawControllerSetupScreen()
+{
+	float rowHeight;
+	switch (m_ControlMethod) {
+		case CONTROL_STANDARD:
+			rowHeight = CONTSETUP_STANDARD_ROW_HEIGHT;
+			break;
+		case CONTROL_CLASSIC:
+			rowHeight = CONTSETUP_CLASSIC_ROW_HEIGHT;
+			break;
+		default:
+			break;
+	}
+	RESET_FONT_FOR_NEW_PAGE
+	SET_FONT_FOR_MENU_HEADER
+
+	// Shadow
+	CFont::SetColor(CRGBA(30, 30, 30, FadeIn(255)));
+
+	if (m_ControlMethod == CONTROL_STANDARD)
+		CFont::PrintString(SCREEN_STRETCH_FROM_RIGHT(MENUHEADER_POS_X) - MENU_X(7.f), SCREEN_SCALE_Y(MENUHEADER_POS_Y + 7.f), TheText.Get("FET_STI"));
+	else if (m_ControlMethod == CONTROL_CLASSIC)
+		CFont::PrintString(SCREEN_STRETCH_FROM_RIGHT(MENUHEADER_POS_X) - MENU_X(7.f), SCREEN_SCALE_Y(MENUHEADER_POS_Y + 7.f), TheText.Get("FET_CTI"));
+
+	// Real header
+	CFont::SetColor(CRGBA(HEADER_COLOR.r, HEADER_COLOR.g, HEADER_COLOR.b, FadeIn(255)));
+
+	if (m_ControlMethod == CONTROL_STANDARD)
+		CFont::PrintString(SCREEN_STRETCH_FROM_RIGHT(MENUHEADER_POS_X), SCREEN_SCALE_Y(MENUHEADER_POS_Y), TheText.Get("FET_STI"));
+	else if (m_ControlMethod == CONTROL_CLASSIC)
+		CFont::PrintString(SCREEN_STRETCH_FROM_RIGHT(MENUHEADER_POS_X), SCREEN_SCALE_Y(MENUHEADER_POS_Y), TheText.Get("FET_CTI"));
+
+	wchar *actionTexts[33];
+	actionTexts[0] = TheText.Get("FEC_FIR");
+	actionTexts[1] = TheText.Get("FEC_NWE");
+	actionTexts[2] = TheText.Get("FEC_PWE");
+	actionTexts[3] = TheText.Get("FEC_FOR");
+	actionTexts[4] = TheText.Get("FEC_BAC");
+	actionTexts[5] = TheText.Get("FEC_LEF");
+	actionTexts[6] = TheText.Get("FEC_RIG");
+	actionTexts[7] = TheText.Get("FEC_ZIN");
+	actionTexts[8] = TheText.Get("FEC_ZOT");
+	actionTexts[9] = TheText.Get("FEC_EEX");
+	actionTexts[10] = TheText.Get("FEC_RAD");
+	actionTexts[11] = TheText.Get("FEC_HRN");
+	actionTexts[12] = TheText.Get("FEC_SUB");
+	actionTexts[13] = TheText.Get("FEC_CMR");
+	actionTexts[14] = TheText.Get("FEC_JMP");
+	actionTexts[15] = TheText.Get("FEC_SPN");
+	actionTexts[16] = TheText.Get("FEC_HND");
+	actionTexts[17] = TheText.Get("FEC_TAR");
+	actionTexts[18] = TheText.Get("FEC_CRO");
+	actionTexts[19] = TheText.Get("FEC_ANS");
+	if (m_ControlMethod == CONTROL_CLASSIC) {
+		actionTexts[20] = TheText.Get("FEC_TFL");
+		actionTexts[21] = TheText.Get("FEC_TFR");
+		actionTexts[22] = TheText.Get("FEC_TFU");
+		actionTexts[23] = TheText.Get("FEC_TFD");
+		actionTexts[24] = TheText.Get("FEC_LBA");
+		actionTexts[25] = TheText.Get("FEC_LOL");
+		actionTexts[26] = TheText.Get("FEC_LOR");
+		actionTexts[27] = TheText.Get("FEC_LUD");
+		actionTexts[28] = TheText.Get("FEC_LDU");
+		actionTexts[29] = TheText.Get("FEC_NTR");
+		actionTexts[30] = TheText.Get("FEC_PTT");
+		actionTexts[31] = TheText.Get("FEC_CEN");
+		actionTexts[32] = nil;
+	} else {
+		actionTexts[20] = TheText.Get("FEC_TFL");
+		actionTexts[21] = TheText.Get("FEC_TFR");
+		actionTexts[22] = TheText.Get("FEC_TFU");
+		actionTexts[23] = TheText.Get("FEC_TFD");
+		actionTexts[24] = TheText.Get("FEC_LBA");
+		actionTexts[25] = TheText.Get("FEC_LOL");
+		actionTexts[26] = TheText.Get("FEC_LOR");
+		actionTexts[27] = nil;
+	}
+
+	// Blue panel background
+	CSprite2d::DrawRect(CRect(MENU_X_LEFT_ALIGNED(CONTSETUP_LIST_LEFT), MENU_Y(CONTSETUP_LIST_TOP),
+		MENU_X_RIGHT_ALIGNED(CONTSETUP_LIST_RIGHT), SCREEN_SCALE_FROM_BOTTOM(CONTSETUP_LIST_BOTTOM)),
+		CRGBA(LIST_BACKGROUND_COLOR.r, LIST_BACKGROUND_COLOR.g, LIST_BACKGROUND_COLOR.b, FadeIn(LIST_BACKGROUND_COLOR.a)));
+
+	if (m_nCurrExLayer == HOVEROPTION_LIST)
+		CFont::SetColor(CRGBA(SELECTEDMENUOPTION_COLOR.r, SELECTEDMENUOPTION_COLOR.g, SELECTEDMENUOPTION_COLOR.b, FadeIn(255)));
+	else
+		CFont::SetColor(CRGBA(MENUOPTION_COLOR.r, MENUOPTION_COLOR.g, MENUOPTION_COLOR.b, FadeIn(255)));
+
+	// List header
+	CFont::SetFontStyle(FONT_LOCALE(FONT_HEADING));
+	CFont::SetScale(MENU_X(MENUACTION_SCALE_MULT), MENU_Y(MENUACTION_SCALE_MULT));
+	CFont::SetRightJustifyOff();
+	CFont::SetDropShadowPosition(2);
+	CFont::SetDropColor(CRGBA(0, 0, 0, FadeIn(255)));
+	CFont::PrintString(MENU_X_LEFT_ALIGNED(CONTSETUP_COLUMN_2_X), MENU_Y(CONTSETUP_LIST_TOP), TheText.Get("FET_CFT"));
+	CFont::PrintString(MENU_X_LEFT_ALIGNED(CONTSETUP_COLUMN_3_X), MENU_Y(CONTSETUP_LIST_TOP), TheText.Get("FET_CCR"));
+	CFont::SetDropShadowPosition(0);
+	SET_FONT_FOR_LIST_ITEM
+
+	int yStart;
+	if (m_ControlMethod == CONTROL_CLASSIC)
+		yStart = CONTSETUP_LIST_TOP + 18;
+	else
+		yStart = CONTSETUP_LIST_TOP + 21;
+
+	float optionYBottom = yStart + rowHeight;
+	for (int i = 0; i < ARRAY_SIZE(actionTexts); ++i) {
+		wchar *actionText = actionTexts[i];
+		if (!actionText)
+			break;
+
+		if (!m_bWaitingForNewKeyBind) {
+			if (m_nMousePosX > MENU_X_LEFT_ALIGNED(CONTSETUP_LIST_LEFT - 10.0f) &&
+				m_nMousePosX < MENU_X_LEFT_ALIGNED(CONTSETUP_COLUMN_3_X + CONTSETUP_BOUND_COLUMN_WIDTH)) {
+
+				if (m_nMousePosY > MENU_Y(i * rowHeight + yStart) && m_nMousePosY < MENU_Y(i * rowHeight + optionYBottom)) {
+						m_nOptionMouseHovering = i;
+						if (m_nMouseOldPosX != m_nMousePosX || m_nMouseOldPosY != m_nMousePosY) {
+							m_nCurrExLayer = HOVEROPTION_LIST;
+							m_nSelectedListRow = i;
+
+							// why different number for 3rd column hovering X?? this function is a mess
+#ifdef FIX_BUGS
+							if (m_nMousePosX > MENU_X_LEFT_ALIGNED(0.0f) && m_nMousePosX < MENU_X_LEFT_ALIGNED(CONTSETUP_COLUMN_2_X + CONTSETUP_BOUND_COLUMN_WIDTH)) {
+#else
+							if (m_nMousePosX > MENU_X_LEFT_ALIGNED(0.0f) && m_nMousePosX < MENU_X_LEFT_ALIGNED(370.0f)) {
+#endif
+								m_nSelectedContSetupColumn = CONTSETUP_PED_COLUMN;
+#ifdef FIX_BUGS
+							} else if (m_nMousePosX > MENU_X_LEFT_ALIGNED(CONTSETUP_COLUMN_2_X + CONTSETUP_BOUND_COLUMN_WIDTH) && m_nMousePosX < SCREEN_WIDTH) {
+#else
+							} else if (m_nMousePosX > MENU_X_LEFT_ALIGNED(370.0f) && m_nMousePosX < SCREEN_WIDTH) {
+#endif
+								m_nSelectedContSetupColumn = CONTSETUP_VEHICLE_COLUMN;
+							}
+						}
+						// what??
+						if (m_nHoverOption == HOVEROPTION_SKIN) {
+							if (i == m_nSelectedListRow) {
+								m_nHoverOption = HOVEROPTION_NOT_HOVERING;
+								m_bWaitingForNewKeyBind = true;
+								m_bStartWaitingForKeyBind = true;
+								pControlEdit = &m_KeyPressedCode;
+							}
+						} else
+							m_nHoverOption = HOVEROPTION_NOT_HOVERING;
+				}
+			}
+		}
+		if (m_nSelectedListRow != i)
+			CFont::SetColor(CRGBA(MENUOPTION_COLOR.r, MENUOPTION_COLOR.g, MENUOPTION_COLOR.b, FadeIn(255)));
+		else if (m_nCurrExLayer == HOVEROPTION_LIST)
+			CFont::SetColor(CRGBA(SELECTEDMENUOPTION_COLOR.r, SELECTEDMENUOPTION_COLOR.g, SELECTEDMENUOPTION_COLOR.b, FadeIn(255)));
+
+		CFont::SetRightJustifyOff();
+		if (m_PrefsLanguage == LANGUAGE_GERMAN && (i == 20 || i == 21 || i == 22 || i == 23))
+			CFont::SetScale(MENU_X(0.32f), MENU_Y(LISTITEM_Y_SCALE));
+		else
+			CFont::SetScale(MENU_X(LISTITEM_X_SCALE), MENU_Y(LISTITEM_Y_SCALE));
+
+		CFont::PrintString(MENU_X_LEFT_ALIGNED(CONTSETUP_COLUMN_1_X), MENU_Y(i * rowHeight + yStart), actionText);
+	}
+	DrawControllerBound(yStart, MENU_X_LEFT_ALIGNED(CONTSETUP_COLUMN_2_X), rowHeight, CONTSETUP_PED_COLUMN);
+	DrawControllerBound(yStart, MENU_X_LEFT_ALIGNED(CONTSETUP_COLUMN_3_X), rowHeight, CONTSETUP_VEHICLE_COLUMN);
+
+	if (!m_bWaitingForNewKeyBind) {
+		CFont::SetScale(MENU_X(BIGTEXT_X_SCALE), MENU_Y(BIGTEXT_Y_SCALE));
+
+		if ((m_nMousePosX > MENU_X_RIGHT_ALIGNED(CONTSETUP_BACK_RIGHT) - CFont::GetStringWidth(TheText.Get("FEDS_TB"), true)
+			&& m_nMousePosX < MENU_X_RIGHT_ALIGNED(CONTSETUP_BACK_RIGHT) && m_nMousePosY > SCREEN_SCALE_FROM_BOTTOM(CONTSETUP_BACK_BOTTOM)
+			&& m_nMousePosY < SCREEN_SCALE_FROM_BOTTOM(CONTSETUP_BACK_BOTTOM - CONTSETUP_BACK_HEIGHT)) || m_nCurrExLayer == HOVEROPTION_BACK) {
+			m_nHoverOption = HOVEROPTION_BACK;
+
+		} else if (m_nMousePosX > MENU_X_LEFT_ALIGNED(CONTSETUP_LIST_LEFT - 10.0f) && m_nMousePosX < MENU_X_LEFT_ALIGNED(CONTSETUP_COLUMN_3_X + CONTSETUP_BOUND_COLUMN_WIDTH)
+			&& m_nMousePosY > MENU_Y(CONTSETUP_LIST_TOP - 10.0f) && m_nMousePosY < SCREEN_SCALE_FROM_BOTTOM(CONTSETUP_LIST_BOTTOM)) {
+			m_nHoverOption = HOVEROPTION_LIST;
+
+		} else {
+			m_nHoverOption = HOVEROPTION_NOT_HOVERING;
+		}
+	}
+
+	// Back button and it's shadow
+	CFont::SetFontStyle(FONT_LOCALE(FONT_HEADING));
+	CFont::SetScale(MENU_X(BIGTEXT_X_SCALE), MENU_Y(BIGTEXT_Y_SCALE));
+	CFont::SetRightJustifyOn();
+	CFont::SetDropShadowPosition(2);
+	CFont::SetDropColor(CRGBA(0, 0, 0, FadeIn(255)));
+	CFont::SetColor(CRGBA(MENUOPTION_COLOR.r, MENUOPTION_COLOR.g, MENUOPTION_COLOR.b, FadeIn(255)));
+	CFont::PrintString(MENU_X_RIGHT_ALIGNED(CONTSETUP_BACK_RIGHT - 2.0f), SCREEN_SCALE_FROM_BOTTOM(CONTSETUP_BACK_BOTTOM - 4.0f), TheText.Get("FEDS_TB"));
+}
+
+void
+CMenuManager::DrawFrontEnd()
+{
+	CFont::SetAlphaFade(255.0f);
+	CSprite2d::InitPerFrame();
+	CFont::InitPerFrame();
+	SetFrontEndRenderStates();
+	m_NoEmptyBinding = true;
+
+	if (m_nCurrScreen == MENUPAGE_NONE) {
+		if (m_bGameNotLoaded) {
+			m_nCurrScreen = MENUPAGE_START_MENU;
+		} else {
+			m_nCurrScreen = MENUPAGE_PAUSE_MENU;
+		}
+		SETUP_SCROLLING(m_nCurrScreen)
+	}
+
+	if (m_nCurrOption == 0 && aScreens[m_nCurrScreen].m_aEntries[0].m_Action == MENUACTION_LABEL)
+		m_nCurrOption = 1;
+
+	if (m_firstStartCounter == 255 && m_nMenuFadeAlpha == 255)
+		bMenuChangeOngoing = false;
+
+	DrawBackground(false);
+}
+
+void
+CMenuManager::DrawBackground(bool transitionCall)
+{
+	if (!m_bSpritesLoaded)
+		return;
+
+	SetFrontEndRenderStates();
+
+	if (m_firstStartCounter < 255) {
+		CSprite2d::DrawRect(CRect(0.0f, 0.0f, SCREEN_WIDTH, SCREEN_HEIGHT), CRGBA(0, 0, 0, 255));
+	}
+
+	if (m_nMenuFadeAlpha != 0) {
+
+		if (m_nMenuFadeAlpha < 255) {
+
+			menuBg.Translate(m_nMenuFadeAlpha);
+			SetFrontEndRenderStates();
+			m_aFrontEndSprites[MENUSPRITE_BACKGROUND].Draw(CRect(0.0f, 0.0f, SCREEN_WIDTH, SCREEN_HEIGHT), CRGBA(255, 255, 255, FadeIn(255)));
+			if (m_nCurrScreen == MENUPAGE_MAP)
+				PrintMap();
+
+			// Left border
+			CSprite2d::Draw2DPolygon(SCREEN_STRETCH_X(menuBg.bottomLeft_x), SCREEN_STRETCH_Y(menuBg.bottomLeft_y), 0.0f, SCREEN_HEIGHT,
+				SCREEN_STRETCH_X(menuBg.topLeft_x), SCREEN_STRETCH_Y(menuBg.topLeft_y), 0.0f, 0.0f, CRGBA(0, 0, 0, 255));
+
+			// Top border
+			CSprite2d::Draw2DPolygon(SCREEN_STRETCH_X(menuBg.topRight_x), SCREEN_STRETCH_Y(menuBg.topRight_y), 
+				SCREEN_STRETCH_X(menuBg.topLeft_x), SCREEN_STRETCH_Y(menuBg.topLeft_y), SCREEN_WIDTH, 0.0f, 0.0f, 0.0f, CRGBA(0, 0, 0, 255));
+
+			// Bottom border
+			CSprite2d::Draw2DPolygon(SCREEN_WIDTH, SCREEN_HEIGHT, 0.0f, SCREEN_HEIGHT, SCREEN_STRETCH_X(menuBg.bottomRight_x), SCREEN_STRETCH_Y(menuBg.bottomRight_y),
+				SCREEN_STRETCH_X(menuBg.bottomLeft_x), SCREEN_STRETCH_Y(menuBg.bottomLeft_y), CRGBA(0, 0, 0, 255));
+
+			// Right border
+			CSprite2d::Draw2DPolygon(SCREEN_WIDTH, SCREEN_HEIGHT, SCREEN_STRETCH_X(menuBg.bottomRight_x), SCREEN_STRETCH_Y(menuBg.bottomRight_y),
+				SCREEN_WIDTH, 0.0f, SCREEN_STRETCH_X(menuBg.topRight_x), SCREEN_STRETCH_Y(menuBg.topRight_y), CRGBA(0, 0, 0, 255));
+		} else {
+			m_nMenuFadeAlpha = 255;
+			m_firstStartCounter = 255;
+			m_aFrontEndSprites[MENUSPRITE_BACKGROUND].Draw(CRect(0.0f, 0.0f, SCREEN_WIDTH, SCREEN_HEIGHT), CRGBA(255, 255, 255, FadeIn(255)));
+			if (m_nCurrScreen == MENUPAGE_MAP)
+				PrintMap();
+
+			// Left border
+			CSprite2d::Draw2DPolygon(SCREEN_STRETCH_X(menuBg.bottomLeft_x), SCREEN_STRETCH_Y(menuBg.bottomLeft_y), 0.0f, SCREEN_HEIGHT,
+				SCREEN_STRETCH_X(menuBg.topLeft_x), SCREEN_STRETCH_Y(menuBg.topLeft_y), 0.0f, 0.0f, CRGBA(0, 0, 0, 255));
+
+			// Top border
+			CSprite2d::Draw2DPolygon(SCREEN_STRETCH_X(menuBg.topRight_x), SCREEN_STRETCH_Y(menuBg.topRight_y),
+				SCREEN_STRETCH_X(menuBg.topLeft_x), SCREEN_STRETCH_Y(menuBg.topLeft_y), SCREEN_WIDTH, 0.0f, 0.0f, 0.0f, CRGBA(0, 0, 0, 255));
+
+			// Bottom border
+			CSprite2d::Draw2DPolygon(SCREEN_WIDTH, SCREEN_HEIGHT, 0.0f, SCREEN_HEIGHT, SCREEN_STRETCH_X(menuBg.bottomRight_x), SCREEN_STRETCH_Y(menuBg.bottomRight_y),
+				SCREEN_STRETCH_X(menuBg.bottomLeft_x), SCREEN_STRETCH_Y(menuBg.bottomLeft_y), CRGBA(0, 0, 0, 255));
+
+			// Right border
+			CSprite2d::Draw2DPolygon(SCREEN_WIDTH, SCREEN_HEIGHT, SCREEN_STRETCH_X(menuBg.bottomRight_x), SCREEN_STRETCH_Y(menuBg.bottomRight_y),
+				SCREEN_WIDTH, 0.0f, SCREEN_STRETCH_X(menuBg.topRight_x), SCREEN_STRETCH_Y(menuBg.topRight_y), CRGBA(0, 0, 0, 255));
+		}
+	} else {
+		menuBg.SaveCurrentCoors();
+		switch (m_nCurrScreen) {
+			case MENUPAGE_STATS:
+				menuBg.topLeft_x = 70.0f;
+				menuBg.topLeft_y = 75.0f;
+				menuBg.topRight_x = 550.0f;
+				menuBg.topRight_y = 16.0f;
+				menuBg.bottomLeft_x = 74.0f;
+				menuBg.bottomLeft_y = 354.0f;
+				menuBg.bottomRight_x = 581.0f;
+				menuBg.bottomRight_y = 340.0f;
+				break;
+			case MENUPAGE_SOUND_SETTINGS:
+				menuBg.topLeft_x = 26.0f;
+				menuBg.topLeft_y = 59.0f;
+				menuBg.topRight_x = 629.0f;
+				menuBg.topRight_y = 29.0f;
+				menuBg.bottomLeft_x = 15.0f;
+				menuBg.bottomLeft_y = 438.0f;
+				menuBg.bottomRight_x = 610.0f;
+				menuBg.bottomRight_y = 410.0f;
+				break;
+			case MENUPAGE_SKIN_SELECT:
+			case MENUPAGE_KEYBOARD_CONTROLS:
+				menuBg.topLeft_x = 14.0f;
+				menuBg.topLeft_y = 39.0f;
+				menuBg.topRight_x = 636.0f;
+				menuBg.topRight_y = 29.0f;
+				menuBg.bottomLeft_x = 15.0f;
+				menuBg.bottomLeft_y = 426.0f;
+				menuBg.bottomRight_x = 630.0f;
+				menuBg.bottomRight_y = 398.0f;
+				break;
+			case MENUPAGE_BRIEFS:
+			case MENUPAGE_DISPLAY_SETTINGS:
+			case MENUPAGE_MAP:
+			case MENUPAGE_CHOOSE_LOAD_SLOT:
+			case MENUPAGE_CHOOSE_DELETE_SLOT:
+			case MENUPAGE_CHOOSE_SAVE_SLOT:
+			case MENUPAGE_MOUSE_CONTROLS:
+				menuBg.topLeft_x = 26.0f;
+				menuBg.topLeft_y = 59.0f;
+				menuBg.topRight_x = 629.0f;
+				menuBg.topRight_y = 29.0f;
+				menuBg.bottomLeft_x = 15.0f;
+				menuBg.bottomLeft_y = 426.0f;
+				menuBg.bottomRight_x = 610.0f;
+				menuBg.bottomRight_y = 398.0f;
+				break;
+			default:
+#ifdef CUSTOM_FRONTEND_OPTIONS
+				if (aScreens[m_nCurrScreen].layout && aScreens[m_nCurrScreen].layout->noInvasiveBorders) {
+					// Taken from the case above
+					menuBg.topLeft_x = 26.0f;
+					menuBg.topLeft_y = 59.0f;
+					menuBg.topRight_x = 629.0f;
+					menuBg.topRight_y = 29.0f;
+					menuBg.bottomLeft_x = 15.0f;
+					menuBg.bottomLeft_y = 426.0f;
+					menuBg.bottomRight_x = 610.0f;
+					menuBg.bottomRight_y = 398.0f;
+					break;
+				}
+#endif
+				menuBg.topLeft_x = CGeneral::GetRandomNumber() % 40 + 65;
+				menuBg.topLeft_y = CGeneral::GetRandomNumber() % 40 + 21;
+				menuBg.topRight_x = CGeneral::GetRandomNumber() % 40 + 568;
+				menuBg.topRight_y = CGeneral::GetRandomNumber() % 40 + 44;
+				menuBg.bottomLeft_x = CGeneral::GetRandomNumber() % 40 + 36;
+				menuBg.bottomLeft_y = CGeneral::GetRandomNumber() % 40 + 382;
+				menuBg.bottomRight_x = CGeneral::GetRandomNumber() % 40 + 593;
+				menuBg.bottomRight_y = CGeneral::GetRandomNumber() % 40 + 342;
+				break;
+		}
+
+		menuBg.UpdateMultipliers();
+		if (m_firstStartCounter == 255)
+			m_nOptionHighlightTransitionBlend = 0;
+	}
+
+	static PauseModeTime LastFade = 0;
+
+	if (m_nMenuFadeAlpha < 255) {
+		static uint8 forceFadeInCounter = 0;	
+		if (CTimer::GetTimeInMillisecondsPauseMode() - LastFade > 30
+#ifndef FIX_HIGH_FPS_BUGS_ON_FRONTEND // Dirty dirty hack
+			|| forceFadeInCounter > 30
+#endif
+			) {
+			m_nMenuFadeAlpha += 20;
+			if (m_firstStartCounter < 255) {
+				m_firstStartCounter = Min(m_firstStartCounter + 20, 255);
+			}
+			LastFade = CTimer::GetTimeInMillisecondsPauseMode();
+		}
+		forceFadeInCounter++;
+	} else if (m_nMenuFadeAlpha > 255)
+		m_nMenuFadeAlpha = 255;
+
+	if (!transitionCall && m_firstStartCounter == 255) {
+		int actualAlpha = m_nMenuFadeAlpha;
+		if (actualAlpha < 255) {
+			int actualScreen = m_nCurrScreen;
+			SetFrontEndRenderStates();
+			m_nCurrScreen = m_nPrevScreen;
+			m_nMenuFadeAlpha = 255 - m_nMenuFadeAlpha;
+			switch (m_nCurrScreen) {
+				case MENUPAGE_SKIN_SELECT:
+					DrawPlayerSetupScreen(false);
+					break;
+				case MENUPAGE_KEYBOARD_CONTROLS:
+					DrawControllerSetupScreen();
+					break;
+				case MENUPAGE_OUTRO:
+					DrawQuitGameScreen();
+					break;
+				default:
+					DrawStandardMenus(false);
+					break;
+			}
+			m_nCurrScreen = actualScreen;
+			m_nMenuFadeAlpha = actualAlpha;
+		}
+	}
+
+	switch (m_nCurrScreen) {
+		case MENUPAGE_SKIN_SELECT:
+			DrawPlayerSetupScreen(true);
+			break;
+		case MENUPAGE_KEYBOARD_CONTROLS:
+			DrawControllerSetupScreen();
+			break;
+		case MENUPAGE_OUTRO:
+			DrawQuitGameScreen();
+			break;
+		default:
+			DrawStandardMenus(true);
+			break;
+	}
+
+	CFont::DrawFonts();
+	SetFrontEndRenderStates();
+
+	if (m_nCurrScreen != MENUPAGE_OUTRO)
+		if (m_firstStartCounter == 255) {
+			m_aFrontEndSprites[MENUSPRITE_VCLOGO].Draw(CRect(SCREEN_STRETCH_X(27.0f), MENU_Y(8.0f), SCREEN_STRETCH_X(27.0f) + MENU_X(130.f), MENU_Y(138.0f)), CRGBA(255, 255, 255, 255));
+		} else {
+			m_aFrontEndSprites[MENUSPRITE_VCLOGO].Draw(CRect(SCREEN_STRETCH_X(27.0f), MENU_Y(8.0f), SCREEN_STRETCH_X(27.0f) + MENU_X(130.f), MENU_Y(138.0f)), CRGBA(255, 255, 255, FadeIn(255)));
+		}
+
+	if (m_ShowEmptyBindingError) {
+		static PauseModeTime lastBindingError = CTimer::GetTimeInMillisecondsPauseMode();
+		static bool bindingErrorShown = false;
+		if (bindingErrorShown) {
+			lastBindingError = CTimer::GetTimeInMillisecondsPauseMode();
+			bindingErrorShown = false;
+		}
+		SmallMessageScreen("FEC_ERI");
+		CFont::DrawFonts();
+		if (CTimer::GetTimeInMillisecondsPauseMode() - lastBindingError > 4000) {
+			m_ShowEmptyBindingError = false;
+			bindingErrorShown = true;
+		}
+	}
+
+	if (m_bShowMouse) {
+		CRect mouse(0.0f, 0.0f, MENU_X(35.0f), MENU_Y(35.0f));
+		CRect shad(MENU_X(10.0f), MENU_Y(3.0f), MENU_X(45.0f), MENU_Y(38.0f));
+
+		mouse.Translate(m_nMousePosX, m_nMousePosY);
+		shad.Translate(m_nMousePosX, m_nMousePosY);
+		m_aFrontEndSprites[MENUSPRITE_MOUSE].Draw(shad, CRGBA(100, 100, 100, 50));
+		m_aFrontEndSprites[MENUSPRITE_MOUSE].Draw(mouse, CRGBA(255, 255, 255, 255));
+	}
+}
+
+void
+CMenuManager::DrawPlayerSetupScreen(bool activeScreen)
+{
+	RESET_FONT_FOR_NEW_PAGE
+
+	// lstrcpy's changed with strcpy
+	if (!m_bSkinsEnumerated) {
+		OutputDebugString("Enumerating skin filenames from skins...");
+		m_pSkinListHead.nextSkin = nil;
+		m_pSelectedSkin = &m_pSkinListHead;
+		m_pSelectedSkin->nextSkin = new tSkinInfo;
+		m_pSelectedSkin = m_pSelectedSkin->nextSkin;
+		m_pSelectedSkin->skinId = 0;
+		strcpy(m_pSelectedSkin->skinNameOriginal, DEFAULT_SKIN_NAME);
+		strcpy(m_pSelectedSkin->skinNameDisplayed, UnicodeToAscii(TheText.Get("FET_DSN")));
+		int nextSkinId = 1;
+		m_pSelectedSkin->nextSkin = nil;
+
+		WIN32_FIND_DATA FindFileData;
+		SYSTEMTIME SystemTime;
+		HANDLE handle = FindFirstFile("skins\\*.bmp", &FindFileData);
+		for (int i = 1; handle != INVALID_HANDLE_VALUE && i; i = FindNextFile(handle, &FindFileData)) {
+			if (strcmp(FindFileData.cFileName, DEFAULT_SKIN_NAME) != 0) {
+				m_pSelectedSkin->nextSkin = new tSkinInfo;
+				m_pSelectedSkin = m_pSelectedSkin->nextSkin;
+				m_pSelectedSkin->skinId = nextSkinId;
+				strcpy(m_pSelectedSkin->skinNameOriginal, FindFileData.cFileName);
+				strcpy(m_pSelectedSkin->skinNameDisplayed, FindFileData.cFileName);
+				FileTimeToSystemTime(&FindFileData.ftLastWriteTime, &SystemTime);
+				GetDateFormat(LOCALE_USER_DEFAULT, DATE_SHORTDATE, &SystemTime, 0, m_pSelectedSkin->date, 255);
+				++nextSkinId;
+				m_pSelectedSkin->nextSkin = nil;
+			}
+		}
+		FindClose(handle);
+		m_nSkinsTotal = nextSkinId;
+		char nameTemp[256];
+		for (m_pSelectedSkin = m_pSkinListHead.nextSkin; m_pSelectedSkin; m_pSelectedSkin = m_pSelectedSkin->nextSkin) {
+			// Drop extension
+			int oldLength = (int)strlen(m_pSelectedSkin->skinNameDisplayed);
+			m_pSelectedSkin->skinNameDisplayed[oldLength - 4] = '\0';
+			m_pSelectedSkin->skinNameOriginal[oldLength - 4] = '\0';
+
+			// Fill to 40 bytes-39 chars, idk why. This is done in sepearate function in game.
+			strncpy(nameTemp, m_pSelectedSkin->skinNameDisplayed, 39); // game doesn't do that, but in our day strncpy to same string is forbidden
+			strncpy(m_pSelectedSkin->skinNameDisplayed, nameTemp, 39);
+			if (oldLength - 4 > 39)
+				m_pSelectedSkin->skinNameDisplayed[39] = '\0';
+
+			// Make string lowercase, except first letter
+			strlwr(m_pSelectedSkin->skinNameDisplayed);
+			strncpy(nameTemp, m_pSelectedSkin->skinNameDisplayed, 1);
+			strupr(nameTemp);
+			strncpy(m_pSelectedSkin->skinNameDisplayed, nameTemp, 1);
+
+			// Change some chars
+#ifdef FIX_BUGS
+			for (int k = 0; m_pSelectedSkin->skinNameDisplayed[k] != '\0'; ++k) {
+#else
+			for (int k = 0; m_pSelectedSkin->skinNameOriginal[k] != '\0'; ++k) {
+#endif
+				if (!strncmp(&m_pSelectedSkin->skinNameDisplayed[k], "_", 1))
+					strncpy(&m_pSelectedSkin->skinNameDisplayed[k], " ", 1);
+				if (!strncmp(&m_pSelectedSkin->skinNameDisplayed[k], "@", 1))
+					strncpy(&m_pSelectedSkin->skinNameDisplayed[k], " ", 1);
+				if (!strncmp(&m_pSelectedSkin->skinNameDisplayed[k], "{", 1))
+					strncpy(&m_pSelectedSkin->skinNameDisplayed[k], "(", 1);
+				if (!strncmp(&m_pSelectedSkin->skinNameDisplayed[k], "}", 1))
+					strncpy(&m_pSelectedSkin->skinNameDisplayed[k], ")", 1);
+				if (!strncmp(&m_pSelectedSkin->skinNameDisplayed[k], "£", 1))
+					strncpy(&m_pSelectedSkin->skinNameDisplayed[k], "$", 1);
+			}
+
+			// Make letters after whitespace uppercase
+			for (int l = 0; m_pSelectedSkin->skinNameDisplayed[l] != '\0'; ++l) {
+				if (!strncmp(&m_pSelectedSkin->skinNameDisplayed[l], " ", 1)) {
+					if (m_pSelectedSkin->skinNameDisplayed[l + 1]) {
+						strncpy(nameTemp, &m_pSelectedSkin->skinNameDisplayed[l + 1], 1);
+						strupr(nameTemp);
+						strncpy(&m_pSelectedSkin->skinNameDisplayed[l + 1], nameTemp, 1);
+					}
+				}
+			}
+		}
+		OutputDebugString("Finished enumerating skin files.");
+		m_bSkinsEnumerated = true;
+	}
+	CSprite2d::DrawRect(CRect(MENU_X_LEFT_ALIGNED(PLAYERSETUP_LIST_LEFT), MENU_Y(PLAYERSETUP_LIST_TOP),
+		MENU_X_RIGHT_ALIGNED(PLAYERSETUP_LIST_RIGHT), SCREEN_SCALE_FROM_BOTTOM(PLAYERSETUP_LIST_BOTTOM)), CRGBA(LIST_BACKGROUND_COLOR.r, LIST_BACKGROUND_COLOR.g, LIST_BACKGROUND_COLOR.b, FadeIn(LIST_BACKGROUND_COLOR.a)));
+
+	SET_FONT_FOR_MENU_HEADER
+	CFont::SetColor(CRGBA(30, 30, 30, FadeIn(255)));
+	CFont::PrintString(SCREEN_STRETCH_FROM_RIGHT(MENUHEADER_POS_X) - MENU_X(7.f), SCREEN_SCALE_Y(MENUHEADER_POS_Y + 7.f), TheText.Get("FET_PS"));
+
+	CFont::SetColor(CRGBA(HEADER_COLOR.r, HEADER_COLOR.g, HEADER_COLOR.b, FadeIn(255)));
+	CFont::PrintString(SCREEN_STRETCH_FROM_RIGHT(MENUHEADER_POS_X), SCREEN_SCALE_Y(MENUHEADER_POS_Y), TheText.Get("FET_PS"));
+
+	// Header (Skin - Date)
+	if (m_nCurrExLayer == HOVEROPTION_LIST) {
+		CFont::SetColor(CRGBA(SELECTEDMENUOPTION_COLOR.r, SELECTEDMENUOPTION_COLOR.g, SELECTEDMENUOPTION_COLOR.b, FadeIn(255)));
+	} else {
+		CFont::SetColor(CRGBA(MENUOPTION_COLOR.r, MENUOPTION_COLOR.g, MENUOPTION_COLOR.b, FadeIn(255)));
+	}
+	CFont::SetDropShadowPosition(2);
+	CFont::SetDropColor(CRGBA(0, 0, 0, 255));
+	CFont::SetScale(MENU_X(MENUACTION_SCALE_MULT), MENU_Y(MENUACTION_SCALE_MULT));
+	CFont::SetRightJustifyOn();
+	CFont::PrintString(MENU_X_RIGHT_ALIGNED(PLAYERSETUP_DATE_COLUMN_RIGHT), MENU_Y(PLAYERSETUP_LIST_TOP), TheText.Get("FES_DAT"));
+	switch (m_PrefsLanguage) {
+		case LANGUAGE_FRENCH:
+		case LANGUAGE_SPANISH:
+			CFont::SetScale(MENU_X(0.6f), MENU_Y(MENUACTION_SCALE_MULT));
+			break;
+		default:
+			CFont::SetScale(MENU_X(MENUACTION_SCALE_MULT), MENU_Y(MENUACTION_SCALE_MULT));
+			break;
+	}
+	CFont::SetRightJustifyOff();
+	CFont::PrintString(MENU_X_LEFT_ALIGNED(PLAYERSETUP_SKIN_COLUMN_LEFT), MENU_Y(PLAYERSETUP_LIST_TOP), TheText.Get("FES_SKN"));
+	CFont::SetDropShadowPosition(0);
+
+	// Skin list
+	SET_FONT_FOR_LIST_ITEM
+	if (m_nSkinsTotal > 0) {
+		for (m_pSelectedSkin = m_pSkinListHead.nextSkin; m_pSelectedSkin->skinId != m_nFirstVisibleRowOnList;
+			m_pSelectedSkin = m_pSelectedSkin->nextSkin);
+
+		int rowTextY = PLAYERSETUP_LIST_BODY_TOP - 1;
+		int orderInVisibles = 0;
+		int rowEndY = PLAYERSETUP_LIST_BODY_TOP + PLAYERSETUP_ROW_HEIGHT + 1;
+		int rowStartY = PLAYERSETUP_LIST_BODY_TOP;
+		for (int rowIdx = m_nFirstVisibleRowOnList; 
+			rowIdx < m_nFirstVisibleRowOnList + MAX_VISIBLE_LIST_ROW && m_pSelectedSkin; ) {
+
+			if (m_nMousePosX > MENU_X_LEFT_ALIGNED(PLAYERSETUP_LIST_LEFT) && m_nMousePosX < MENU_X_RIGHT_ALIGNED(PLAYERSETUP_LIST_RIGHT)) {
+				if (m_nMousePosY > MENU_Y(rowStartY) && m_nMousePosY < MENU_Y(rowEndY)) {
+					m_nOptionMouseHovering = rowIdx;
+					if (m_nMouseOldPosX != m_nMousePosX || m_nMouseOldPosY != m_nMousePosY) {
+						m_nCurrExLayer = HOVEROPTION_LIST;
+					}
+					if (m_nHoverOption == HOVEROPTION_SKIN) {
+						if (rowIdx == m_nSelectedListRow) {
+							m_nHoverOption = HOVEROPTION_NOT_HOVERING;
+							if (m_nSkinsTotal > 0) {
+								strcpy(m_PrefsSkinFile, m_aSkinName);
+								CWorld::Players[0].SetPlayerSkin(m_PrefsSkinFile);
+								SaveSettings();
+							}
+						} else {
+							m_nCurrExLayer = HOVEROPTION_LIST;
+							m_nSelectedListRow = rowIdx;
+							m_nHoverOption = HOVEROPTION_NOT_HOVERING;
+						}
+					}
+				}
+			}
+
+			// Preview skin/change color of row when we focused on another row.
+			if (orderInVisibles == m_nSelectedListRow - m_nFirstVisibleRowOnList) {
+				CFont::SetColor(CRGBA(255, 255, 255, FadeIn(255)));
+				static int lastSelectedSkin = -1;
+				if (m_nSelectedListRow != lastSelectedSkin) {
+					strcpy(m_aSkinName, m_pSelectedSkin->skinNameOriginal);
+					CWorld::Players[0].SetPlayerSkin(m_aSkinName);
+				}
+				lastSelectedSkin = m_nSelectedListRow;
+			} else if (!strcmp(m_PrefsSkinFile, m_pSelectedSkin->skinNameOriginal)) {
+				CFont::SetColor(CRGBA(255, 255, 155, FadeIn(255)));
+			} else {
+				CFont::SetColor(CRGBA(LIST_OPTION_COLOR.r, LIST_OPTION_COLOR.g, LIST_OPTION_COLOR.b, FadeIn(LIST_OPTION_COLOR.a)));
+			}
+			wchar unicodeTemp[80];
+			AsciiToUnicode(m_pSelectedSkin->skinNameDisplayed, unicodeTemp);
+			CFont::SetRightJustifyOff();
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(PLAYERSETUP_SKIN_COLUMN_LEFT), MENU_Y(rowTextY), unicodeTemp);
+
+			// If not "Default skin" option
+			if (rowIdx != 0) {
+				char dateTemp[32];
+				sprintf(dateTemp, "%s", m_pSelectedSkin->date);
+				AsciiToUnicode(dateTemp, unicodeTemp);
+				CFont::SetRightJustifyOn();
+				CFont::PrintString(MENU_X_RIGHT_ALIGNED(PLAYERSETUP_DATE_COLUMN_RIGHT), MENU_Y(rowTextY), unicodeTemp);
+			}
+			++orderInVisibles;
+			rowEndY += PLAYERSETUP_ROW_HEIGHT;
+			rowStartY += PLAYERSETUP_ROW_HEIGHT;
+			rowTextY += PLAYERSETUP_ROW_HEIGHT;
+			++rowIdx;
+			m_pSelectedSkin = m_pSelectedSkin->nextSkin;
+		}
+		// Scrollbar background - it's unchanged since III and still yellowish...
+		CSprite2d::DrawRect(CRect(MENU_X_RIGHT_ALIGNED(PLAYERSETUP_LIST_RIGHT - 2), MENU_Y(PLAYERSETUP_LIST_TOP),
+			MENU_X_RIGHT_ALIGNED(PLAYERSETUP_LIST_RIGHT - 2 - PLAYERSETUP_SCROLLBAR_WIDTH), SCREEN_SCALE_FROM_BOTTOM(PLAYERSETUP_LIST_BOTTOM)), CRGBA(100, 100, 66, FadeIn(205)));
+		
+		float scrollbarHeight = SCROLLBAR_MAX_HEIGHT / (m_nSkinsTotal / (float) MAX_VISIBLE_LIST_ROW);
+		float scrollbarBottom, scrollbarTop;
+		if (m_nSkinsTotal <= MAX_VISIBLE_LIST_ROW) {
+			scrollbarBottom = SCREEN_SCALE_FROM_BOTTOM(PLAYERSETUP_LIST_BOTTOM + PLAYERSETUP_SCROLLBUTTON_HEIGHT + 4.0f);
+			scrollbarTop = MENU_Y(PLAYERSETUP_LIST_BODY_TOP);
+
+			// Scrollbar shadow
+			CSprite2d::DrawRect(CRect(MENU_X_RIGHT_ALIGNED(PLAYERSETUP_LIST_RIGHT - 4), scrollbarTop,
+				MENU_X_RIGHT_ALIGNED(PLAYERSETUP_LIST_RIGHT - 1 - PLAYERSETUP_SCROLLBAR_WIDTH), scrollbarBottom + MENU_Y(1.0f)), CRGBA(50, 50, 50, FadeIn(255)));
+		} else {
+#ifdef FIX_BUGS
+			scrollbarBottom = MENU_Y(PLAYERSETUP_LIST_BODY_TOP - 8 + m_nScrollbarTopMargin + scrollbarHeight);
+			scrollbarTop = MENU_Y(PLAYERSETUP_LIST_BODY_TOP + m_nScrollbarTopMargin);
+#else
+			scrollbarBottom = MENU_Y(PLAYERSETUP_LIST_BODY_TOP - 4 + m_nScrollbarTopMargin + scrollbarHeight - SCROLLBAR_MAX_HEIGHT / m_nSkinsTotal);
+			scrollbarTop = MENU_Y(SCROLLBAR_MAX_HEIGHT / m_nSkinsTotal + PLAYERSETUP_LIST_BODY_TOP - 3 + m_nScrollbarTopMargin);
+#endif
+			// Scrollbar shadow
+			CSprite2d::DrawRect(CRect(MENU_X_RIGHT_ALIGNED(PLAYERSETUP_LIST_RIGHT - 4), scrollbarTop,
+				MENU_X_RIGHT_ALIGNED(PLAYERSETUP_LIST_RIGHT - 1 - PLAYERSETUP_SCROLLBAR_WIDTH), scrollbarBottom + MENU_Y(1.0f)),
+				CRGBA(50, 50, 50, FadeIn(255)));
+
+		}
+		// Scrollbar
+		CSprite2d::DrawRect(CRect(MENU_X_RIGHT_ALIGNED(PLAYERSETUP_LIST_RIGHT - 4), scrollbarTop,
+			MENU_X_RIGHT_ALIGNED(PLAYERSETUP_LIST_RIGHT - PLAYERSETUP_SCROLLBAR_WIDTH), scrollbarBottom),
+			CRGBA(SCROLLBAR_COLOR.r, SCROLLBAR_COLOR.g, SCROLLBAR_COLOR.b, FadeIn(255)));
+
+		// FIX: Scroll button dimensions are buggy, because:
+		//		1 - stretches the original image
+		//		2 - leaves gap between button and scrollbar
+		if (m_nHoverOption == HOVEROPTION_CLICKED_SCROLL_UP) {
+#ifdef FIX_BUGS
+			m_aFrontEndSprites[MENUSPRITE_UPON].Draw(CRect(MENU_X_RIGHT_ALIGNED(PLAYERSETUP_LIST_RIGHT - 2), MENU_Y(PLAYERSETUP_LIST_TOP),
+				MENU_X_RIGHT_ALIGNED(PLAYERSETUP_LIST_RIGHT - 2 - PLAYERSETUP_SCROLLBUTTON_TXD_DIMENSION), MENU_Y(PLAYERSETUP_LIST_TOP + PLAYERSETUP_SCROLLBUTTON_TXD_DIMENSION)),
+				CRGBA(255, 255, 255, FadeIn(255)));
+#else
+			m_aFrontEndSprites[MENUSPRITE_UPON].Draw(CRect(MENU_X_RIGHT_ALIGNED(PLAYERSETUP_LIST_RIGHT - 2), MENU_Y(PLAYERSETUP_LIST_TOP),
+				MENU_X_RIGHT_ALIGNED(-20.0f), MENU_Y(PLAYERSETUP_LIST_TOP + 58)),
+				CRGBA(255, 255, 255, FadeIn(255)));
+#endif
+		} else {
+#ifdef FIX_BUGS
+			m_aFrontEndSprites[MENUSPRITE_UPOFF].Draw(CRect(MENU_X_RIGHT_ALIGNED(PLAYERSETUP_LIST_RIGHT - 3), MENU_Y(PLAYERSETUP_LIST_TOP),
+				MENU_X_RIGHT_ALIGNED(PLAYERSETUP_LIST_RIGHT - 3 - PLAYERSETUP_SCROLLBUTTON_TXD_DIMENSION), MENU_Y(PLAYERSETUP_LIST_TOP + PLAYERSETUP_SCROLLBUTTON_TXD_DIMENSION)),
+				CRGBA(255, 255, 255, FadeIn(255)));
+#else
+			m_aFrontEndSprites[MENUSPRITE_UPOFF].Draw(CRect(MENU_X_RIGHT_ALIGNED(PLAYERSETUP_LIST_RIGHT - 3), MENU_Y(PLAYERSETUP_LIST_TOP),
+				MENU_X_RIGHT_ALIGNED(-21.0f), MENU_Y(PLAYERSETUP_LIST_TOP + 58)),
+				CRGBA(255, 255, 255, FadeIn(255)));
+#endif
+		}
+
+		if (m_nHoverOption == HOVEROPTION_CLICKED_SCROLL_DOWN) {
+#ifdef FIX_BUGS
+			m_aFrontEndSprites[MENUSPRITE_DOWNON].Draw(CRect(MENU_X_RIGHT_ALIGNED(PLAYERSETUP_LIST_RIGHT - 2), SCREEN_SCALE_FROM_BOTTOM(PLAYERSETUP_LIST_BOTTOM + PLAYERSETUP_SCROLLBUTTON_HEIGHT + 1),
+				MENU_X_RIGHT_ALIGNED(PLAYERSETUP_LIST_RIGHT - 2 - PLAYERSETUP_SCROLLBUTTON_TXD_DIMENSION), SCREEN_SCALE_FROM_BOTTOM(PLAYERSETUP_LIST_BOTTOM + PLAYERSETUP_SCROLLBUTTON_HEIGHT + 1 - PLAYERSETUP_SCROLLBUTTON_TXD_DIMENSION)),
+				CRGBA(255, 255, 255, FadeIn(255)));
+#else
+			m_aFrontEndSprites[MENUSPRITE_DOWNON].Draw(CRect(MENU_X_RIGHT_ALIGNED(PLAYERSETUP_LIST_RIGHT - 2), SCREEN_SCALE_FROM_BOTTOM(141.0f),
+					MENU_X_RIGHT_ALIGNED(-20.0f), SCREEN_SCALE_FROM_BOTTOM(83.0f)),
+				CRGBA(255, 255, 255, FadeIn(255)));
+#endif
+		} else {
+#ifdef FIX_BUGS
+			m_aFrontEndSprites[MENUSPRITE_DOWNOFF].Draw(CRect(MENU_X_RIGHT_ALIGNED(PLAYERSETUP_LIST_RIGHT - 3), SCREEN_SCALE_FROM_BOTTOM(PLAYERSETUP_LIST_BOTTOM + PLAYERSETUP_SCROLLBUTTON_HEIGHT + 1),
+				MENU_X_RIGHT_ALIGNED(PLAYERSETUP_LIST_RIGHT - 3 - PLAYERSETUP_SCROLLBUTTON_TXD_DIMENSION), SCREEN_SCALE_FROM_BOTTOM(PLAYERSETUP_LIST_BOTTOM + PLAYERSETUP_SCROLLBUTTON_HEIGHT + 1 - PLAYERSETUP_SCROLLBUTTON_TXD_DIMENSION)),
+				CRGBA(255, 255, 255, FadeIn(255)));
+#else
+			m_aFrontEndSprites[MENUSPRITE_DOWNOFF].Draw(CRect(MENU_X_RIGHT_ALIGNED(PLAYERSETUP_LIST_RIGHT - 3), SCREEN_SCALE_FROM_BOTTOM(141.0f),
+				MENU_X_RIGHT_ALIGNED(-21.0f), SCREEN_SCALE_FROM_BOTTOM(83.0f)),
+				CRGBA(255, 255, 255, FadeIn(255)));
+#endif
+
+		}
+		if (activeScreen)
+			CPlayerSkin::RenderFrontendSkinEdit();
+
+		// Big apply button
+		if (strcmp(m_aSkinName, m_PrefsSkinFile) != 0) {
+			CFont::SetFontStyle(FONT_LOCALE(FONT_HEADING));
+			switch (m_PrefsLanguage) {
+				case LANGUAGE_FRENCH:
+					CFont::SetScale(MENU_X(1.1f), MENU_Y(1.9f));
+					break;
+				case LANGUAGE_GERMAN:
+					CFont::SetScale(MENU_X(0.85f), MENU_Y(1.9f));
+					break;
+				case LANGUAGE_ITALIAN:
+				case LANGUAGE_SPANISH:
+					CFont::SetScale(MENU_X(1.4f), MENU_Y(1.9f));
+					break;
+				default:
+					CFont::SetScale(MENU_X(1.9f), MENU_Y(1.9f));
+					break;
+			}
+			CFont::SetColor(CRGBA(MENUOPTION_COLOR.r, MENUOPTION_COLOR.g, MENUOPTION_COLOR.b, FadeIn(120)));
+			CFont::SetRightJustifyOff();
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(24.0f), MENU_Y(220.0f), TheText.Get("FET_APP"));
+		}
+		CFont::SetFontStyle(FONT_LOCALE(FONT_HEADING));
+
+		CFont::SetScale(MENU_X(BIGTEXT_X_SCALE), MENU_Y(BIGTEXT_Y_SCALE));
+
+		if ((m_nMousePosX > MENU_X_RIGHT_ALIGNED(PLAYERSETUP_LIST_RIGHT - 1) - CFont::GetStringWidth(TheText.Get("FEDS_TB"), true)
+			&& m_nMousePosX < MENU_X_RIGHT_ALIGNED(PLAYERSETUP_LIST_RIGHT - 1)
+			&& m_nMousePosY > SCREEN_SCALE_FROM_BOTTOM(PLAYERSETUP_LIST_BOTTOM - 3)
+			&& m_nMousePosY < SCREEN_SCALE_FROM_BOTTOM(PLAYERSETUP_LIST_BOTTOM - 26))
+			|| m_nCurrExLayer == HOVEROPTION_BACK) {
+
+			m_nHoverOption = HOVEROPTION_BACK;
+		} else if ((strcmp(m_aSkinName, m_PrefsSkinFile) != 0
+			&& m_nMousePosX > MENU_X_LEFT_ALIGNED(PLAYERSETUP_LIST_LEFT)
+			&& m_nMousePosX < MENU_X_LEFT_ALIGNED(PLAYERSETUP_LIST_LEFT) + CFont::GetStringWidth(TheText.Get("FES_SET"), true)
+			&& m_nMousePosY > SCREEN_SCALE_FROM_BOTTOM(PLAYERSETUP_LIST_BOTTOM - 3)
+			&& m_nMousePosY < SCREEN_SCALE_FROM_BOTTOM(PLAYERSETUP_LIST_BOTTOM - 26))
+			|| m_nCurrExLayer == HOVEROPTION_USESKIN) {
+
+			m_nHoverOption = HOVEROPTION_USESKIN;
+		} else if (m_nMousePosX > MENU_X_RIGHT_ALIGNED(PLAYERSETUP_LIST_RIGHT - 2)
+			&& m_nMousePosX < MENU_X_RIGHT_ALIGNED(PLAYERSETUP_LIST_RIGHT - PLAYERSETUP_SCROLLBAR_WIDTH - 2)
+			&& m_nMousePosY > MENU_Y(PLAYERSETUP_LIST_TOP)
+			&& m_nMousePosY < MENU_Y(PLAYERSETUP_LIST_BODY_TOP - 3)) {
+			if (m_nHoverOption != HOVEROPTION_CLICKED_SCROLL_UP && m_nHoverOption != HOVEROPTION_CLICKED_SCROLL_DOWN)
+				m_nHoverOption = HOVEROPTION_OVER_SCROLL_UP;
+
+		} else if (m_nMousePosX > MENU_X_RIGHT_ALIGNED(PLAYERSETUP_LIST_RIGHT - 2)
+			&& m_nMousePosX < MENU_X_RIGHT_ALIGNED(PLAYERSETUP_LIST_RIGHT - PLAYERSETUP_SCROLLBAR_WIDTH - 2)
+			&& m_nMousePosY > SCREEN_SCALE_FROM_BOTTOM(PLAYERSETUP_LIST_BOTTOM + PLAYERSETUP_SCROLLBUTTON_HEIGHT + 1)
+			&& m_nMousePosY < SCREEN_SCALE_FROM_BOTTOM(PLAYERSETUP_LIST_BOTTOM)) {
+			if (m_nHoverOption != HOVEROPTION_CLICKED_SCROLL_UP && m_nHoverOption != HOVEROPTION_CLICKED_SCROLL_DOWN)
+				m_nHoverOption = HOVEROPTION_OVER_SCROLL_DOWN;
+
+		} else if (m_nMousePosX > MENU_X_RIGHT_ALIGNED(PLAYERSETUP_LIST_RIGHT - 2)
+			&& m_nMousePosX < MENU_X_RIGHT_ALIGNED(PLAYERSETUP_LIST_RIGHT - PLAYERSETUP_SCROLLBAR_WIDTH - 2)
+				&& m_nMousePosY > MENU_Y(PLAYERSETUP_LIST_BODY_TOP - 3)
+#ifdef FIX_BUGS
+				&& m_nMousePosY < MENU_Y(PLAYERSETUP_LIST_BODY_TOP + m_nScrollbarTopMargin)) {
+#else
+				&& m_nMousePosY < MENU_Y(SCROLLBAR_MAX_HEIGHT / m_nTotalListRow + PLAYERSETUP_LIST_BODY_TOP - 3 + m_nScrollbarTopMargin)) {
+#endif
+			m_nHoverOption = HOVEROPTION_PAGEUP;
+
+		} else if (m_nMousePosX > MENU_X_RIGHT_ALIGNED(PLAYERSETUP_LIST_RIGHT - 2)
+			&& m_nMousePosX < MENU_X_RIGHT_ALIGNED(PLAYERSETUP_LIST_RIGHT - PLAYERSETUP_SCROLLBAR_WIDTH - 2)
+#ifdef FIX_BUGS
+			&& m_nMousePosY > MENU_Y(PLAYERSETUP_LIST_BODY_TOP - 8 + m_nScrollbarTopMargin + scrollbarHeight)
+#else
+			&& m_nMousePosY > MENU_Y(PLAYERSETUP_LIST_BODY_TOP - 3 + m_nScrollbarTopMargin + scrollbarHeight - SCROLLBAR_MAX_HEIGHT / m_nTotalListRow)
+#endif
+			&& m_nMousePosY < SCREEN_SCALE_FROM_BOTTOM(PLAYERSETUP_LIST_BOTTOM + PLAYERSETUP_SCROLLBUTTON_HEIGHT + 1)) {
+			m_nHoverOption = HOVEROPTION_PAGEDOWN;
+
+		} else if (m_nMousePosX > MENU_X_RIGHT_ALIGNED(PLAYERSETUP_LIST_RIGHT - 4)
+			&& m_nMousePosX < MENU_X_RIGHT_ALIGNED(PLAYERSETUP_LIST_RIGHT - PLAYERSETUP_SCROLLBAR_WIDTH)
+#ifdef FIX_BUGS
+			&& m_nMousePosY > MENU_Y(PLAYERSETUP_LIST_BODY_TOP + m_nScrollbarTopMargin)
+			&& m_nMousePosY < MENU_Y(PLAYERSETUP_LIST_BODY_TOP - 8 + m_nScrollbarTopMargin + scrollbarHeight)) {
+#else
+			&& m_nMousePosY > MENU_Y(SCROLLBAR_MAX_HEIGHT / m_nTotalListRow + PLAYERSETUP_LIST_BODY_TOP - 3 + m_nScrollbarTopMargin)
+			&& m_nMousePosY < MENU_Y(PLAYERSETUP_LIST_BODY_TOP - 3 + m_nScrollbarTopMargin + scrollbarHeight - SCROLLBAR_MAX_HEIGHT / m_nTotalListRow)) {
+#endif
+			m_nHoverOption = HOVEROPTION_HOLDING_SCROLLBAR;
+
+		} else if (m_nMousePosX > MENU_X_LEFT_ALIGNED(PLAYERSETUP_LIST_LEFT) && m_nMousePosX < MENU_X_RIGHT_ALIGNED(PLAYERSETUP_LIST_RIGHT)
+			&& m_nMousePosY > MENU_Y(PLAYERSETUP_LIST_BODY_TOP + 1) && m_nMousePosY < SCREEN_SCALE_FROM_BOTTOM(PLAYERSETUP_LIST_BOTTOM)) {
+			m_nHoverOption = HOVEROPTION_LIST;
+
+		} else {
+			m_nHoverOption = HOVEROPTION_NOT_HOVERING;
+		}
+	}
+	CFont::SetFontStyle(FONT_LOCALE(FONT_HEADING));
+	CFont::SetScale(MENU_X(BIGTEXT_X_SCALE), MENU_Y(BIGTEXT_Y_SCALE));
+	CFont::SetRightJustifyOn();
+	CFont::SetColor(CRGBA(MENUOPTION_COLOR.r, MENUOPTION_COLOR.g, MENUOPTION_COLOR.b, FadeIn(255)));
+	CFont::SetDropShadowPosition(2);
+	CFont::SetDropColor(CRGBA(0, 0, 0, FadeIn(255)));
+
+	// Back button
+	CFont::PrintString(MENU_X_RIGHT_ALIGNED(PLAYERSETUP_LIST_RIGHT - 3), SCREEN_SCALE_FROM_BOTTOM(PLAYERSETUP_LIST_BOTTOM - 5), TheText.Get("FEDS_TB"));
+	CFont::SetRightJustifyOff();
+
+	if (!strcmp(m_aSkinName, m_PrefsSkinFile)) {
+		CFont::SetColor(CRGBA(DARKMENUOPTION_COLOR.r, DARKMENUOPTION_COLOR.g, DARKMENUOPTION_COLOR.b, FadeIn(255)));
+	} else {
+		CFont::SetColor(CRGBA(MENUOPTION_COLOR.r, MENUOPTION_COLOR.g, MENUOPTION_COLOR.b, FadeIn(255)));
+	}
+
+	// Use skin button
+	CFont::PrintString(MENU_X_LEFT_ALIGNED(PLAYERSETUP_LIST_LEFT), SCREEN_SCALE_FROM_BOTTOM(PLAYERSETUP_LIST_BOTTOM - 5), TheText.Get("FES_SET"));
+	CFont::SetDropShadowPosition(0);
+}
+
+int
+CMenuManager::FadeIn(int alpha)
+{
+	return Min(m_nMenuFadeAlpha, alpha);
+}
+
+int
+CMenuManager::GetStartOptionsCntrlConfigScreens()
+{
+	int number = 0;
+	switch (m_nCurrScreen) {
+#ifdef LEGACY_MENU_OPTIONS
+		case MENUPAGE_CONTROLLER_PC_OLD3:
+			number = 34;
+			break;
+		case MENUPAGE_CONTROLLER_DEBUG:
+			number = 35;
+			break;
+#endif
+		case MENUPAGE_KEYBOARD_CONTROLS:
+			number = 0;
+			break;
+		default:
+			break;
+	}
+	return number;
+}
+
+void
+CMenuManager::InitialiseChangedLanguageSettings()
+{
+	if (m_bFrontEnd_ReloadObrTxtGxt) {
+		m_bFrontEnd_ReloadObrTxtGxt = false;
+		CTimer::Stop();
+		TheText.Unload();
+		TheText.Load();
+		CTimer::Update();
+		CGame::frenchGame = false;
+		CGame::germanGame = false;
+#ifdef MORE_LANGUAGES
+		CGame::russianGame = false;
+		CGame::japaneseGame = false;
+		switch (m_PrefsLanguage) {
+		case LANGUAGE_POLISH:
+			CFont::ReloadFonts(FONT_LANGSET_POLISH);
+			break;
+		case LANGUAGE_RUSSIAN:
+			CFont::ReloadFonts(FONT_LANGSET_RUSSIAN);
+			break;
+		case LANGUAGE_JAPANESE:
+			CFont::ReloadFonts(FONT_LANGSET_JAPANESE);
+			break;
+		default:
+			CFont::ReloadFonts(FONT_LANGSET_EFIGS);
+			break;
+		}
+#endif
+
+		switch (m_PrefsLanguage) {
+		case LANGUAGE_FRENCH:
+			CGame::frenchGame = true;
+			break;
+		case LANGUAGE_GERMAN:
+			CGame::germanGame = true;
+			break;
+#ifdef MORE_LANGUAGES
+		case LANGUAGE_RUSSIAN:
+			CGame::russianGame = true;
+			break;
+		case LANGUAGE_JAPANESE:
+			CGame::japaneseGame = true;
+			break;
+#endif
+		default:
+			break;
+		}
+
+	}
+}
+
+void
+CMenuManager::LoadAllTextures()
+{
+	if (m_bSpritesLoaded)
+		return;
+
+	// First icon is hidden behind arrow
+	m_LeftMostRadioX = MENU_X_LEFT_ALIGNED(MENURADIO_ICON_FIRST_X - MENURADIO_ICON_SIZE);
+	CTimer::Stop();
+
+	CStreaming::MakeSpaceFor(350 * CDSTREAM_SECTOR_SIZE); // twice of it in mobile
+	CStreaming::ImGonnaUseStreamingMemory();
+	CGame::TidyUpMemory(false, true);
+	CTxdStore::PushCurrentTxd();
+	int frontendTxdSlot1 = CTxdStore::FindTxdSlot("frontend1");
+
+	if(frontendTxdSlot1 == -1)
+		frontendTxdSlot1 = CTxdStore::AddTxdSlot("frontend1");
+
+	printf("LOAD frontend1\n");
+	CTxdStore::LoadTxd(frontendTxdSlot1, "MODELS/FRONTEN1.TXD");
+	CTxdStore::AddRef(frontendTxdSlot1);
+	CTxdStore::SetCurrentTxd(frontendTxdSlot1);
+
+	for (int i = 0; i < 3; i++) {
+		m_aFrontEndSprites[i].SetTexture(FrontendFilenames[i][0], FrontendFilenames[i][1]);
+		m_aFrontEndSprites[i].SetAddressing(rwTEXTUREADDRESSBORDER);
+	}
+
+	CTxdStore::PopCurrentTxd();
+	CStreaming::IHaveUsedStreamingMemory();
+
+	if (!m_OnlySaveMenu) {
+		CStreaming::MakeSpaceFor(692 * CDSTREAM_SECTOR_SIZE); // twice of it in mobile
+		CStreaming::ImGonnaUseStreamingMemory();
+		CTxdStore::PushCurrentTxd();
+
+		int frontendTxdSlot2 = CTxdStore::FindTxdSlot("frontend2");
+
+		if (frontendTxdSlot2 == -1)
+			frontendTxdSlot2 = CTxdStore::AddTxdSlot("frontend2");
+
+		printf("LOAD frontend2\n");
+		CTxdStore::LoadTxd(frontendTxdSlot2, "MODELS/FRONTEN2.TXD");
+		CTxdStore::AddRef(frontendTxdSlot2);
+		CTxdStore::SetCurrentTxd(frontendTxdSlot2);
+
+#ifdef GAMEPAD_MENU
+		for (int i = 3; i < MENUSPRITE_CONTROLLER; i++) {
+#else
+		for (int i = 3; i < NUM_MENU_SPRITES; i++) {
+#endif
+			m_aFrontEndSprites[i].SetTexture(FrontendFilenames[i][0], FrontendFilenames[i][1]);
+			m_aFrontEndSprites[i].SetAddressing(rwTEXTUREADDRESSBORDER);
+		}
+
+		CTxdStore::PopCurrentTxd();
+#ifdef GAMEPAD_MENU
+		LoadController(m_PrefsControllerType);
+#endif
+		CStreaming::IHaveUsedStreamingMemory();
+	}
+
+	m_bSpritesLoaded = true;
+	CTimer::Update();
+}
+
+void
+CMenuManager::LoadSettings()
+{
+	CFileMgr::SetDirMyDocuments();
+	int fileHandle = CFileMgr::OpenFile("gta_vc.set", "r");
+
+	int32 prevLang = m_PrefsLanguage;
+	MousePointerStateHelper.bInvertVertically = true;
+	CMBlur::BlurOn = false;
+
+	// 50 is silly
+	char headerText[50];
+	int someVersion = 0;
+	bool fileIsValid = true;
+
+	if (fileHandle) {
+		CFileMgr::Read(fileHandle, headerText, 29);
+
+		if (strncmp(headerText, TopLineEmptyFile, sizeof(TopLineEmptyFile) - 1) == 0) {
+			fileIsValid = false;
+		} else {
+			CFileMgr::Seek(fileHandle, 0, 0);
+			CFileMgr::Read(fileHandle, (char*)&someVersion, sizeof(someVersion));
+		}
+		if (fileIsValid && someVersion >= 3) {
+			ControlsManager.LoadSettings(fileHandle);
+#ifdef IMPROVED_VIDEOMODE
+			CFileMgr::Read(fileHandle, (char*)&m_nPrefsWidth, sizeof(m_nPrefsWidth));
+			CFileMgr::Read(fileHandle, (char*)&m_nPrefsHeight, sizeof(m_nPrefsHeight));
+			CFileMgr::Read(fileHandle, (char*)&m_nPrefsDepth, sizeof(m_nPrefsDepth));
+			CFileMgr::Read(fileHandle, (char*)&m_nPrefsWindowed, sizeof(m_nPrefsWindowed));
+			CFileMgr::Read(fileHandle, (char*)&m_nPrefsSubsystem, sizeof(m_nPrefsSubsystem));
+			if(m_nPrefsWindowed != 0 && m_nPrefsWindowed != 1){
+				// garbage data from vanilla settings file
+				// let skeleton find something
+				m_nPrefsWidth = 0;
+				m_nPrefsHeight = 0;
+				m_nPrefsDepth = 0;
+				m_nPrefsWindowed = 0;
+				m_nPrefsSubsystem = 0;
+			}
+			m_nSelectedScreenMode = m_nPrefsWindowed;
+#else
+			CFileMgr::Read(fileHandle, gString, 20);
+#endif
+			CFileMgr::Read(fileHandle, gString, 20);
+			CFileMgr::Read(fileHandle, gString, 4);
+			CFileMgr::Read(fileHandle, gString, 4);
+			CFileMgr::Read(fileHandle, gString, 1);
+#ifdef LEGACY_MENU_OPTIONS
+			CFileMgr::Read(fileHandle, (char*)&m_PrefsVsyncDisp, 1);
+			CFileMgr::Read(fileHandle, (char*)&CMBlur::BlurOn, 1);
+#else
+			CFileMgr::Read(fileHandle, gString, 1);
+			CFileMgr::Read(fileHandle, gString, 1);
+#endif
+			CFileMgr::Read(fileHandle, (char*)&TheCamera.m_bHeadBob, 1);
+			CFileMgr::Read(fileHandle, (char*)&TheCamera.m_fMouseAccelHorzntl, 4);
+			CFileMgr::Read(fileHandle, (char*)&MousePointerStateHelper.bInvertVertically, 1);
+			CFileMgr::Read(fileHandle, (char*)&CVehicle::m_bDisableMouseSteering, 1);
+			CFileMgr::Read(fileHandle, (char*)&m_PrefsSfxVolume, 1);
+			CFileMgr::Read(fileHandle, (char*)&m_PrefsMusicVolume, 1);
+			CFileMgr::Read(fileHandle, (char*)&m_PrefsMP3BoostVolume, 1);
+			CFileMgr::Read(fileHandle, (char*)&m_PrefsRadioStation, 1);
+			CFileMgr::Read(fileHandle, (char*)&m_PrefsSpeakers, 1);
+			CFileMgr::Read(fileHandle, (char*)&m_nPrefsAudio3DProviderIndex, 1);
+			CFileMgr::Read(fileHandle, (char*)&m_PrefsDMA, 1);
+			CFileMgr::Read(fileHandle, (char*)&m_PrefsBrightness, 2);
+			CFileMgr::Read(fileHandle, (char*)&m_PrefsLOD, sizeof(m_PrefsLOD));
+			CFileMgr::Read(fileHandle, (char*)&m_PrefsShowSubtitles, 1);
+			CFileMgr::Read(fileHandle, (char*)&m_PrefsUseWideScreen, 1);
+			CFileMgr::Read(fileHandle, (char*)&m_PrefsFrameLimiter, 1);
+			CFileMgr::Read(fileHandle, (char*)&m_nDisplayVideoMode, 1);
+			CFileMgr::Read(fileHandle, m_PrefsSkinFile, 256);
+			CFileMgr::Read(fileHandle, (char*)&m_ControlMethod, 1);
+			CFileMgr::Read(fileHandle, (char*)&m_PrefsLanguage, 1);
+			CFileMgr::Read(fileHandle, (char*)&m_PrefsShowHud, 1);
+			CFileMgr::Read(fileHandle, (char*)&m_PrefsRadarMode, 1);
+			CFileMgr::Read(fileHandle, (char*)&m_PrefsShowLegends, 1);
+		}
+	}
+
+	CFileMgr::CloseFile(fileHandle);
+	CFileMgr::SetDir("");
+
+#ifdef LOAD_INI_SETTINGS
+	if (LoadINISettings()) {
+		LoadINIControllerSettings();
+	}
+	// if no reVC.ini, create it, or update it with new values
+	SaveINISettings();
+	SaveINIControllerSettings();
+#endif
+
+#ifdef FIX_BUGS
+	TheCamera.m_fMouseAccelVertical = TheCamera.m_fMouseAccelHorzntl + 0.0005f;
+#endif
+#ifdef PC_PLAYER_CONTROLS
+	CCamera::m_bUseMouse3rdPerson = m_ControlMethod == CONTROL_STANDARD;
+#endif
+#ifdef LEGACY_MENU_OPTIONS
+	m_PrefsVsync = m_PrefsVsyncDisp;
+#endif
+	CRenderer::ms_lodDistScale = m_PrefsLOD;
+
+	if (m_nPrefsAudio3DProviderIndex == NO_AUDIO_PROVIDER)
+		m_nPrefsAudio3DProviderIndex = -2;
+
+	m_lastWorking3DAudioProvider = m_nPrefsAudio3DProviderIndex;
+
+	if (m_PrefsLanguage == prevLang)
+		m_bLanguageLoaded = false;
+	else {
+		m_bLanguageLoaded = true;
+		TheText.Unload();
+		TheText.Load();
+		m_bFrontEnd_ReloadObrTxtGxt = true;
+		InitialiseChangedLanguageSettings();
+
+		OutputDebugString("The previously saved language is now in use");
+	}
+
+	WIN32_FIND_DATA FindFileData;
+	char skinfile[256+16];	// Stack analysis shows 16 bits gap, but I don't trust it. It may very well be MAX_PATH(260).
+	bool SkinFound = false;
+	HANDLE handle = FindFirstFile("skins\\*.bmp", &FindFileData);
+	for (int i = 1; handle != INVALID_HANDLE_VALUE && i; i = FindNextFile(handle, &FindFileData)) {
+		strcpy(skinfile, m_PrefsSkinFile);
+		strcat(skinfile, ".bmp");
+		if (strcmp(FindFileData.cFileName, skinfile) == 0)
+			SkinFound = true;
+	}
+	FindClose(handle);
+
+	if (!SkinFound) {
+		OutputDebugString("Default skin set as no other skins are available OR saved skin not found!");
+		strcpy(m_PrefsSkinFile, DEFAULT_SKIN_NAME);
+		strcpy(m_aSkinName, DEFAULT_SKIN_NAME);
+	}
+}
+
+void
+CMenuManager::SaveSettings()
+{
+#ifndef LOAD_INI_SETTINGS
+	static char RubbishString[48] = "stuffmorestuffevenmorestuff                 etc";
+#ifdef BIND_VEHICLE_FIREWEAPON
+	static int SomeVersion = 4;
+#else
+	static int SomeVersion = 3;
+#endif
+
+	CFileMgr::SetDirMyDocuments();
+
+	int fileHandle = CFileMgr::OpenFile("gta_vc.set", "w+");
+	if (fileHandle) {
+		CFileMgr::Write(fileHandle, (char*)&SomeVersion, sizeof(SomeVersion));
+		ControlsManager.SaveSettings(fileHandle);
+#ifdef IMPROVED_VIDEOMODE
+		CFileMgr::Write(fileHandle, (char*)&m_nPrefsWidth, sizeof(m_nPrefsWidth));
+		CFileMgr::Write(fileHandle, (char*)&m_nPrefsHeight, sizeof(m_nPrefsHeight));
+		CFileMgr::Write(fileHandle, (char*)&m_nPrefsDepth, sizeof(m_nPrefsDepth));
+		CFileMgr::Write(fileHandle, (char*)&m_nPrefsWindowed, sizeof(m_nPrefsWindowed));
+		CFileMgr::Write(fileHandle, (char*)&m_nPrefsSubsystem, sizeof(m_nPrefsSubsystem));
+#else
+		CFileMgr::Write(fileHandle, RubbishString, 20);
+#endif
+		CFileMgr::Write(fileHandle, RubbishString, 20);
+		CFileMgr::Write(fileHandle, RubbishString, 4);
+		CFileMgr::Write(fileHandle, RubbishString, 4);
+		CFileMgr::Write(fileHandle, RubbishString, 1);
+#ifdef LEGACY_MENU_OPTIONS
+		CFileMgr::Write(fileHandle, (char*)&m_PrefsVsyncDisp, 1);
+		CFileMgr::Write(fileHandle, (char*)&CMBlur::BlurOn, 1);
+#else
+		CFileMgr::Write(fileHandle, RubbishString, 1);
+		CFileMgr::Write(fileHandle, RubbishString, 1);
+#endif
+		CFileMgr::Write(fileHandle, (char*)&TheCamera.m_bHeadBob, 1);
+		CFileMgr::Write(fileHandle, (char*)&TheCamera.m_fMouseAccelHorzntl, 4);
+		CFileMgr::Write(fileHandle, (char*)&MousePointerStateHelper.bInvertVertically, 1);
+		CFileMgr::Write(fileHandle, (char*)&CVehicle::m_bDisableMouseSteering, 1);
+		CFileMgr::Write(fileHandle, (char*)&m_PrefsSfxVolume, 1);
+		CFileMgr::Write(fileHandle, (char*)&m_PrefsMusicVolume, 1);
+		CFileMgr::Write(fileHandle, (char*)&m_PrefsMP3BoostVolume, 1);
+		CFileMgr::Write(fileHandle, (char*)&m_PrefsRadioStation, 1);
+		CFileMgr::Write(fileHandle, (char*)&m_PrefsSpeakers, 1);
+		CFileMgr::Write(fileHandle, (char*)&m_nPrefsAudio3DProviderIndex, 1);
+		CFileMgr::Write(fileHandle, (char*)&m_PrefsDMA, 1);
+		CFileMgr::Write(fileHandle, (char*)&m_PrefsBrightness, 2);
+		CFileMgr::Write(fileHandle, (char*)&m_PrefsLOD, sizeof(m_PrefsLOD));
+		CFileMgr::Write(fileHandle, (char*)&m_PrefsShowSubtitles, 1);
+		CFileMgr::Write(fileHandle, (char*)&m_PrefsUseWideScreen, 1);
+		CFileMgr::Write(fileHandle, (char*)&m_PrefsFrameLimiter, 1);
+		CFileMgr::Write(fileHandle, (char*)&m_nPrefsVideoMode, 1);
+		CFileMgr::Write(fileHandle, m_PrefsSkinFile, 256);
+		CFileMgr::Write(fileHandle, (char*)&m_ControlMethod, 1);
+		CFileMgr::Write(fileHandle, (char*)&m_PrefsLanguage, 1);
+		CFileMgr::Write(fileHandle, (char*)&m_PrefsShowHud, 1);
+		CFileMgr::Write(fileHandle, (char*)&m_PrefsRadarMode, 1);
+		CFileMgr::Write(fileHandle, (char*)&m_PrefsShowLegends, 1);
+	}
+	m_lastWorking3DAudioProvider = m_nPrefsAudio3DProviderIndex;
+
+	CFileMgr::CloseFile(fileHandle);
+	CFileMgr::SetDir("");
+	
+#else
+	m_lastWorking3DAudioProvider = m_nPrefsAudio3DProviderIndex;
+	SaveINISettings();
+#endif
+}
+
+void
+CMenuManager::MessageScreen(const char *text, bool blackBg)
+{
+	CSprite2d *splash = LoadSplash(nil);
+	if (!DoRWStuffStartOfFrame(0, 0, 0, 0, 0, 0, 255))
+		return;
+
+	CSprite2d::SetRecipNearClip();
+	CSprite2d::InitPerFrame();
+	CFont::InitPerFrame();
+	DefinedState();
+	// CRGBA unused(255, 255, 255, 255);
+	if (blackBg) {
+		CSprite2d::DrawRect(CRect(0, SCREEN_HEIGHT, SCREEN_WIDTH, 0), CRGBA(0, 0, 0, 255));
+	}
+
+	m_nMenuFadeAlpha = 255;
+	SmallMessageScreen(text);
+	CFont::DrawFonts();
+	DoRWStuffEndOfFrame();
+}
+
+void
+CMenuManager::SmallMessageScreen(const char* text)
+{
+	CFont::SetBackgroundOff();
+	CFont::SetPropOn();
+	CFont::SetJustifyOn();
+	CFont::SetBackGroundOnlyTextOn();
+	CSprite2d::DrawRect(CRect(SCREEN_STRETCH_X(95.0f), SCREEN_SCALE_FROM_BOTTOM(165.0f), SCREEN_STRETCH_FROM_RIGHT(95.0f), SCREEN_SCALE_Y(115.0f)), CRGBA(50, 50, 50, FadeIn(210)));
+	CFont::SetFontStyle(FONT_LOCALE(FONT_STANDARD));
+	CFont::SetCentreSize(SCREEN_SCALE_X(430.0f));
+	CFont::SetCentreOn();
+	CFont::SetColor(CRGBA(LABEL_COLOR.r, LABEL_COLOR.g, LABEL_COLOR.b, FadeIn(255)));
+	CFont::SetDropShadowPosition(2);
+	CFont::SetDropColor(CRGBA(0, 0, 0, 255));
+	CFont::SetScale(SCREEN_SCALE_X(SMALLTEXT_X_SCALE), SCREEN_SCALE_Y(SMALLTEXT_Y_SCALE));
+	
+	int numOfLines = CFont::GetNumberLines(SCREEN_WIDTH / 2.f, SCREEN_SCALE_Y(135.f), TheText.Get(text));
+	float y;
+	if (numOfLines > 1)
+		y = SCREEN_SCALE_Y(192.f) - numOfLines * SCREEN_SCALE_Y(8.f);
+	else
+		y = SCREEN_SCALE_Y(182.f);
+
+	CFont::PrintString(SCREEN_WIDTH / 2.f, y, TheText.Get(text));
+}
+
+void
+CMenuManager::PrintBriefs()
+{
+	CFont::SetColor(CRGBA(0, 0, 0, FadeIn(255)));
+	CFont::SetRightJustifyOff();
+	CFont::SetFontStyle(FONT_LOCALE(FONT_STANDARD));
+	CFont::SetScale(MENU_X(MEDIUMTEXT_X_SCALE), MENU_Y(MEDIUMTEXT_Y_SCALE));
+	CFont::SetWrapx(MENU_X_RIGHT_ALIGNED(80.0f));
+	CFont::SetDropShadowPosition(0);
+
+	float nextY = BRIEFS_BOTTOM_MARGIN;
+	for (int i = 4; i >= 0; i--) {
+		if (nextY < BRIEFS_TOP_MARGIN)
+			break;
+
+		tPreviousBrief &brief = CMessages::PreviousBriefs[i];
+		if (brief.m_pText) {
+			CMessages::InsertNumberInString(brief.m_pText,
+				brief.m_nNumber[0], brief.m_nNumber[1],
+				brief.m_nNumber[2], brief.m_nNumber[3],
+				brief.m_nNumber[4], brief.m_nNumber[5], gUString);
+			CMessages::InsertStringInString(gUString, brief.m_pString);
+			CMessages::InsertPlayerControlKeysInString(gUString);
+			CFont::FilterOutTokensFromString(gUString);
+
+			nextY -= CFont::GetNumberLines(MENU_X_LEFT_ALIGNED(BRIEFS_LINE_X), nextY, gUString) * BRIEFS_LINE_HEIGHT + BRIEFS_LINE_SPACING;
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(BRIEFS_LINE_X), MENU_Y(nextY), gUString);
+		}
+	}
+}
+
+void
+CMenuManager::PrintStats()
+{
+#ifdef SECUROM
+	static uint8 statsPirateCheck = 0;
+#endif
+	static float scrollY = 0;
+
+	int rowNum = CStats::ConstructStatLine(99999);
+	CSprite2d::Draw2DPolygon(MENU_X_LEFT_ALIGNED(90.0f), MENU_Y(142.0f),
+		MENU_X_LEFT_ALIGNED(543.0f), MENU_Y(142.f),
+		MENU_X_LEFT_ALIGNED(107.0f), MENU_Y(316.f),
+		MENU_X_LEFT_ALIGNED(531.f), MENU_Y(299.f), CRGBA(LIST_BACKGROUND_COLOR.r, LIST_BACKGROUND_COLOR.g, LIST_BACKGROUND_COLOR.b, FadeIn(LIST_BACKGROUND_COLOR.a)));
+
+	CFont::SetFontStyle(FONT_LOCALE(FONT_STANDARD));
+	CFont::SetPropOn();
+	CFont::SetDropShadowPosition(0);
+
+#ifdef SECUROM
+	if (statsPirateCheck == 0)
+		// if not pirated game
+		// statsPirateCheck = 46;
+		// else
+		statsPirateCheck = 45;
+#endif
+
+	if (m_PrefsLanguage == LANGUAGE_AMERICAN)
+		CFont::SetScale(MENU_X(0.43f), MENU_Y(0.75f));
+	else
+		CFont::SetScale(MENU_X(0.37f), MENU_Y(0.75f));
+
+	static PauseModeTime lastCheck = 0;
+
+	if (CTimer::GetTimeInMillisecondsPauseMode() - lastCheck > 40) {
+
+		if (m_StatsScrollSpeed > 0.f) {
+			if (m_StatsScrollDirection == 0)
+				scrollY -= MENU_Y(100.f) / m_StatsScrollSpeed;
+			else
+				scrollY += MENU_Y(100.f) / m_StatsScrollSpeed;
+		}
+		lastCheck = CTimer::GetTimeInMillisecondsPauseMode();
+	}
+
+#ifdef SECUROM
+	if (statsPirateCheck == 45)
+		return;
+#endif
+
+	float nextYChange, y, alpha;
+
+	float totalHeight = (rowNum + 7) * STATS_ROW_HEIGHT;
+	for (int row = 0; row < rowNum; ++row) {
+		// Put faded away text at the top back to the bottom, in circular fashion
+		for (y = MENU_Y(STATS_ROW_HEIGHT) * row + MENU_Y(100.f) - scrollY; MENU_Y(STATS_FADING_AREA_LENGTH) > y; y += nextYChange) {
+			nextYChange = MENU_Y(totalHeight);
+		}
+
+		// Put faded away text at the bottom back to the top
+		while (SCREEN_SCALE_FROM_BOTTOM(STATS_FADING_AREA_LENGTH) < y) {
+			y -= MENU_Y(totalHeight);
+		}
+		alpha = 0.f;
+
+		// If it's still on screen
+		if (y > MENU_Y(STATS_VISIBLE_START_Y) && y < MENU_Y(STATS_VISIBLE_END_Y)) {
+			CStats::ConstructStatLine(row);
+
+			// But about to dim from bottom
+			if (y < MENU_Y(STATS_BOTTOM_Y)) {
+				if (y > MENU_Y(STATS_BOTTOM_Y - STATS_FADING_AREA_LENGTH))
+					alpha = (MENU_Y(STATS_BOTTOM_Y) - y) * 5.f;
+			}
+
+			// About to dim from top
+			if (y > MENU_Y(STATS_TOP_Y)) {
+				if (y < MENU_Y(STATS_TOP_Y + STATS_FADING_AREA_LENGTH))
+					alpha = (y - MENU_Y(STATS_TOP_Y)) * 5.f;
+			}
+
+			// Content
+			if (y >= MENU_Y(STATS_TOP_Y + STATS_FADING_AREA_LENGTH) && y <= MENU_Y(STATS_BOTTOM_Y - STATS_FADING_AREA_LENGTH))
+				alpha = 255.0f;
+
+			CFont::SetColor(CRGBA(0, 0, 0, FadeIn(Min(255.f, alpha))));
+			CFont::SetRightJustifyOff();
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(STATS_ROW_LEFT_MARGIN), y, gUString);
+			CFont::SetRightJustifyOn();
+			CFont::PrintString(MENU_X_RIGHT_ALIGNED(STATS_ROW_RIGHT_MARGIN), y, gUString2);
+		}
+	}
+	CFont::SetColor(CRGBA(MENUOPTION_COLOR.r, MENUOPTION_COLOR.g, MENUOPTION_COLOR.b, FadeIn(255)));
+	CFont::SetDropShadowPosition(2);
+	CFont::SetDropColor(CRGBA(0, 0, 0, FadeIn(255)));
+	CFont::SetCentreOn();
+	CFont::SetFontStyle(FONT_LOCALE(FONT_HEADING));
+	CFont::SetScale(MENU_X(0.65f), MENU_Y(1.05f));
+	CFont::PrintString(MENU_X_LEFT_ALIGNED(STATS_RATING_X), MENU_Y(STATS_RATING_Y_1), TheText.Get("CRIMRA"));
+
+	CFont::SetCentreOff();
+	CFont::SetRightJustifyOff();
+
+	// FIX: Game does that in a weird way, alignment and spacing is now ok
+
+	sprintf(gString, "(%d)", CStats::FindCriminalRatingNumber());
+	AsciiToUnicode(gString, gUString);
+
+	UnicodeStrcpy(gUString2, CStats::FindCriminalRatingString());
+	UnicodeStrcat(gUString2, gUString);
+
+	CFont::SetFontStyle(FONT_LOCALE(FONT_STANDARD));
+#ifndef FIX_BUGS
+	CFont::SetScale(MENU_X(0.5f), MENU_Y(0.9f));
+#else
+	CFont::SetScale(MENU_X(SMALLTEXT_X_SCALE), MENU_Y(SMALLTEXT_Y_SCALE));
+#endif
+	CFont::SetColor(CRGBA(0, 0, 0, FadeIn(255)));
+	CFont::SetDropShadowPosition(0);
+
+	CFont::PrintString(MENU_X_LEFT_ALIGNED(STATS_RATING_X) - CFont::GetStringWidth(gUString2, true) / 2.f, MENU_Y(STATS_RATING_Y_2), gUString2);
+}
+
+void
+CMenuManager::Process(void)
+{
+#ifdef XBOX_MESSAGE_SCREEN
+	ProcessDialogTimer();
+#endif
+
+	if (TheCamera.GetScreenFadeStatus() != FADE_0)
+		return;
+
+	InitialiseChangedLanguageSettings();
+
+	if (m_bMenuActive) {
+		UserInput();
+		ProcessFileActions();
+		DMAudio.Service();
+#ifdef USE_TEXTURE_POOL
+		// TODO
+#endif
+	}
+
+	SwitchMenuOnAndOff();
+}
+
+#ifdef MAP_ENHANCEMENTS
+#define ZOOM(x, y, in) \
+	do { \
+		if(m_fMapSize >= MENU_Y(1000.0f) && in) \
+			break; \
+		float z2 = in? 1.1f : 1.f/1.1f; \
+		m_fMapCenterX += (x - m_fMapCenterX) * (1.0f - z2); \
+		m_fMapCenterY += (y - m_fMapCenterY) * (1.0f - z2); \
+		\
+		if (m_fMapSize <= MENU_Y(MAP_MIN_SIZE) && !in) \
+			break; \
+		\
+		m_fMapSize *= z2; \
+		m_fMapCenterX = clamp(m_fMapCenterX, SCREEN_WIDTH/2 - (m_fMapSize - MENU_X(MAP_MIN_SIZE)), m_fMapSize - MENU_X(MAP_MIN_SIZE) + SCREEN_WIDTH/2); \
+		m_fMapCenterY = clamp(m_fMapCenterY, SCREEN_HEIGHT/2 - (m_fMapSize - MENU_Y(MAP_MIN_SIZE)), m_fMapSize - MENU_Y(MAP_MIN_SIZE) + SCREEN_HEIGHT/2); \
+	} while(0)
+
+#endif
+
+// Handles Map, Audio and Stats
+void
+CMenuManager::AdditionalOptionInput(bool &goBack)
+{
+	switch (m_nCurrScreen) {
+		case MENUPAGE_MAP:
+		{
+			static PauseModeTime lastMapTick = 0;
+
+			// FIX: All those macros were hardcoded values originally.
+
+#ifndef MAP_ENHANCEMENTS
+			if (CPad::GetPad(0)->GetMouseWheelUpJustDown() || CPad::GetPad(0)->GetMouseWheelUpJustUp() || CPad::GetPad(0)->GetPageUp() || CPad::GetPad(0)->GetRightShoulder1()) {
+				if (CTimer::GetTimeInMillisecondsPauseMode() - lastMapTick > 10) {
+					m_fMapSize = Min(MENU_Y(1000.0f), m_fMapSize + MENU_Y(15.f));
+				}
+			}
+			if (CPad::GetPad(0)->GetMouseWheelDownJustDown() || CPad::GetPad(0)->GetMouseWheelDownJustUp() || CPad::GetPad(0)->GetPageDown() || CPad::GetPad(0)->GetRightShoulder2()) {
+				if (CTimer::GetTimeInMillisecondsPauseMode() - lastMapTick > 10) {
+					if (m_fMapSize > MENU_Y(MAP_MIN_SIZE)) {
+						if (m_fMapCenterY > SCREEN_HEIGHT/2)
+							m_fMapCenterY -= (m_fMapCenterY - SCREEN_HEIGHT/2) / ((m_fMapSize - MENU_Y(MAP_MIN_SIZE)) * 1/15.f);
+
+						if (m_fMapCenterY < SCREEN_HEIGHT/2)
+							m_fMapCenterY += (SCREEN_HEIGHT/2 - m_fMapCenterY) / ((m_fMapSize - MENU_Y(MAP_MIN_SIZE)) * 1/15.f);
+
+						if (m_fMapCenterX > SCREEN_WIDTH/2)
+							m_fMapCenterX -= (m_fMapCenterX - SCREEN_WIDTH/2) / ((m_fMapSize - MENU_X(MAP_MIN_SIZE)) * 1/15.f);
+
+						if (m_fMapCenterX < SCREEN_WIDTH/2)
+							m_fMapCenterX += (SCREEN_WIDTH/2 - m_fMapCenterX) / ((m_fMapSize - MENU_X(MAP_MIN_SIZE)) * 1/15.f);
+
+						m_fMapSize = Max(MENU_Y(MAP_MIN_SIZE), m_fMapSize - MENU_Y(15.f));
+						m_fMapCenterX = clamp(m_fMapCenterX, SCREEN_WIDTH/2 - (m_fMapSize - MENU_X(MAP_MIN_SIZE)), m_fMapSize - MENU_X(MAP_MIN_SIZE) + SCREEN_WIDTH/2);
+						m_fMapCenterY = clamp(m_fMapCenterY, SCREEN_HEIGHT/2 - (m_fMapSize - MENU_Y(MAP_MIN_SIZE)), m_fMapSize - MENU_Y(MAP_MIN_SIZE) + SCREEN_HEIGHT/2);
+					} else {
+						m_fMapSize = MENU_Y(MAP_MIN_SIZE);
+					}
+				}
+			}
+#else
+			// Adding marker
+			if (m_nMenuFadeAlpha == 255) {
+				if (CPad::GetPad(0)->GetRightMouseJustDown() || CPad::GetPad(0)->GetCrossJustDown()) {
+					if (mapCrosshair.y > m_fMapCenterY - m_fMapSize && mapCrosshair.y < m_fMapCenterY + m_fMapSize &&
+						mapCrosshair.x > m_fMapCenterX - m_fMapSize && mapCrosshair.x < m_fMapCenterX + m_fMapSize) {
+
+						// Don't ask me the meanings, I don't know. Found them by trying
+						float diffX = m_fMapCenterX - m_fMapSize, diffY = m_fMapCenterY - m_fMapSize;
+						float x = ((mapCrosshair.x - diffX) / (m_fMapSize * 2)) * (WORLD_SIZE_X / MENU_MAP_WIDTH_SCALE) - (WORLD_SIZE_X / 2 + MENU_MAP_LEFT_OFFSET * MENU_MAP_LENGTH_UNIT);
+						float y = (WORLD_SIZE_Y / 2 - MENU_MAP_TOP_OFFSET * MENU_MAP_LENGTH_UNIT) - ((mapCrosshair.y - diffY) / (m_fMapSize * 2)) * (WORLD_SIZE_Y / MENU_MAP_HEIGHT_SCALE);
+						CRadar::ToggleTargetMarker(x, y);
+						DMAudio.PlayFrontEndSound(SOUND_FRONTEND_ENTER_OR_ADJUST, 0);
+					}
+				}
+			}
+
+			if (CPad::GetPad(0)->GetMouseWheelDown() || CPad::GetPad(0)->GetPageDown() || CPad::GetPad(0)->GetRightShoulder2()) {
+				if (CPad::GetPad(0)->GetMouseWheelDown() && m_fMapSize > MENU_X(MAP_SIZE_TO_ALLOW_X_MOVE))
+					ZOOM(mapCrosshair.x, mapCrosshair.y, false);
+				else
+					ZOOM(SCREEN_WIDTH / 2, SCREEN_HEIGHT / 2, false);
+
+			} else if (CPad::GetPad(0)->GetMouseWheelUp() || CPad::GetPad(0)->GetPageUp() || CPad::GetPad(0)->GetRightShoulder1()) {
+				if (CPad::GetPad(0)->GetMouseWheelUp())
+					ZOOM(mapCrosshair.x, mapCrosshair.y, true);
+				else
+					ZOOM(SCREEN_WIDTH / 2, SCREEN_HEIGHT / 2, true);
+			}
+			
+			static bool justResetPointer = false;
+			if (CPad::GetPad(0)->GetLeftMouse()) {
+				if (!justResetPointer) {
+					m_fMapCenterX += m_nMousePosX - m_nMouseOldPosX;
+					m_fMapCenterY += m_nMousePosY - m_nMouseOldPosY;
+					m_fMapCenterX = clamp(m_fMapCenterX, SCREEN_WIDTH/2 - (m_fMapSize - MENU_X(MAP_MIN_SIZE)), m_fMapSize - MENU_X(MAP_MIN_SIZE) + SCREEN_WIDTH/2);
+					m_fMapCenterY = clamp(m_fMapCenterY, SCREEN_HEIGHT/2 - (m_fMapSize - MENU_Y(MAP_MIN_SIZE)), m_fMapSize - MENU_Y(MAP_MIN_SIZE) + SCREEN_HEIGHT/2);
+				}
+				justResetPointer = false;
+
+			} else
+#undef ZOOM
+#endif
+
+			{
+				// This is else block of GetLeftMouse() if MAP_ENHANCEMENTS defined, so all of GetLeftMouse() conditions below being rendered useless. 
+
+				if (CPad::GetPad(0)->GetLeftMouse() && m_nMousePosY < m_nMouseOldPosY || CPad::GetPad(0)->GetUp() ||
+					CPad::GetPad(0)->GetDPadUp() || CPad::GetPad(0)->GetAnalogueUpDown() < 0) {
+					if (CTimer::GetTimeInMillisecondsPauseMode() - lastMapTick > 10) {
+						if ((m_fMapSize - MENU_Y(MAP_MIN_SIZE)) + SCREEN_HEIGHT/2 > m_fMapCenterY)
+							m_fMapCenterY += MENU_Y(15.f);
+						m_bShowMouse = false;
+					}				
+				}
+
+				if (CPad::GetPad(0)->GetLeftMouse() && m_nMousePosY > m_nMouseOldPosY || CPad::GetPad(0)->GetDown() ||
+					CPad::GetPad(0)->GetDPadDown() || CPad::GetPad(0)->GetAnalogueUpDown() > 0) {
+					if (CTimer::GetTimeInMillisecondsPauseMode() - lastMapTick > 10) {
+						if (SCREEN_HEIGHT/2 - (m_fMapSize - MENU_Y(MAP_MIN_SIZE)) < m_fMapCenterY)
+							m_fMapCenterY -= MENU_Y(15.f);
+						m_bShowMouse = false;
+					}				
+				}
+
+				if (CPad::GetPad(0)->GetLeftMouse() && m_nMousePosX < m_nMouseOldPosX || CPad::GetPad(0)->GetLeft() ||
+					CPad::GetPad(0)->GetDPadLeft() || CPad::GetPad(0)->GetAnalogueLeftRight() < 0) {
+					if (CTimer::GetTimeInMillisecondsPauseMode() - lastMapTick > 10) {
+						if (m_fMapSize > MENU_X(MAP_SIZE_TO_ALLOW_X_MOVE) && m_fMapSize - MENU_X(MAP_MIN_SIZE) + SCREEN_WIDTH/2 > m_fMapCenterX)
+							m_fMapCenterX += MENU_X(15.f);
+						m_bShowMouse = false;
+					}				
+				}
+
+				if (CPad::GetPad(0)->GetLeftMouseJustUp()) {
+					// The coordinates in aScreens->MENUPAGE_MAP.
+					if (m_nMousePosX > MENU_X_LEFT_ALIGNED(60.0f) && m_nMousePosX < MENU_X_LEFT_ALIGNED(140.0f)) {
+						if (m_nMousePosY > MENU_Y(375.0f) && m_nMousePosY < MENU_Y(400.0f)) {
+								m_nHoverOption = HOVEROPTION_RANDOM_ITEM;
+								goBack = true;
+						}
+					}
+				}
+
+				if (CPad::GetPad(0)->GetLeftMouse() && m_nMousePosX > m_nMouseOldPosX || CPad::GetPad(0)->GetRight() ||
+					CPad::GetPad(0)->GetDPadRight() || CPad::GetPad(0)->GetAnalogueLeftRight() > 0) {
+					if (CTimer::GetTimeInMillisecondsPauseMode() - lastMapTick > 10) {
+						if (m_fMapSize > MENU_X(MAP_SIZE_TO_ALLOW_X_MOVE) && SCREEN_WIDTH/2 - (m_fMapSize - MENU_X(MAP_MIN_SIZE)) < m_fMapCenterX)
+							m_fMapCenterX -= MENU_X(15.f);
+						m_bShowMouse = false;
+					}				
+				}
+			}
+
+
+			if (CTimer::GetTimeInMillisecondsPauseMode() - lastMapTick > 10)
+				lastMapTick = CTimer::GetTimeInMillisecondsPauseMode();
+
+#ifndef MAP_ENHANCEMENTS
+			if (CPad::GetPad(0)->GetLeftMouseJustUp())
+				CentreMousePointer();
+#endif
+
+			if (CPad::GetPad(0)->GetLeftMouse()) {
+				if (m_nMousePosX < SCREEN_STRETCH_X(20.0f) || m_nMousePosX > SCREEN_STRETCH_X(620.0f) || m_nMousePosY < SCREEN_STRETCH_Y(20.0f) || m_nMousePosY > SCREEN_STRETCH_Y(428.0f)) {
+#ifdef MAP_ENHANCEMENTS
+					justResetPointer = true;
+#endif
+					CentreMousePointer();
+				}
+			}
+			if (!CPad::GetPad(0)->GetLeftMouse() && !m_bShowMouse && (m_nMouseOldPosX != m_nMousePosX || m_nMouseOldPosY != m_nMousePosY)) {
+				m_bShowMouse = true;
+			}
+
+			static bool pressedL = false;
+
+			if (!CPad::GetPad(0)->GetChar('L') && !CPad::GetPad(0)->GetChar('l')) {
+				pressedL = false;
+			}
+
+			if (!pressedL) {
+				if (CPad::GetPad(0)->GetChar('L') || CPad::GetPad(0)->GetChar('l')) {
+					m_PrefsShowLegends = !m_PrefsShowLegends;
+					pressedL = true;
+				}
+			}
+			break;
+		}
+		case MENUPAGE_SOUND_SETTINGS:
+			if (CheckHover(MENU_X_LEFT_ALIGNED(177.f), MENU_X_LEFT_ALIGNED(238.f), MENU_Y(MENURADIO_SELECTOR_START_Y - 13.f), MENU_Y(MENURADIO_SELECTOR_START_Y + MENURADIO_SELECTOR_HEIGHT - 8.f))) {
+					m_nHoverOption = HOVEROPTION_PREV_RADIO;
+			}
+
+			if (CheckHover(MENU_X_LEFT_ALIGNED(422.f), MENU_X_LEFT_ALIGNED(491.f), MENU_Y(MENURADIO_SELECTOR_START_Y - 13.f), MENU_Y(MENURADIO_SELECTOR_START_Y + MENURADIO_SELECTOR_HEIGHT - 8.f))) {
+					m_nHoverOption = HOVEROPTION_NEXT_RADIO;
+			}
+			break;
+		case MENUPAGE_STATS:
+		{
+			if (CPad::GetPad(0)->GetMouseWheelUpJustDown() || CPad::GetPad(0)->GetMouseWheelUpJustUp() || CPad::GetPad(0)->GetUp() ||
+				CPad::GetPad(0)->GetDPadUp() || CPad::GetPad(0)->GetAnalogueUpDown() < 0) {
+
+				m_StatsScrollSpeed = 20.0f;
+				m_StatsScrollDirection = 0;
+
+			} else if (CPad::GetPad(0)->GetMouseWheelDownJustDown() || CPad::GetPad(0)->GetMouseWheelDownJustUp() || CPad::GetPad(0)->GetDown() ||
+				CPad::GetPad(0)->GetDPadDown() || CPad::GetPad(0)->GetAnalogueUpDown() > 0) {
+				
+				m_StatsScrollSpeed = 20.0f;
+				m_StatsScrollDirection = 1;
+
+			} else if (CPad::GetPad(0)->GetChar(' ')) {
+				m_StatsScrollSpeed = 0.0f;
+			} else
+				m_StatsScrollSpeed = 150.0f;
+
+			static bool pressedS = false;
+
+			if (!CPad::GetPad(0)->GetChar('S') && !CPad::GetPad(0)->GetChar('s')) {
+				pressedS = false;
+			}
+
+			if (!pressedS) {
+				if (CPad::GetPad(0)->GetChar('S') || CPad::GetPad(0)->GetChar('s')) {
+					ExportStats();
+					m_nHelperTextMsgId = 4;
+					m_nHelperTextAlpha = 300;
+					pressedS = true;
+				}
+			}
+			break;
+		}
+	}
+}
+
+// Not original name
+void
+CMenuManager::ExportStats()
+{
+	char date[10];
+	CFileMgr::SetDirMyDocuments();
+	_strdate(date);
+	wchar *lastMission = TheText.Get(CStats::LastMissionPassedName[0] == '\0' ? "ITBEG" : CStats::LastMissionPassedName);
+	FILE *txtFile = fopen("stats.txt", "w");
+
+	if (txtFile) {
+		int statLines = CStats::ConstructStatLine(99999);
+		fprintf(txtFile, "-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-\n");
+		fprintf(txtFile, "\t\t\tGTA VICE CITY %s\n", UnicodeToAscii(TheText.Get("FEH_STA")));
+		fprintf(txtFile, "-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-\n\n\n");
+		fprintf(txtFile, "%s: ", UnicodeToAscii(TheText.Get("FES_CMI")));
+		fprintf(txtFile, "%s\n", UnicodeToAscii(lastMission));
+		fprintf(txtFile, "%s: ", UnicodeToAscii(TheText.Get("FES_DAT")));
+		fprintf(txtFile, "%s\n\n\n", date);
+		fprintf(txtFile, "%s  ", UnicodeToAscii(TheText.Get("CRIMRA")));
+		UnicodeStrcpy(gUString, CStats::FindCriminalRatingString());
+		fprintf(txtFile, "%s (%d)\n\n\n", UnicodeToAscii(gUString), CStats::FindCriminalRatingNumber());
+		for (int i = 0; i < statLines; ++i) {
+			CStats::ConstructStatLine(i);
+			char *statKey = UnicodeToAscii(gUString);
+			if (statKey[0] != '\0')
+				fprintf(txtFile, "- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -\n%s\n", statKey);
+
+			char *statValue = UnicodeToAscii(gUString2);
+			for (int j = 0; statValue[j] != '\0'; ++j) {
+				if (statValue[j] == '_')
+					statValue[j] = '\xBA'; // This is degree symbol, but my editors keeps messing up with it so I wrote hex representation
+			}
+			if (statValue)
+				fprintf(txtFile, "%s\n\n", statValue);
+		}
+		fprintf(txtFile, "-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-\n\n");
+	}
+	fclose(txtFile);
+	FILE *htmlFile = fopen("stats.html", "w");
+	if (htmlFile) {
+		int statLines = CStats::ConstructStatLine(99999);
+		fprintf(htmlFile, "<title>Grand Theft Auto Vice City Stats</title>\n");
+		fprintf(htmlFile, "<body bgcolor=\"#FF00CC\" leftmargin=\"10\" topmargin=\"10\" marginwidth=\"10\" marginheight=\"10\">\n");
+		fprintf(htmlFile, "<table width=\"560\" align=\"center\" border=\"0\" cellpadding=\"5\" cellspacing=\"0\">\n");
+		fprintf(htmlFile, "<tr align=\"center\" valign=\"top\"> \n");
+		fprintf(htmlFile, "<td height=\"59\" colspan=\"2\" bgcolor=\"#FFCCFF\"><div align=\"center\"><font color=\"#FF00CC\" size=\"3\" "
+			"face=\"Arial, \n");
+		fprintf(htmlFile, "Helvetica, sans-serif\">-------------------------------------------------------------------------</font><font \n");
+		fprintf(htmlFile, "size=\"3\" face=\"Arial, Helvetica, sans-serif\"><br>\n");
+		fprintf(htmlFile, "<strong><font color=\"#000000\">GRAND THEFT AUTO VICE CITY ");
+		fprintf(htmlFile, "%s</font></strong><br><font\n", UnicodeToAscii(TheText.Get("FEH_STA")));
+		fprintf(htmlFile, "color=\"#FF00CC\">-------------------------------------------------------------------------</font></font></div></td> </tr>\n");
+		fprintf(htmlFile, "<tr align=\"left\" valign=\"top\" bgcolor=\"#FFFFFF\">     <td height=\"22\" colspan=\"2\">&nbsp;</td>  </tr>\n");
+		fprintf(htmlFile, "<tr align=\"left\" valign=\"top\" bgcolor=\"#FFFFFF\"> \n");
+		fprintf(htmlFile,
+			"<td height=\"40\" colspan=\"2\"> <p><font color=\"#00CC00\" size=\"2\" face=\"Arial, Helvetica, sans-serif\">"
+			"<strong><font color=\"#009900\" size=\"1\">%s: \n", UnicodeToAscii(TheText.Get("FES_DAT")));
+		fprintf(htmlFile, "%s</font><br>        %s: </strong>", date, UnicodeToAscii(TheText.Get("FES_CMI")));
+		fprintf(htmlFile, "%s<strong><br></strong> </font></p></td></tr>\n", UnicodeToAscii(lastMission));
+		fprintf(htmlFile, "<tr align=\"left\" valign=\"top\" bgcolor=\"#CCCCCC\"> <td height=\"5\" colspan=\"2\"></td> </tr> <tr align=\""
+			"left\" valign=\"top\" bgcolor=\"#FFFFFF\"> \n");
+		fprintf(htmlFile, "<td height=\"10\" colspan=\"2\"></td> </tr> <tr align=\"left\" valign=\"top\" bgcolor=\"#FFFFFF\"> \n");
+		fprintf(htmlFile, "<td height=\"20\" colspan=\"2\"><font color=\"#FF00CC\" size=\"2\" face=\"Arial, Helvetica, sans-serif\"><str"
+			"ong>%s</strong>\n", UnicodeToAscii(TheText.Get("CRIMRA")));
+
+		UnicodeStrcpy(gUString, CStats::FindCriminalRatingString());
+		char *statKey = UnicodeToAscii(gUString);
+		int rating = CStats::FindCriminalRatingNumber();
+		fprintf(htmlFile, "%s (%d)</font></td>  </tr>  <tr align=\"left\" valign=\"top\" bgcolor=\"#FFFFFF\"><td height=\"10\" colspan=\""
+			"2\"></td>  </tr>\n", statKey, rating);
+
+		for (int k = 0; k < statLines; ++k) {
+			CStats::ConstructStatLine(k);
+			statKey = UnicodeToAscii(gUString);
+			if (statKey[0] != '\0')
+				fprintf(htmlFile, "</font></strong></div></td> </tr> <tr align=\"left\" valign=\"top\" bgcolor=\"#FFFFFF\">  <td height=\"10"
+					"\" colspan=\"2\"></td> </tr>\n");
+
+			fprintf(htmlFile, "<tr align=\"left\" valign=\"top\"><td width=\"500\" height=\"22\" bgcolor=\"#FFCCFF\"><font color=\"#FF00CC"
+				"\" size=\"2\" face=\"Arial, Helvetica, sans-serif\"><strong>\n");
+
+			if (statKey[0] != '\0')
+				fprintf(htmlFile, "%s", statKey);
+			else
+				fprintf(htmlFile, " ");
+
+			fprintf(htmlFile, "</strong></font></td> <td width=\"500\" align=\"right\" valign=\"middle\" bgcolor=\"#FFCCFF\"> <div align=\""
+				"right\"><strong><font color=\"#FF00CC\">\n");
+
+			char *statValue = UnicodeToAscii(gUString2);
+			for (int l = 0; statValue[l] != '\0'; ++l) {
+				if (statValue[l] == '_')
+					statValue[l] = '\xBA'; // This is degree symbol, but my editors keeps messing up with it so I wrote hex representation
+			}
+			if (statValue)
+				fprintf(htmlFile, "%s", statValue);
+			else
+				fprintf(htmlFile, " ");
+		}
+		fprintf(htmlFile, "</font></strong></div></td> </tr> <tr align=\"left\" valign=\"top\" bgcolor=\"#FFFFFF\">  <td height=\"10\" c"
+			"olspan=\"2\"></td> </tr>\n");
+		fprintf(htmlFile, "</table><br><table width=\"560\" border=\"0\"  align=\"center\" cellspacing=\"0\" cellpadding=\"5\"><tr align"
+			"=\"center\" valign=\"middle\" bgcolor=\"#FFCCFF\">");
+		fprintf(htmlFile, "<td><font color=\"#000000\" size=\"2\" face=\"Arial, Helvetica, sans-serif\"><a href=\"http://www.rockstargam"
+			"es.com/vicecity\">rockstargames.com/vicecity</a></font></td>\n");
+		fprintf(htmlFile, "<td><font color=\"#000000\" size=\"2\" face=\"Arial, Helvetica, sans-serif\"><a href=\"http://www.rockstargam"
+			"es.com\">rockstargames.com</a></font></td>\n");
+		fprintf(htmlFile, "<td><font color=\"#000000\" size=\"2\" face=\"Arial, Helvetica, sans-serif\">&nbsp;<a href=\"http://www.rocks"
+			"tarnorth.com\">rockstarnorth.com</a></font></td></tr>\n");
+		fprintf(htmlFile, "</table>\n</body>\n");
+	}
+	fclose(htmlFile);
+	CFileMgr::SetDir("");
+}
+
+// Original name is unknown
+void
+CMenuManager::PrintRadioSelector(void)
+{
+	static PauseModeTime lastRadioChange = 0;
+
+	CSprite2d::Draw2DPolygon(MENU_X_LEFT_ALIGNED(418.f), MENU_Y(MENURADIO_SELECTOR_START_Y + MENURADIO_SELECTOR_HEIGHT),
+		MENU_X_LEFT_ALIGNED(228.f), MENU_Y(MENURADIO_SELECTOR_START_Y + MENURADIO_SELECTOR_HEIGHT),
+		MENU_X_LEFT_ALIGNED(428.f), MENU_Y(MENURADIO_SELECTOR_START_Y),
+		MENU_X_LEFT_ALIGNED(238.f), MENU_Y(MENURADIO_SELECTOR_START_Y), CRGBA(RADIO_SELECTOR_COLOR.r, RADIO_SELECTOR_COLOR.g, RADIO_SELECTOR_COLOR.b, FadeIn(180)));
+
+	int rightMostSprite, rightMostStation;
+	if (DMAudio.IsMP3RadioChannelAvailable()) {
+		rightMostSprite = MENUSPRITE_MP3;
+		rightMostStation = USERTRACK;
+	} else {
+		rightMostSprite = MENUSPRITE_WAVE;
+		rightMostStation = WAVE;
+	}
+ #ifdef THIS_IS_STUPID
+
+	// First radio
+	if (m_ScrollRadioBy == 1) {
+		if (m_PrefsRadioStation == 1) {
+			m_aFrontEndSprites[rightMostSprite].Draw(m_LeftMostRadioX, MENU_Y(MENURADIO_ICON_Y), MENU_X(MENURADIO_ICON_SIZE), MENU_Y(MENURADIO_ICON_SIZE),
+				CRGBA(INACTIVE_RADIO_COLOR.r, INACTIVE_RADIO_COLOR.g, INACTIVE_RADIO_COLOR.b, FadeIn(INACTIVE_RADIO_COLOR.a)));
+		} else if ( m_PrefsRadioStation == 0) {
+			m_aFrontEndSprites[rightMostSprite - 1].Draw(m_LeftMostRadioX, MENU_Y(MENURADIO_ICON_Y), MENU_X(MENURADIO_ICON_SIZE), MENU_Y(MENURADIO_ICON_SIZE),
+				CRGBA(INACTIVE_RADIO_COLOR.r, INACTIVE_RADIO_COLOR.g, INACTIVE_RADIO_COLOR.b, FadeIn(INACTIVE_RADIO_COLOR.a)));
+		} else {
+			m_aFrontEndSprites[m_PrefsRadioStation + MENUSPRITE_WILDSTYLE - 2].Draw(m_LeftMostRadioX, MENU_Y(MENURADIO_ICON_Y), MENU_X(MENURADIO_ICON_SIZE), MENU_Y(MENURADIO_ICON_SIZE),
+				CRGBA(INACTIVE_RADIO_COLOR.r, INACTIVE_RADIO_COLOR.g, INACTIVE_RADIO_COLOR.b, FadeIn(INACTIVE_RADIO_COLOR.a)));
+		}
+	}
+
+	// Second
+	if (m_PrefsRadioStation == 0) {
+		m_aFrontEndSprites[rightMostSprite].Draw(m_LeftMostRadioX + MENU_X(MENURADIO_ICON_SIZE), MENU_Y(MENURADIO_ICON_Y), MENU_X(MENURADIO_ICON_SIZE), MENU_Y(MENURADIO_ICON_SIZE),
+			CRGBA(INACTIVE_RADIO_COLOR.r, INACTIVE_RADIO_COLOR.g, INACTIVE_RADIO_COLOR.b, FadeIn(INACTIVE_RADIO_COLOR.a)));
+	} else {
+		m_aFrontEndSprites[m_PrefsRadioStation + MENUSPRITE_WILDSTYLE - 1].Draw(m_LeftMostRadioX + MENU_X(MENURADIO_ICON_SIZE), MENU_Y(MENURADIO_ICON_Y), MENU_X(MENURADIO_ICON_SIZE),
+			MENU_Y(MENURADIO_ICON_SIZE), CRGBA(INACTIVE_RADIO_COLOR.r, INACTIVE_RADIO_COLOR.g, INACTIVE_RADIO_COLOR.b, FadeIn(INACTIVE_RADIO_COLOR.a)));
+	}
+
+	// Third (middle)
+	int prevStation = m_PrefsRadioStation - 1;
+	if (prevStation == rightMostStation) {
+		m_aFrontEndSprites[MENUSPRITE_WILDSTYLE + 1].Draw(m_LeftMostRadioX + MENU_X(MENURADIO_ICON_SIZE * 3), MENU_Y(MENURADIO_ICON_Y), MENU_X(MENURADIO_ICON_SIZE), MENU_Y(MENURADIO_ICON_SIZE),
+			CRGBA(INACTIVE_RADIO_COLOR.r, INACTIVE_RADIO_COLOR.g, INACTIVE_RADIO_COLOR.b, FadeIn(INACTIVE_RADIO_COLOR.a)));
+	} else if ( prevStation == rightMostStation - 1) {
+		m_aFrontEndSprites[MENUSPRITE_WILDSTYLE].Draw(m_LeftMostRadioX + MENU_X(MENURADIO_ICON_SIZE * 3), MENU_Y(MENURADIO_ICON_Y), MENU_X(MENURADIO_ICON_SIZE), MENU_Y(MENURADIO_ICON_SIZE),
+			CRGBA(INACTIVE_RADIO_COLOR.r, INACTIVE_RADIO_COLOR.g, INACTIVE_RADIO_COLOR.b, FadeIn(INACTIVE_RADIO_COLOR.a)));
+	} else {
+		m_aFrontEndSprites[m_PrefsRadioStation + MENUSPRITE_WILDSTYLE + 1].Draw(m_LeftMostRadioX + MENU_X(MENURADIO_ICON_SIZE * 3), MENU_Y(MENURADIO_ICON_Y), MENU_X(MENURADIO_ICON_SIZE), MENU_Y(MENURADIO_ICON_SIZE),
+			CRGBA(INACTIVE_RADIO_COLOR.r, INACTIVE_RADIO_COLOR.g, INACTIVE_RADIO_COLOR.b, FadeIn(INACTIVE_RADIO_COLOR.a)));
+	}
+
+	// Fifth
+	if (m_ScrollRadioBy == -1) {
+		int prevStation = m_PrefsRadioStation - 1;
+		if (prevStation == rightMostStation) {
+			m_aFrontEndSprites[MENUSPRITE_WILDSTYLE + 4].Draw(m_LeftMostRadioX + MENU_X(MENURADIO_ICON_SIZE * 4), MENU_Y(MENURADIO_ICON_Y), MENU_X(MENURADIO_ICON_SIZE), MENU_Y(MENURADIO_ICON_SIZE),
+				CRGBA(INACTIVE_RADIO_COLOR.r, INACTIVE_RADIO_COLOR.g, INACTIVE_RADIO_COLOR.b, FadeIn(INACTIVE_RADIO_COLOR.a)));
+		} else if (prevStation == rightMostStation - 1) {
+			m_aFrontEndSprites[MENUSPRITE_WILDSTYLE + 1].Draw(m_LeftMostRadioX + MENU_X(MENURADIO_ICON_SIZE * 4), MENU_Y(MENURADIO_ICON_Y), MENU_X(MENURADIO_ICON_SIZE), MENU_Y(MENURADIO_ICON_SIZE),
+				CRGBA(INACTIVE_RADIO_COLOR.r, INACTIVE_RADIO_COLOR.g, INACTIVE_RADIO_COLOR.b, FadeIn(INACTIVE_RADIO_COLOR.a)));
+		} else if ( prevStation == rightMostStation - 2) {
+			m_aFrontEndSprites[MENUSPRITE_WILDSTYLE].Draw(m_LeftMostRadioX + MENU_X(MENURADIO_ICON_SIZE * 4), MENU_Y(MENURADIO_ICON_Y), MENU_X(MENURADIO_ICON_SIZE), MENU_Y(MENURADIO_ICON_SIZE),
+				CRGBA(INACTIVE_RADIO_COLOR.r, INACTIVE_RADIO_COLOR.g, INACTIVE_RADIO_COLOR.b, FadeIn(INACTIVE_RADIO_COLOR.a)));
+		} else {
+			m_aFrontEndSprites[m_PrefsRadioStation + MENUSPRITE_WILDSTYLE + 2].Draw(m_LeftMostRadioX + MENU_X(MENURADIO_ICON_SIZE * 4), MENU_Y(MENURADIO_ICON_Y), MENU_X(MENURADIO_ICON_SIZE), MENU_Y(MENURADIO_ICON_SIZE),
+				CRGBA(INACTIVE_RADIO_COLOR.r, INACTIVE_RADIO_COLOR.g, INACTIVE_RADIO_COLOR.b, FadeIn(INACTIVE_RADIO_COLOR.a)));
+		}
+	}
+
+	// Fourth
+	if (m_ScrollRadioBy == 0) {
+		m_aFrontEndSprites[m_PrefsRadioStation + MENUSPRITE_WILDSTYLE].Draw(m_LeftMostRadioX + MENU_X(MENURADIO_ICON_SIZE * 2 - 10.f), MENU_Y(MENURADIO_ICON_Y - 10.f), MENU_X(MENURADIO_ICON_SIZE) + MENU_X(20.f), MENU_Y(MENURADIO_ICON_SIZE) + MENU_Y(20.f),
+			CRGBA(255, 255, 255, FadeIn(255)));
+	} else {	
+		if (m_PrefsRadioStation - 1 == rightMostStation) {
+			m_aFrontEndSprites[MENUSPRITE_WILDSTYLE].Draw(m_LeftMostRadioX + MENU_X(MENURADIO_ICON_SIZE * 2), MENU_Y(MENURADIO_ICON_Y), MENU_X(MENURADIO_ICON_SIZE), MENU_Y(MENURADIO_ICON_SIZE),
+				CRGBA(INACTIVE_RADIO_COLOR.r, INACTIVE_RADIO_COLOR.g, INACTIVE_RADIO_COLOR.b, FadeIn(INACTIVE_RADIO_COLOR.a)));
+		} else {
+			m_aFrontEndSprites[m_PrefsRadioStation + MENUSPRITE_WILDSTYLE].Draw(m_LeftMostRadioX + MENU_X(MENURADIO_ICON_SIZE * 2), MENU_Y(MENURADIO_ICON_Y), MENU_X(MENURADIO_ICON_SIZE), MENU_Y(MENURADIO_ICON_SIZE),
+				CRGBA(INACTIVE_RADIO_COLOR.r, INACTIVE_RADIO_COLOR.g, INACTIVE_RADIO_COLOR.b, FadeIn(INACTIVE_RADIO_COLOR.a)));
+		}
+	}
+#else
+	int first = ((m_PrefsRadioStation - 2) + rightMostStation + 1) % (rightMostStation + 1);
+	int second = ((m_PrefsRadioStation - 1) + rightMostStation + 1) % (rightMostStation + 1);
+	int third = ((m_PrefsRadioStation) + rightMostStation + 1) % (rightMostStation + 1);
+	int fourth = ((m_PrefsRadioStation + 1) + rightMostStation + 1) % (rightMostStation + 1);
+	int fifth = ((m_PrefsRadioStation + 2) + rightMostStation + 1) % (rightMostStation + 1);
+
+	// First one is only drawn on transition to next
+	if (m_ScrollRadioBy == 1) {
+		m_aFrontEndSprites[first + MENUSPRITE_WILDSTYLE].Draw(m_LeftMostRadioX, MENU_Y(MENURADIO_ICON_Y), MENU_X(MENURADIO_ICON_SIZE), MENU_Y(MENURADIO_ICON_SIZE),
+			CRGBA(INACTIVE_RADIO_COLOR.r, INACTIVE_RADIO_COLOR.g, INACTIVE_RADIO_COLOR.b, FadeIn(INACTIVE_RADIO_COLOR.a)));
+	}
+
+	// Second
+	m_aFrontEndSprites[second + MENUSPRITE_WILDSTYLE].Draw(m_LeftMostRadioX + MENU_X(MENURADIO_ICON_SIZE), MENU_Y(MENURADIO_ICON_Y), MENU_X(MENURADIO_ICON_SIZE), MENU_Y(MENURADIO_ICON_SIZE),
+		CRGBA(INACTIVE_RADIO_COLOR.r, INACTIVE_RADIO_COLOR.g, INACTIVE_RADIO_COLOR.b, FadeIn(INACTIVE_RADIO_COLOR.a)));
+
+	// Fourth
+	m_aFrontEndSprites[fourth + MENUSPRITE_WILDSTYLE].Draw(m_LeftMostRadioX + MENU_X(MENURADIO_ICON_SIZE * 3), MENU_Y(MENURADIO_ICON_Y), MENU_X(MENURADIO_ICON_SIZE), MENU_Y(MENURADIO_ICON_SIZE),
+		CRGBA(INACTIVE_RADIO_COLOR.r, INACTIVE_RADIO_COLOR.g, INACTIVE_RADIO_COLOR.b, FadeIn(INACTIVE_RADIO_COLOR.a)));
+
+	// Fifth one is only drawn on transition to prev.
+	if (m_ScrollRadioBy == -1) {
+		m_aFrontEndSprites[fifth + MENUSPRITE_WILDSTYLE].Draw(m_LeftMostRadioX + MENU_X(MENURADIO_ICON_SIZE * 4), MENU_Y(MENURADIO_ICON_Y), MENU_X(MENURADIO_ICON_SIZE), MENU_Y(MENURADIO_ICON_SIZE),
+			CRGBA(INACTIVE_RADIO_COLOR.r, INACTIVE_RADIO_COLOR.g, INACTIVE_RADIO_COLOR.b, FadeIn(INACTIVE_RADIO_COLOR.a)));
+	}
+
+	// Middle one(third) is colored differently depending on if it's in transition.
+	// If not in transition then this icon indicates selected radio, and should be on top of all icons. thus drawn last
+	if (m_ScrollRadioBy != 0) {
+		m_aFrontEndSprites[third + MENUSPRITE_WILDSTYLE].Draw(m_LeftMostRadioX + MENU_X(MENURADIO_ICON_SIZE * 2), MENU_Y(MENURADIO_ICON_Y), MENU_X(MENURADIO_ICON_SIZE), MENU_Y(MENURADIO_ICON_SIZE),
+			CRGBA(INACTIVE_RADIO_COLOR.r, INACTIVE_RADIO_COLOR.g, INACTIVE_RADIO_COLOR.b, FadeIn(INACTIVE_RADIO_COLOR.a)));		
+	} else {
+		m_aFrontEndSprites[third + MENUSPRITE_WILDSTYLE].Draw(m_LeftMostRadioX + MENU_X(MENURADIO_ICON_SIZE * 2 - 10.f), MENU_Y(MENURADIO_ICON_Y - 10.f), MENU_X(MENURADIO_ICON_SIZE) + MENU_X(20.f), MENU_Y(MENURADIO_ICON_SIZE) + MENU_Y(20.f),
+			CRGBA(255, 255, 255, FadeIn(255)));
+	}
+#endif
+
+	static bool radioChangeRequested = false;
+	static PauseModeTime lastScrollCheck = 0;
+	if (CTimer::GetTimeInMillisecondsPauseMode() - lastScrollCheck > 17) {
+		if (m_ScrollRadioBy == 1) {
+			if (m_LeftMostRadioX > MENU_X_LEFT_ALIGNED(MENURADIO_ICON_FIRST_X - MENURADIO_ICON_SIZE)) {
+				m_LeftMostRadioX -= MENU_X(6.f);
+			} else {
+				m_ScrollRadioBy = 0;
+				lastRadioChange = CTimer::GetTimeInMillisecondsPauseMode();
+				radioChangeRequested = true;
+			}
+		}
+		if (m_ScrollRadioBy == -1) {
+			if (m_LeftMostRadioX < MENU_X_LEFT_ALIGNED(MENURADIO_ICON_FIRST_X - MENURADIO_ICON_SIZE)) {
+				m_LeftMostRadioX += MENU_X(6.f);
+			} else {
+				m_ScrollRadioBy = 0;
+				lastRadioChange = CTimer::GetTimeInMillisecondsPauseMode();
+				radioChangeRequested = true;
+			}
+		}
+		lastScrollCheck = CTimer::GetTimeInMillisecondsPauseMode();
+	}
+	// Background behind arrows
+	CSprite2d::Draw2DPolygon(MENU_X_LEFT_ALIGNED(228.f), MENU_Y(MENURADIO_SELECTOR_START_Y + MENURADIO_SELECTOR_HEIGHT),
+		MENU_X_LEFT_ALIGNED(168.f), MENU_Y(MENURADIO_SELECTOR_START_Y + MENURADIO_SELECTOR_HEIGHT),
+		MENU_X_LEFT_ALIGNED(238.f), MENU_Y(MENURADIO_SELECTOR_START_Y),
+		MENU_X_LEFT_ALIGNED(178.f), MENU_Y(MENURADIO_SELECTOR_START_Y),
+		CRGBA(RADIO_SELECTOR_COLOR.r, RADIO_SELECTOR_COLOR.g, RADIO_SELECTOR_COLOR.b, FadeIn(255)));
+	
+	CSprite2d::Draw2DPolygon(MENU_X_LEFT_ALIGNED(478.f), MENU_Y(MENURADIO_SELECTOR_START_Y + MENURADIO_SELECTOR_HEIGHT),
+		MENU_X_LEFT_ALIGNED(418.f), MENU_Y(MENURADIO_SELECTOR_START_Y + MENURADIO_SELECTOR_HEIGHT),
+		MENU_X_LEFT_ALIGNED(488.f), MENU_Y(MENURADIO_SELECTOR_START_Y),
+		MENU_X_LEFT_ALIGNED(428.f), MENU_Y(MENURADIO_SELECTOR_START_Y),
+		CRGBA(RADIO_SELECTOR_COLOR.r, RADIO_SELECTOR_COLOR.g, RADIO_SELECTOR_COLOR.b, FadeIn(255)));
+	
+	// Arrows and their shadows
+	CSprite2d::Draw2DPolygon(MENU_X_LEFT_ALIGNED(216.f), MENU_Y(MENURADIO_SELECTOR_START_Y + 48.f), MENU_X_LEFT_ALIGNED(196.f), MENU_Y(MENURADIO_SELECTOR_START_Y + 36.f), MENU_X_LEFT_ALIGNED(216.f), MENU_Y(MENURADIO_SELECTOR_START_Y + 22.f), MENU_X_LEFT_ALIGNED(196.f), MENU_Y(MENURADIO_SELECTOR_START_Y + 36.f), CRGBA(0, 0, 0, FadeIn(255)));
+	CSprite2d::Draw2DPolygon(MENU_X_LEFT_ALIGNED(213.f), MENU_Y(MENURADIO_SELECTOR_START_Y + 45.f), MENU_X_LEFT_ALIGNED(193.f), MENU_Y(MENURADIO_SELECTOR_START_Y + 33.f), MENU_X_LEFT_ALIGNED(213.f), MENU_Y(MENURADIO_SELECTOR_START_Y + 19.f), MENU_X_LEFT_ALIGNED(193.f), MENU_Y(MENURADIO_SELECTOR_START_Y + 33.f), CRGBA(97, 194, 247, FadeIn(255)));
+	CSprite2d::Draw2DPolygon(MENU_X_LEFT_ALIGNED(440.f), MENU_Y(MENURADIO_SELECTOR_START_Y + 48.f), MENU_X_LEFT_ALIGNED(460.f), MENU_Y(MENURADIO_SELECTOR_START_Y + 36.f), MENU_X_LEFT_ALIGNED(440.f), MENU_Y(MENURADIO_SELECTOR_START_Y + 22.f), MENU_X_LEFT_ALIGNED(460.f), MENU_Y(MENURADIO_SELECTOR_START_Y + 36.f), CRGBA(0, 0, 0, FadeIn(255)));
+	CSprite2d::Draw2DPolygon(MENU_X_LEFT_ALIGNED(443.f), MENU_Y(MENURADIO_SELECTOR_START_Y + 45.f), MENU_X_LEFT_ALIGNED(463.f), MENU_Y(MENURADIO_SELECTOR_START_Y + 33.f), MENU_X_LEFT_ALIGNED(443.f), MENU_Y(MENURADIO_SELECTOR_START_Y + 19.f), MENU_X_LEFT_ALIGNED(463.f), MENU_Y(MENURADIO_SELECTOR_START_Y + 33.f), CRGBA(97, 194, 247, FadeIn(255)));
+	if (radioChangeRequested) {
+		if (CTimer::GetTimeInMillisecondsPauseMode() - lastRadioChange > 50) {
+			DMAudio.SetRadioInCar(m_PrefsRadioStation);
+			DMAudio.PlayFrontEndTrack(m_PrefsRadioStation, 1);
+			OutputDebugString("FRONTEND RADIO STATION CHANGED");
+			lastRadioChange = CTimer::GetTimeInMillisecondsPauseMode();
+			radioChangeRequested = false;
+		}
+	}
+}
+
+// Original name is unknown
+void
+CMenuManager::ProcessList(bool &optionSelected, bool &goBack)
+{
+	if (m_bWaitingForNewKeyBind)
+		return;
+
+	if (m_nCurrScreen == MENUPAGE_SKIN_SELECT) {
+		m_nTotalListRow = m_nSkinsTotal;
+	}
+	if (m_nCurrScreen == MENUPAGE_KEYBOARD_CONTROLS) {
+		// GetNumOptionsCntrlConfigScreens would have been a better choice
+		m_nTotalListRow = m_ControlMethod == CONTROL_CLASSIC ? 32 : 27;
+		if (m_nSelectedListRow > m_nTotalListRow)
+			m_nSelectedListRow = m_nTotalListRow - 1;
+	}
+
+	if (CPad::GetPad(0)->GetEnterJustDown() || CPad::GetPad(0)->GetCrossJustDown()) {
+		m_bShowMouse = 0;
+		optionSelected = true;
+	}
+	if (CPad::GetPad(0)->GetBackspaceJustDown() && m_nCurrScreen == MENUPAGE_KEYBOARD_CONTROLS && !field_159) {
+		if (m_nCurrExLayer == HOVEROPTION_LIST) {
+			m_nHoverOption = HOVEROPTION_NOT_HOVERING;
+			m_bWaitingForNewKeyBind = true;
+			m_bStartWaitingForKeyBind = true;
+			m_bKeyChangeNotProcessed = true;
+			pControlEdit = &m_KeyPressedCode;
+		}
+	} else {
+		field_159 = false;
+	}
+
+	static PauseModeTime lastTimeClickedScrollButton = 0;
+
+	if (CTimer::GetTimeInMillisecondsPauseMode() - lastTimeClickedScrollButton >= 200) {
+		m_bPressedPgUpOnList = false;
+		m_bPressedPgDnOnList = false;
+		m_bPressedUpOnList = false;
+		m_bPressedDownOnList = false;
+		m_bPressedScrollButton = false;
+		lastTimeClickedScrollButton = CTimer::GetTimeInMillisecondsPauseMode();
+	}
+
+	if (CPad::GetPad(0)->GetTabJustDown()) {
+		DMAudio.PlayFrontEndSound(SOUND_FRONTEND_HIGHLIGHT_OPTION, 0);
+		m_bShowMouse = false;
+		switch (m_nCurrExLayer) {
+		case HOVEROPTION_BACK:
+		default:
+			m_nCurrExLayer = HOVEROPTION_LIST;
+			break;
+		case HOVEROPTION_LIST:
+			m_nCurrExLayer = HOVEROPTION_USESKIN;
+			break;
+		case HOVEROPTION_USESKIN:
+			m_nCurrExLayer = HOVEROPTION_BACK;
+		}
+		if (((m_nCurrScreen == MENUPAGE_SKIN_SELECT) && (m_nCurrExLayer == HOVEROPTION_USESKIN)) && strcmp(m_aSkinName, m_PrefsSkinFile) == 0) {
+			m_nCurrExLayer = HOVEROPTION_BACK;
+		}
+		if ((m_nCurrScreen == MENUPAGE_KEYBOARD_CONTROLS) && (m_nCurrExLayer == HOVEROPTION_USESKIN)) {
+			m_nCurrExLayer = HOVEROPTION_BACK;
+		}
+	}
+
+	bool pressed = false;
+	if (CPad::GetPad(0)->GetUp() || CPad::GetPad(0)->GetAnaloguePadUp() || CPad::GetPad(0)->GetDPadUpJustDown()) {
+		m_bShowMouse = false;
+		pressed = true;
+	} else if (CPad::GetPad(0)->GetMouseWheelUpJustUp()) {
+		m_bShowMouse = true;
+		pressed = true;
+	}
+
+	// Up
+	if (pressed) {
+		m_nCurrExLayer = HOVEROPTION_LIST;
+		if (!m_bPressedUpOnList) {
+			m_bPressedUpOnList = true;
+			lastTimeClickedScrollButton = CTimer::GetTimeInMillisecondsPauseMode();
+			DMAudio.PlayFrontEndSound(SOUND_FRONTEND_HIGHLIGHT_OPTION, 0);
+			ScrollUpListByOne();
+		}
+	} else {
+		m_bPressedUpOnList = false;
+	}
+
+	pressed = false;
+	if (CPad::GetPad(0)->GetDown() || CPad::GetPad(0)->GetAnaloguePadDown() || CPad::GetPad(0)->GetDPadDownJustDown()) {
+		m_bShowMouse = false;
+		pressed = true;
+	} else if (CPad::GetPad(0)->GetMouseWheelDownJustDown()) {
+		m_bShowMouse = true;
+		pressed = true;
+	}
+
+	// Down
+	if (pressed) {
+		m_nCurrExLayer = HOVEROPTION_LIST;
+		if (!m_bPressedDownOnList) {
+			m_bPressedDownOnList = true;
+			lastTimeClickedScrollButton = CTimer::GetTimeInMillisecondsPauseMode();
+			DMAudio.PlayFrontEndSound(SOUND_FRONTEND_HIGHLIGHT_OPTION, 0);
+			ScrollDownListByOne();
+		}
+	} else {
+		m_bPressedDownOnList = false;
+	}
+
+	if (m_nCurrScreen != MENUPAGE_KEYBOARD_CONTROLS) {
+		if (!CPad::GetPad(0)->GetPageUp()) {
+			m_bPressedPgUpOnList = false;
+		} else {
+			m_nCurrExLayer = HOVEROPTION_LIST;
+			if (!m_bPressedPgUpOnList) {
+				m_bPressedPgUpOnList = true;
+				lastTimeClickedScrollButton = CTimer::GetTimeInMillisecondsPauseMode();
+				m_bShowMouse = false;
+				DMAudio.PlayFrontEndSound(SOUND_FRONTEND_HIGHLIGHT_OPTION, 0);
+				PageUpList(false);
+			}
+		}
+		if (!CPad::GetPad(0)->GetPageDown()) {
+			m_bPressedPgDnOnList = false;
+		} else {
+			m_nCurrExLayer = HOVEROPTION_LIST;
+			if (!m_bPressedPgDnOnList) {
+				m_bPressedPgDnOnList = true;
+				lastTimeClickedScrollButton = CTimer::GetTimeInMillisecondsPauseMode();
+				m_bShowMouse = false;
+				DMAudio.PlayFrontEndSound(SOUND_FRONTEND_HIGHLIGHT_OPTION, 0);
+				PageDownList(false);
+			}
+		}
+		if (CPad::GetPad(0)->GetHome()) {
+			m_nCurrExLayer = HOVEROPTION_LIST;
+			m_bShowMouse = false;
+			DMAudio.PlayFrontEndSound(SOUND_FRONTEND_HIGHLIGHT_OPTION, 0);
+			if (m_nTotalListRow >= MAX_VISIBLE_OPTION_ON_SCREEN) {
+				m_nFirstVisibleRowOnList = 0;
+			}
+			m_nSelectedListRow = 0;
+			m_nScrollbarTopMargin = (SCROLLBAR_MAX_HEIGHT / m_nTotalListRow) * m_nFirstVisibleRowOnList;
+		}
+		if (CPad::GetPad(0)->GetEnd()) {
+			m_nCurrExLayer = HOVEROPTION_LIST;
+			m_bShowMouse = false;
+			DMAudio.PlayFrontEndSound(SOUND_FRONTEND_HIGHLIGHT_OPTION, 0);
+			if (m_nTotalListRow >= MAX_VISIBLE_OPTION_ON_SCREEN) {
+				m_nFirstVisibleRowOnList = m_nTotalListRow - MAX_VISIBLE_OPTION_ON_SCREEN;
+			}
+			m_nSelectedListRow = m_nTotalListRow - 1;
+			m_nScrollbarTopMargin = (SCROLLBAR_MAX_HEIGHT / m_nTotalListRow) * m_nFirstVisibleRowOnList;
+		}
+	}
+
+	if (CPad::GetPad(0)->GetEscapeJustDown() || CPad::GetPad(0)->GetBackJustDown()) {
+		m_bShowMouse = false;
+		goBack = true;
+	}
+
+	if (CPad::GetPad(0)->GetLeftMouseJustDown()) {
+		switch (m_nHoverOption) {
+		case HOVEROPTION_BACK:
+			goBack = true;
+			break;
+		case HOVEROPTION_PAGEUP:
+			PageUpList(true);
+			break;
+		case HOVEROPTION_PAGEDOWN:
+			PageDownList(true);
+			break;
+		case HOVEROPTION_USESKIN:
+			if (m_nSkinsTotal > 0) {
+				m_pSelectedSkin = m_pSkinListHead.nextSkin;
+				strcpy(m_PrefsSkinFile, m_aSkinName);
+				CWorld::Players[0].SetPlayerSkin(m_PrefsSkinFile);
+				SaveSettings();
+			}
+		}
+	}
+
+	if (CPad::GetPad(0)->GetLeftMouseJustDown()) {
+		switch (m_nHoverOption) {
+		case HOVEROPTION_OVER_SCROLL_UP:
+			m_nHoverOption = HOVEROPTION_CLICKED_SCROLL_UP;
+			break;
+		case HOVEROPTION_OVER_SCROLL_DOWN:
+			m_nHoverOption = HOVEROPTION_CLICKED_SCROLL_DOWN;
+			break;
+		case HOVEROPTION_LIST:
+			m_nHoverOption = HOVEROPTION_SKIN;
+		}
+	} else if ((CPad::GetPad(0)->GetLeftMouseJustUp())
+		&& ((m_nHoverOption == HOVEROPTION_CLICKED_SCROLL_UP || (m_nHoverOption == HOVEROPTION_CLICKED_SCROLL_DOWN)))) {
+		m_nHoverOption = HOVEROPTION_NOT_HOVERING;
+	}
+
+	if (!CPad::GetPad(0)->GetLeftMouse()) {
+		holdingScrollBar = false;
+	} else {
+		if ((m_nHoverOption == HOVEROPTION_HOLDING_SCROLLBAR) || holdingScrollBar) {
+			holdingScrollBar = true;
+			// TODO: This part is a bit hard to reverse. Not much code tho
+			assert(0 && "Holding scrollbar isn't done yet");
+		} else {
+			switch (m_nHoverOption) {
+			case HOVEROPTION_OVER_SCROLL_UP:
+			case HOVEROPTION_CLICKED_SCROLL_UP:
+				if (!m_bPressedScrollButton) {
+					m_bPressedScrollButton = true;
+					lastTimeClickedScrollButton = CTimer::GetTimeInMillisecondsPauseMode();
+					ScrollUpListByOne();
+				}
+				break;
+			case HOVEROPTION_OVER_SCROLL_DOWN:
+			case HOVEROPTION_CLICKED_SCROLL_DOWN:
+				if (!m_bPressedScrollButton) {
+					m_bPressedScrollButton = true;
+					lastTimeClickedScrollButton = CTimer::GetTimeInMillisecondsPauseMode();
+					ScrollDownListByOne();
+				}
+				break;
+			default:
+				m_bPressedScrollButton = false;
+			}
+		}
+	}
+}
+
+void
+CMenuManager::UserInput(void)
+{
+	bool goBack = false;
+	bool optionSelected = false;
+	bool goUp = false;
+	bool goDown = false;
+	int8 changeValueBy;
+
+	if (!m_AllowNavigation && m_firstStartCounter == 255)
+		m_AllowNavigation = true;
+	if (!m_bShowMouse && m_nCurrScreen != MENUPAGE_MAP && (m_nMouseOldPosX != m_nMousePosX || m_nMouseOldPosY != m_nMousePosY)) {
+		m_bShowMouse = true;
+	}
+
+	static int oldOption = -99;
+	oldOption = m_nCurrOption;
+#ifdef SCROLLABLE_PAGES
+	int firstOption = SCREEN_HAS_AUTO_SCROLLBAR ? m_nFirstVisibleRowOnList : 0;
+	int scrollOffset = aScreens[m_nCurrScreen].m_aEntries[firstOption].m_Y - aScreens[m_nCurrScreen].m_aEntries[0].m_Y;
+	for (int rowToCheck = firstOption; rowToCheck < firstOption + MAX_VISIBLE_OPTION && rowToCheck < NUM_MENUROWS; ++rowToCheck) {
+#else
+	for (int rowToCheck = 0; rowToCheck < NUM_MENUROWS; ++rowToCheck) {
+#endif
+		if (aScreens[m_nCurrScreen].m_aEntries[rowToCheck].m_Action == MENUACTION_NOTHING || 
+			aScreens[m_nCurrScreen].m_aEntries[rowToCheck].m_Action == MENUACTION_LABEL)
+			continue;
+
+		// unused: CFont::GetStringWidth(TheText.Get(aScreens[m_nCurrScreen].m_aEntries[rowToCheck].m_EntryName), true);
+		// So they also wanted the compare X, but they abandoned the idea later on
+
+		if (m_nMousePosY > MENU_Y(aScreens[m_nCurrScreen].m_aEntries[rowToCheck].m_Y MINUS_SCROLL_OFFSET) &&
+			m_nMousePosY < MENU_Y(aScreens[m_nCurrScreen].m_aEntries[rowToCheck].m_Y MINUS_SCROLL_OFFSET PLUS_LINE_HEIGHT_ON_SCREEN)) {
+			static int oldScreen = m_nCurrScreen;
+
+			m_nOptionMouseHovering = rowToCheck;
+			if (m_nMouseOldPosX != m_nMousePosX || m_nMouseOldPosY != m_nMousePosY) {
+				m_nCurrOption = rowToCheck;
+				m_bShowMouse = true;
+			}
+
+			int action = aScreens[m_nCurrScreen].m_aEntries[rowToCheck].m_Action;
+			if (action != MENUACTION_BRIGHTNESS && action != MENUACTION_DRAWDIST && action != MENUACTION_MUSICVOLUME
+				&& action != MENUACTION_SFXVOLUME && action != MENUACTION_MOUSESENS && action != MENUACTION_MP3VOLUMEBOOST)
+				m_nHoverOption = HOVEROPTION_RANDOM_ITEM;
+
+			break;
+		}
+		if (m_bShowMouse && m_nMenuFadeAlpha == 255) {
+			m_nOptionMouseHovering = oldOption;
+			m_nCurrOption = oldOption;
+		}
+	}
+
+	if (m_bShowMouse) {
+		if (oldOption != m_nCurrOption) {
+			if (aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_Action == MENUACTION_LABEL) {
+				++m_nCurrOption;
+				++m_nOptionMouseHovering;
+			}
+			m_nOptionHighlightTransitionBlend = 0;
+			DMAudio.PlayFrontEndSound(SOUND_FRONTEND_HIGHLIGHT_OPTION, 0);
+		}
+	}
+
+	m_nMouseOldPosX = m_nMousePosX;
+	m_nMouseOldPosY = m_nMousePosY;
+	m_nMousePosX = m_nMouseTempPosX;
+	m_nMousePosY = m_nMouseTempPosY;
+
+	if (m_nMousePosX < 0) m_nMousePosX = 0;
+	if (m_nMousePosX > SCREEN_WIDTH) m_nMousePosX = SCREEN_WIDTH;
+	if (m_nMousePosY < 0) m_nMousePosY = 0;
+	if (m_nMousePosY > SCREEN_HEIGHT) m_nMousePosY = SCREEN_HEIGHT;
+
+	changeValueBy = 0;
+	if (hasNativeList(m_nCurrScreen)) {
+		ProcessList(optionSelected, goBack);
+	} else {
+		AdditionalOptionInput(goBack);
+
+		if (m_AllowNavigation &&
+			(CPad::GetPad(0)->GetDownJustDown() || CPad::GetPad(0)->GetAnaloguePadDown() || CPad::GetPad(0)->GetDPadDownJustDown())) {
+			m_bShowMouse = false;
+			goDown = true;
+			m_nOptionHighlightTransitionBlend = 0;
+
+		} else if (m_AllowNavigation &&
+			(CPad::GetPad(0)->GetUpJustDown() || CPad::GetPad(0)->GetAnaloguePadUp() || CPad::GetPad(0)->GetDPadUpJustDown())) {
+			m_bShowMouse = false;
+			goUp = true;
+			m_nOptionHighlightTransitionBlend = 0;
+		}
+
+		if ((m_nCurrOption == 0) && (m_nCurrScreen == MENUPAGE_PAUSE_MENU)) {
+			if (CPad::GetPad(0)->GetEnterJustUp() || CPad::GetPad(0)->GetCrossJustUp()) {
+				m_bShowMouse = false;
+				optionSelected = true;
+			}
+		} else {
+			if (CPad::GetPad(0)->GetEnterJustDown() || CPad::GetPad(0)->GetCrossJustDown()) {
+				m_bShowMouse = false;
+				optionSelected = true;
+			}
+		}
+
+		if (CPad::GetPad(0)->GetLeftMouseJustUp() && m_nCurrScreen != MENUPAGE_MAP) {
+			if (m_nHoverOption == HOVEROPTION_RANDOM_ITEM)
+				optionSelected = true;
+			else if (m_nHoverOption == HOVEROPTION_NEXT_RADIO)
+				ChangeRadioStation(1);
+			else if (m_nHoverOption == HOVEROPTION_PREV_RADIO)
+				ChangeRadioStation(-1);
+		}
+
+		if (CPad::GetPad(0)->GetLeftMouse()) {
+			switch (m_nHoverOption) {
+			case HOVEROPTION_INCREASE_BRIGHTNESS:
+			case HOVEROPTION_INCREASE_MP3BOOST:
+			case HOVEROPTION_INCREASE_DRAWDIST:
+			case HOVEROPTION_INCREASE_MUSICVOLUME:
+			case HOVEROPTION_INCREASE_SFXVOLUME:
+			case HOVEROPTION_INCREASE_MOUSESENS:
+				CheckSliderMovement(1);
+				break;
+			case HOVEROPTION_DECREASE_BRIGHTNESS:
+			case HOVEROPTION_DECREASE_MP3BOOST:
+			case HOVEROPTION_DECREASE_DRAWDIST:
+			case HOVEROPTION_DECREASE_MUSICVOLUME:
+			case HOVEROPTION_DECREASE_SFXVOLUME:
+			case HOVEROPTION_DECREASE_MOUSESENS:
+				CheckSliderMovement(-1);
+				break;
+			}
+		}
+
+#ifdef SCROLLABLE_PAGES
+		if (m_nTotalListRow > MAX_VISIBLE_OPTION) {
+			bool temp = false;
+			
+			m_nSelectedListRow = m_nCurrOption;
+			
+			// ignore detected back/select states, it's our screen's job
+			ProcessList(temp, temp);
+			
+			// and ignore our screen's goUp/Down, now it's ProcessList's job
+			goUp = false;
+			goDown = false;
+			m_nCurrOption = m_nSelectedListRow;
+	
+			if (oldOption != m_nCurrOption)
+				m_nOptionHighlightTransitionBlend = 0;
+		}
+		
+		// Prevent sound on scroll. Mouse wheel is now belongs to us!
+		if (!(m_nTotalListRow > MAX_VISIBLE_OPTION && (CPad::GetPad(0)->GetMouseWheelUpJustDown() || CPad::GetPad(0)->GetMouseWheelDownJustDown())))
+#endif
+		if (CPad::GetPad(0)->GetLeftMouseJustUp() || CPad::GetPad(0)->GetLeftJustUp() || CPad::GetPad(0)->GetRightJustUp()
+			|| CPad::GetPad(0)->GetDPadLeftJustUp() || CPad::GetPad(0)->GetDPadRightJustUp()
+			|| CPad::GetPad(0)->GetAnaloguePadLeftJustUp() || CPad::GetPad(0)->GetAnaloguePadRightJustUp()
+			|| CPad::GetPad(0)->GetMouseWheelUpJustDown() || CPad::GetPad(0)->GetMouseWheelDownJustDown()) {
+			int option = aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_Action;
+			if (option == MENUACTION_BRIGHTNESS)
+				DMAudio.PlayFrontEndSound(SOUND_FRONTEND_ENTER_OR_ADJUST, 0);
+			else if (option == MENUACTION_SFXVOLUME)
+				DMAudio.PlayFrontEndSound(SOUND_FRONTEND_AUDIO_TEST, 0);
+			else if (option == MENUACTION_DRAWDIST || option == MENUACTION_MOUSESENS)
+				DMAudio.PlayFrontEndSound(SOUND_FRONTEND_ENTER_OR_ADJUST, 0);
+
+		}
+		if (CPad::GetPad(0)->GetBackJustDown() || CPad::GetPad(0)->GetEscapeJustDown()) {
+			if (m_nCurrScreen != MENUPAGE_START_MENU && m_nCurrScreen != MENUPAGE_PAUSE_MENU && m_nCurrScreen != MENUPAGE_CHOOSE_SAVE_SLOT
+				&& m_nCurrScreen != MENUPAGE_SAVE_CHEAT_WARNING && m_nCurrScreen != MENUPAGE_SAVING_IN_PROGRESS
+				&& m_nCurrScreen != MENUPAGE_DELETING_IN_PROGRESS && m_nCurrScreen != MENUPAGE_OUTRO)
+			{
+				m_bShowMouse = false;
+				goBack = true;
+			}
+		}
+
+		if (((goDown) || (goUp)) || (optionSelected)) {
+			goBack = false;
+		}
+
+	}
+
+	int curAction = aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_Action;
+	if (CPad::GetPad(0)->GetLeft() || CPad::GetPad(0)->GetPedWalkLeftRight() < 0 || CPad::GetPad(0)->GetDPadLeft()) {
+		static PauseModeTime lastSliderDecrease = 0;
+		if (CTimer::GetTimeInMillisecondsPauseMode() - lastSliderDecrease > 150) {
+			if (curAction == MENUACTION_BRIGHTNESS || curAction == MENUACTION_MUSICVOLUME ||
+				curAction == MENUACTION_SFXVOLUME || curAction == MENUACTION_RADIO ||
+				curAction == MENUACTION_DRAWDIST || curAction == MENUACTION_MOUSESENS ||
+				curAction == MENUACTION_MP3VOLUMEBOOST)
+				changeValueBy = -1;
+
+			lastSliderDecrease = CTimer::GetTimeInMillisecondsPauseMode();
+		}
+	} else if (CPad::GetPad(0)->GetRight() || CPad::GetPad(0)->GetPedWalkLeftRight() > 0 || CPad::GetPad(0)->GetDPadRight()) {
+		static PauseModeTime lastSliderIncrease = 0;
+		if (CTimer::GetTimeInMillisecondsPauseMode() - lastSliderIncrease > 150) {
+			if (curAction == MENUACTION_BRIGHTNESS || curAction == MENUACTION_MUSICVOLUME ||
+				curAction == MENUACTION_SFXVOLUME || curAction == MENUACTION_RADIO ||
+				curAction == MENUACTION_DRAWDIST || curAction == MENUACTION_MOUSESENS ||
+				curAction == MENUACTION_MP3VOLUMEBOOST)
+				changeValueBy = 1;
+			lastSliderIncrease = CTimer::GetTimeInMillisecondsPauseMode();
+		}
+	}
+
+#ifdef SCROLLABLE_PAGES
+	if (!SCREEN_HAS_AUTO_SCROLLBAR)
+#endif
+	{
+		if (CPad::GetPad(0)->GetMouseWheelUpJustDown()) {
+			changeValueBy = 1;
+		} else if (CPad::GetPad(0)->GetMouseWheelDownJustDown()) {
+			changeValueBy = -1;
+		}
+	}
+	
+	if (m_AllowNavigation) {
+		if (CPad::GetPad(0)->GetRightJustDown() || CPad::GetPad(0)->GetAnaloguePadRight() || CPad::GetPad(0)->GetDPadRightJustDown()) {
+			m_bShowMouse = false;
+			changeValueBy = 1;
+		}
+	}
+
+	if (m_AllowNavigation) {
+		if (CPad::GetPad(0)->GetLeftJustDown() || CPad::GetPad(0)->GetAnaloguePadLeft() || CPad::GetPad(0)->GetDPadLeftJustDown()) {
+			m_bShowMouse = false;
+			changeValueBy = -1;
+		}
+	}
+	if (changeValueBy != 0) {
+		if ((m_nCurrScreen == MENUPAGE_SOUND_SETTINGS || m_nCurrScreen == MENUPAGE_DISPLAY_SETTINGS || m_nCurrScreen == MENUPAGE_CONTROLLER_PC || m_nCurrScreen == MENUPAGE_MOUSE_CONTROLS)
+			&& aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_Action != MENUACTION_NOTHING
+			&& aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_Action != MENUACTION_LABEL
+			&& aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_Action != MENUACTION_YES
+			&& aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_Action != MENUACTION_NO
+			&& aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_Action != MENUACTION_CHANGEMENU
+			&& aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_Action != MENUACTION_KEYBOARDCTRLS
+			&& aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_Action != MENUACTION_GOBACK
+			&& aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_Action != MENUACTION_RESTOREDEF
+			&& aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_Action != MENUACTION_DRAWDIST
+			&& aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_Action != MENUACTION_MOUSESENS
+			&& aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_Action != MENUACTION_MP3VOLUMEBOOST) {
+			DMAudio.PlayFrontEndSound(SOUND_FRONTEND_ENTER_OR_ADJUST, 0);
+		}
+	}
+	ProcessUserInput(goDown, goUp, optionSelected, goBack, changeValueBy);
+#ifdef CUSTOM_FRONTEND_OPTIONS
+	if (aScreens[m_nCurrScreen].m_aEntries[oldOption].m_Action < MENUACTION_NOTHING) {  // CFO check
+		CMenuScreenCustom::CMenuEntry &oldEntry = aScreens[m_nCurrScreen].m_aEntries[oldOption];
+		if (m_nCurrOption != oldOption) {
+			if (oldEntry.m_Action == MENUACTION_CFO_DYNAMIC)
+				if(oldEntry.m_CFODynamic->buttonPressFunc)
+					oldEntry.m_CFODynamic->buttonPressFunc(FEOPTION_ACTION_FOCUSLOSS);
+
+			if (oldEntry.m_Action == MENUACTION_CFO_SELECT && oldEntry.m_CFOSelect->onlyApplyOnEnter) {
+				if (oldEntry.m_CFOSelect->displayedValue != oldEntry.m_CFOSelect->lastSavedValue)
+					SetHelperText(3); // Restored original value
+
+				oldEntry.m_CFOSelect->displayedValue = oldEntry.m_CFOSelect->lastSavedValue = *oldEntry.m_CFO->value;
+			}
+		} else if (oldEntry.m_Action == MENUACTION_CFO_SELECT && oldEntry.m_CFOSelect->onlyApplyOnEnter) {
+			if (oldEntry.m_CFOSelect->displayedValue != *oldEntry.m_CFO->value)
+				SetHelperText(1); // Enter to apply
+			else if (m_nHelperTextMsgId == 1)
+				ResetHelperText(); // Applied
+		}
+	}
+#endif
+}
+
+void
+CMenuManager::ProcessUserInput(uint8 goDown, uint8 goUp, uint8 optionSelected, uint8 goBack, int8 changeAmount)
+{
+	if (m_nCurrScreen == MENUPAGE_OUTRO)
+		return;
+
+	if (m_bWaitingForNewKeyBind) {
+		if (m_bStartWaitingForKeyBind)
+			m_bStartWaitingForKeyBind = false;
+		else {
+			pControlEdit = CPad::EditCodesForControls(pControlEdit, 1);
+			JoyButtonJustClicked = false;
+			MouseButtonJustClicked = false;
+
+			if (CPad::GetPad(0)->GetLeftMouseJustDown())
+				MouseButtonJustClicked = rsMOUSELEFTBUTTON;
+			else if (CPad::GetPad(0)->GetRightMouseJustUp())
+				MouseButtonJustClicked = rsMOUSERIGHTBUTTON;
+			else if (CPad::GetPad(0)->GetMiddleMouseJustUp())
+				MouseButtonJustClicked = rsMOUSMIDDLEBUTTON;
+			else if (CPad::GetPad(0)->GetMouseWheelUpJustUp())
+				MouseButtonJustClicked = rsMOUSEWHEELUPBUTTON;
+			else if (CPad::GetPad(0)->GetMouseWheelDownJustUp())
+				MouseButtonJustClicked = rsMOUSEWHEELDOWNBUTTON;
+			else if (CPad::GetPad(0)->GetMouseX1JustUp())
+				MouseButtonJustClicked = rsMOUSEX1BUTTON;
+			else if (CPad::GetPad(0)->GetMouseX2JustUp())
+				MouseButtonJustClicked = rsMOUSEX2BUTTON;
+
+			JoyButtonJustClicked = ControlsManager.GetJoyButtonJustDown();
+
+			int32 TypeOfControl = KEYBOARD;
+			if (JoyButtonJustClicked)
+				TypeOfControl = JOYSTICK;
+			if (MouseButtonJustClicked)
+				TypeOfControl = MOUSE;
+			if (*pControlEdit != rsNULL)
+				TypeOfControl = KEYBOARD;
+
+			if (!m_bKeyIsOK) {
+				pControlEdit = nil;
+				m_bWaitingForNewKeyBind = false;
+				m_KeyPressedCode = -1;
+				m_bStartWaitingForKeyBind = false;
+			} else if (!m_bKeyChangeNotProcessed) {
+				if (*pControlEdit != rsNULL || MouseButtonJustClicked || JoyButtonJustClicked)
+					CheckCodesForControls(TypeOfControl);
+
+				field_159 = true;
+			} else {
+				for (int i = 0; i < 4; i++)
+					ControlsManager.ClearSettingsAssociatedWithAction((e_ControllerAction)m_CurrCntrlAction, (eControllerType)i);
+				m_bKeyIsOK = false;
+				m_bKeyChangeNotProcessed = false;
+			}
+		}
+	}
+
+	if (pEditString || pControlEdit)
+		return;
+
+#ifdef USE_DEBUG_SCRIPT_LOADER
+	if (m_nCurrScreen == MENUPAGE_START_MENU || m_nCurrScreen == MENUPAGE_NEW_GAME || m_nCurrScreen == MENUPAGE_NEW_GAME_RELOAD) {
+#ifdef RW_GL3
+		if (glfwGetKey(PSGLOBAL(window), GLFW_KEY_R) == GLFW_PRESS) {
+			scriptToLoad = 1;
+			DoSettingsBeforeStartingAGame();
+			return;
+		}
+#elif defined _WIN32
+		if (GetAsyncKeyState('R') & 0x8000) {
+			scriptToLoad = 1;
+			DoSettingsBeforeStartingAGame();
+			return;
+		}
+#endif
+	}
+#endif
+
+	int oldOption = m_nCurrOption;
+	if (goDown) {
+		if (m_nCurrScreen != MENUPAGE_MAP)
+			DMAudio.PlayFrontEndSound(SOUND_FRONTEND_HIGHLIGHT_OPTION, 0);
+
+		m_nCurrOption++;
+		if (m_nCurrOption == NUM_MENUROWS || (aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_Action == MENUACTION_NOTHING)) {
+			m_nCurrOption = 0;
+		}
+		if (oldOption != m_nCurrOption)
+			m_nOptionHighlightTransitionBlend = 0;
+	}
+	if (goUp) {
+		if (m_nCurrScreen != MENUPAGE_MAP)
+			DMAudio.PlayFrontEndSound(SOUND_FRONTEND_HIGHLIGHT_OPTION, 0);
+
+		if (m_nCurrOption == (aScreens[m_nCurrScreen].m_aEntries[0].m_Action == MENUACTION_LABEL)) {
+			while (m_nCurrOption != NUM_MENUROWS - 1
+				&& aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption + 1].m_Action != MENUACTION_NOTHING) {
+				m_nCurrOption++;
+			}
+		} else {
+			m_nCurrOption--;
+		}
+		if (oldOption != m_nCurrOption)
+			m_nOptionHighlightTransitionBlend = 0;
+	}
+
+	if (optionSelected && m_nMenuFadeAlpha == 255) {
+		if (aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_TargetMenu == MENUPAGE_NEW_GAME_RELOAD && m_bGameNotLoaded) {
+			DoSettingsBeforeStartingAGame();
+		} else if (hasNativeList(m_nCurrScreen)) {
+			switch (m_nCurrExLayer) {
+			case HOVEROPTION_LIST:
+				if (m_nCurrScreen == MENUPAGE_KEYBOARD_CONTROLS) {
+					m_bWaitingForNewKeyBind = true;
+					m_bStartWaitingForKeyBind = true;
+					pControlEdit = &m_KeyPressedCode;
+				}
+				if (m_nCurrScreen == MENUPAGE_SKIN_SELECT) {
+					strcpy(m_PrefsSkinFile, m_aSkinName);
+					CWorld::Players[0].SetPlayerSkin(m_PrefsSkinFile);
+					m_nCurrExLayer = HOVEROPTION_BACK;
+					SaveSettings();
+				}
+				m_nHoverOption = HOVEROPTION_NOT_HOVERING;
+				break;
+			case HOVEROPTION_USESKIN:
+				m_nHoverOption = HOVEROPTION_NOT_HOVERING;
+				strcpy(m_PrefsSkinFile, m_aSkinName);
+				CWorld::Players[0].SetPlayerSkin(m_PrefsSkinFile);
+				m_nCurrExLayer = HOVEROPTION_BACK;
+				SaveSettings();
+				break;
+			case HOVEROPTION_BACK:
+			default:
+				goBack = true;
+				break;
+			}
+			if (m_nSkinsTotal > 0) {
+				m_pSelectedSkin = m_pSkinListHead.nextSkin;
+				strcpy(m_PrefsSkinFile, m_aSkinName);
+				CWorld::Players[0].SetPlayerSkin(m_PrefsSkinFile);
+				SaveSettings();
+			}
+		}
+
+		int option = aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_Action;
+#ifdef FIX_BUGS
+		int currScreen = m_nCurrScreen;
+		int currOption = m_nCurrOption;
+#endif
+		switch (option) {
+			case MENUACTION_CHANGEMENU:
+			case MENUACTION_YES:
+			case MENUACTION_NO:
+				SwitchToNewScreen(aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_TargetMenu);
+				break;
+			case MENUACTION_RADIO:
+				ChangeRadioStation(1);
+				break;
+			case MENUACTION_LANG_ENG:
+				m_PrefsLanguage = LANGUAGE_AMERICAN;
+				m_bFrontEnd_ReloadObrTxtGxt = true;
+				InitialiseChangedLanguageSettings();
+				SaveSettings();
+				break;
+			case MENUACTION_LANG_FRE:
+				m_PrefsLanguage = LANGUAGE_FRENCH;
+				m_bFrontEnd_ReloadObrTxtGxt = true;
+				InitialiseChangedLanguageSettings();
+				SaveSettings();
+				break;
+			case MENUACTION_LANG_GER:
+				m_PrefsLanguage = LANGUAGE_GERMAN;
+				m_bFrontEnd_ReloadObrTxtGxt = true;
+				InitialiseChangedLanguageSettings();
+				SaveSettings();
+				break;
+			case MENUACTION_LANG_ITA:
+				m_PrefsLanguage = LANGUAGE_ITALIAN;
+				m_bFrontEnd_ReloadObrTxtGxt = true;
+				InitialiseChangedLanguageSettings();
+				SaveSettings();
+				break;
+			case MENUACTION_LANG_SPA:
+				m_PrefsLanguage = LANGUAGE_SPANISH;
+				m_bFrontEnd_ReloadObrTxtGxt = true;
+				InitialiseChangedLanguageSettings();
+				SaveSettings();
+				break;
+			case MENUACTION_CHECKSAVE:
+			{
+				int saveSlot = aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_SaveSlot;
+
+				if (saveSlot >= SAVESLOT_1 && saveSlot <= SAVESLOT_8) {
+					m_nCurrSaveSlot = saveSlot - SAVESLOT_1;
+					if (Slots[m_nCurrSaveSlot] != SLOT_EMPTY && Slots[m_nCurrSaveSlot] != SLOT_CORRUPTED) {
+						if (m_nCurrScreen == MENUPAGE_CHOOSE_LOAD_SLOT) {
+							SwitchToNewScreen(MENUPAGE_LOAD_SLOT_CONFIRM);
+						} else if (m_nCurrScreen == MENUPAGE_CHOOSE_DELETE_SLOT) {
+							SwitchToNewScreen(MENUPAGE_DELETE_SLOT_CONFIRM);
+						}
+					}
+				}
+				break;
+			}
+			case MENUACTION_NEWGAME:
+				DoSettingsBeforeStartingAGame();
+				break;
+#ifdef LEGACY_MENU_OPTIONS
+			case MENUACTION_RELOADIDE:
+				CFileLoader::ReloadObjectTypes("GTA3.IDE");
+				break;
+#endif
+			case MENUACTION_RESUME_FROM_SAVEZONE:
+				RequestFrontEndShutDown();
+				break;
+			case MENUACTION_LOADRADIO:
+				if (m_nPrefsAudio3DProviderIndex != NO_AUDIO_PROVIDER) {
+					SwitchToNewScreen(MENUPAGE_SOUND_SETTINGS);
+					DMAudio.PlayFrontEndTrack(m_PrefsRadioStation, 1);
+					OutputDebugString("STARTED PLAYING FRONTEND AUDIO TRACK");
+				}
+				break;
+			case MENUACTION_SAVEGAME:
+			{
+				int saveSlot = aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_SaveSlot;
+
+				if (saveSlot >= 2 && saveSlot <= 9) {
+					m_nCurrSaveSlot = m_nCurrOption;
+					SwitchToNewScreen(MENUPAGE_SAVE_OVERWRITE_CONFIRM);
+				}
+				break;
+			}
+			case MENUACTION_RADARMODE:
+				if (++m_PrefsRadarMode > 2)
+					m_PrefsRadarMode = 0;
+				SaveSettings();
+				break;
+			case MENUACTION_GOBACK:
+				goBack = true;
+				break;
+			case MENUACTION_KEYBOARDCTRLS:
+				SwitchToNewScreen(MENUPAGE_KEYBOARD_CONTROLS);
+				m_nSelectedListRow = 0;
+				m_nCurrExLayer = HOVEROPTION_LIST;
+				break;
+			case MENUACTION_GETKEY:
+				m_CurrCntrlAction = GetStartOptionsCntrlConfigScreens() + m_nCurrOption;
+				m_bKeyIsOK = true;
+				m_bWaitingForNewKeyBind = true;
+				m_bStartWaitingForKeyBind = true;
+				pControlEdit = &m_KeyPressedCode;
+				break;
+			case MENUACTION_CANCELGAME:
+				DMAudio.Service();
+				SwitchToNewScreen(MENUPAGE_OUTRO);
+				break;
+			case MENUACTION_RESUME:
+#ifdef LEGACY_MENU_OPTIONS
+				if (m_PrefsVsyncDisp != m_PrefsVsync) {
+					m_PrefsVsync = m_PrefsVsyncDisp;
+				}
+#endif
+				RequestFrontEndShutDown();
+				break;
+			case MENUACTION_DONTCANCEL:
+				SwitchToNewScreen(-2);
+				break;
+			case MENUACTION_SCREENRES:
+				if (m_nDisplayVideoMode != m_nPrefsVideoMode) {
+					m_nPrefsVideoMode = m_nDisplayVideoMode;
+					_psSelectScreenVM(m_nPrefsVideoMode);
+					DMAudio.ChangeMusicMode(MUSICMODE_FRONTEND);
+					DMAudio.Service();
+					CentreMousePointer();
+					m_bShowMouse = true;
+					m_nCurrOption = 5; // TODO(Miami): Because selected option is resetted after res. change. We'll need to revisit that.
+					m_nOptionHighlightTransitionBlend = 0;
+					SaveSettings();
+				}
+				break;
+			case MENUACTION_AUDIOHW:
+			{
+				int selectedProvider = m_nPrefsAudio3DProviderIndex;
+				if (selectedProvider != NO_AUDIO_PROVIDER) {
+					if (selectedProvider == -1)
+						selectedProvider = m_nPrefsAudio3DProviderIndex = DMAudio.AutoDetect3DProviders();
+
+					m_nPrefsAudio3DProviderIndex = DMAudio.SetCurrent3DProvider(m_nPrefsAudio3DProviderIndex);
+					if (selectedProvider != m_nPrefsAudio3DProviderIndex) {
+						SetHelperText(5);
+					}
+					SaveSettings();
+				}
+				break;
+			}
+			case MENUACTION_SPEAKERCONF:
+				if (m_nPrefsAudio3DProviderIndex != NO_AUDIO_PROVIDER) {
+					if (--m_PrefsSpeakers < 0)
+						m_PrefsSpeakers = 2;
+					DMAudio.SetSpeakerConfig(m_PrefsSpeakers);
+					SaveSettings();
+				}
+				break;
+			case MENUACTION_PLAYERSETUP:
+				CPlayerSkin::BeginFrontendSkinEdit();
+				SwitchToNewScreen(MENUPAGE_SKIN_SELECT);
+				m_bSkinsEnumerated = false;
+				m_nCurrExLayer = HOVEROPTION_LIST;
+				break;
+			case MENUACTION_RESTOREDEF:
+				if (m_nCurrScreen == MENUPAGE_SOUND_SETTINGS) {
+					m_nPrefsAudio3DProviderIndex = DMAudio.AutoDetect3DProviders();
+					DMAudio.SetCurrent3DProvider(m_nPrefsAudio3DProviderIndex);
+					m_PrefsSfxVolume = 49;
+					m_PrefsMusicVolume = 49;
+					m_PrefsRadioStation = EMOTION;
+					m_PrefsMP3BoostVolume = 0;
+					m_PrefsStereoMono = 1;
+					m_PrefsSpeakers = 0;
+					DMAudio.SetMP3BoostVolume(m_PrefsMP3BoostVolume);
+					DMAudio.SetMusicMasterVolume(m_PrefsMusicVolume);
+					DMAudio.SetEffectsMasterVolume(m_PrefsSfxVolume);
+					DMAudio.SetRadioInCar(m_PrefsRadioStation);
+					DMAudio.PlayFrontEndTrack(m_PrefsRadioStation, 1);
+					SaveSettings();
+				} else if (m_nCurrScreen == MENUPAGE_DISPLAY_SETTINGS) {
+					m_PrefsBrightness = 256;
+					m_PrefsLOD = 1.2f;
+#ifdef LEGACY_MENU_OPTIONS
+					m_PrefsVsync = true;
+#endif
+					CRenderer::ms_lodDistScale = m_PrefsLOD;
+					m_PrefsShowSubtitles = false;
+#ifdef ASPECT_RATIO_SCALE
+					m_PrefsUseWideScreen = AR_AUTO;
+#else
+					m_PrefsUseWideScreen = false;
+#endif
+					m_PrefsShowLegends = true;
+					m_PrefsVsyncDisp = true;
+					m_PrefsFrameLimiter = true;
+					m_PrefsRadarMode = 0;
+					m_PrefsShowHud = true;
+					m_nDisplayVideoMode = m_nPrefsVideoMode;
+					CMBlur::BlurOn = false;
+#ifdef CUSTOM_FRONTEND_OPTIONS
+					extern void RestoreDefGraphics(int8);
+					extern void RestoreDefDisplay(int8);
+
+					RestoreDefGraphics(FEOPTION_ACTION_SELECT);
+					RestoreDefDisplay(FEOPTION_ACTION_SELECT);
+#endif
+					SaveSettings();
+				} else if (m_nCurrScreen == MENUPAGE_CONTROLLER_PC) {
+					ControlsManager.MakeControllerActionsBlank();
+					ControlsManager.InitDefaultControlConfiguration();
+					ControlsManager.InitDefaultControlConfigMouse(MousePointerStateHelper.GetMouseSetUp());
+#if !defined RW_GL3
+					if (AllValidWinJoys.m_aJoys[JOYSTICK1].m_bInitialised) {
+						DIDEVCAPS devCaps;
+						devCaps.dwSize = sizeof(DIDEVCAPS);
+						PSGLOBAL(joy1)->GetCapabilities(&devCaps);
+						ControlsManager.InitDefaultControlConfigJoyPad(devCaps.dwButtons);
+					}
+#else
+					if (PSGLOBAL(joy1id) != -1 && glfwJoystickPresent(PSGLOBAL(joy1id))) {
+						int count;
+						glfwGetJoystickButtons(PSGLOBAL(joy1id), &count);
+						ControlsManager.InitDefaultControlConfigJoyPad(count);
+					}
+#endif
+					MousePointerStateHelper.bInvertVertically = true;
+					TheCamera.m_bHeadBob = false;
+#ifdef FIX_BUGS
+					TheCamera.m_fMouseAccelVertical = 0.003f;
+#endif
+					TheCamera.m_fMouseAccelHorzntl = 0.0025f;
+					CVehicle::m_bDisableMouseSteering = true;
+					m_ControlMethod = CONTROL_STANDARD;
+#ifdef PC_PLAYER_CONTROLS
+					TheCamera.m_bUseMouse3rdPerson = true;
+#else
+					TheCamera.m_bUseMouse3rdPerson = false;
+#endif
+					SaveSettings();
+#ifdef LOAD_INI_SETTINGS
+					SaveINIControllerSettings();
+#endif
+				}
+				SetHelperText(2);
+				break;
+			case MENUACTION_CTRLMETHOD:
+				if (m_ControlMethod == CONTROL_CLASSIC) {
+					CCamera::m_bUseMouse3rdPerson = true;
+					m_ControlMethod = CONTROL_STANDARD;
+				} else {
+					CCamera::m_bUseMouse3rdPerson = false;
+					m_ControlMethod = CONTROL_CLASSIC;
+				}
+				SaveSettings();
+				break;
+#ifdef CUSTOM_FRONTEND_OPTIONS
+			case MENUACTION_CFO_SELECT:
+			case MENUACTION_CFO_DYNAMIC:
+				CMenuScreenCustom::CMenuEntry &option = aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption];
+				if (option.m_Action == MENUACTION_CFO_SELECT) {
+					if (option.m_CFOSelect->disableIfGameLoaded && !m_bGameNotLoaded)
+							break;
+
+					if (!option.m_CFOSelect->onlyApplyOnEnter) {
+						option.m_CFOSelect->displayedValue++;
+						if (option.m_CFOSelect->displayedValue >= option.m_CFOSelect->numRightTexts || option.m_CFOSelect->displayedValue < 0)
+							option.m_CFOSelect->displayedValue = 0;
+					}
+					int8 oldValue = *option.m_CFO->value;
+
+					*option.m_CFO->value = option.m_CFOSelect->lastSavedValue = option.m_CFOSelect->displayedValue;
+
+					// Now everything is saved in .ini, and LOAD_INI_SETTINGS is fundamental for CFO
+					// if (option.m_CFOSelect->save)
+						SaveSettings();
+
+					if (option.m_CFOSelect->displayedValue != oldValue && option.m_CFOSelect->changeFunc)
+						option.m_CFOSelect->changeFunc(oldValue, option.m_CFOSelect->displayedValue);
+
+				} else if (option.m_Action == MENUACTION_CFO_DYNAMIC) {
+					if (option.m_CFODynamic->buttonPressFunc)
+						option.m_CFODynamic->buttonPressFunc(FEOPTION_ACTION_SELECT);
+				}
+
+				break;
+#endif
+		}
+		ProcessOnOffMenuOptions();
+		if (!goBack) {
+#ifdef FIX_BUGS
+			int saveSlot = aScreens[currScreen].m_aEntries[currOption].m_SaveSlot;
+			if (saveSlot >= SAVESLOT_1 && saveSlot <= SAVESLOT_8 && Slots[currOption] != SLOT_OK)
+#else
+			int saveSlot = aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_SaveSlot;
+			if (saveSlot >= SAVESLOT_1 && saveSlot <= SAVESLOT_8 && Slots[m_nCurrOption] != SLOT_OK)
+#endif
+				DMAudio.PlayFrontEndSound(SOUND_FRONTEND_FAIL, 0);
+			else
+				DMAudio.PlayFrontEndSound(SOUND_FRONTEND_ENTER_OR_ADJUST, 0);
+		}
+	}
+
+	if (goBack) {
+		if (m_NoEmptyBinding) {
+			DMAudio.PlayFrontEndSound(SOUND_FRONTEND_BACK, 0);
+			SwitchToNewScreen(-2);
+			if (hasNativeList(m_nCurrScreen)) {
+				m_nTotalListRow = 0;
+			}
+		} else {
+			DMAudio.PlayFrontEndSound(SOUND_FRONTEND_FAIL, 0);
+			m_ShowEmptyBindingError = true;
+		}
+	}
+
+	if (changeAmount != 0) {
+		switch (aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_Action) {
+#ifdef GAMEPAD_MENU
+			case MENUACTION_CTRLCONFIG:
+				CPad::GetPad(0)->Mode += changeAmount;
+				if (CPad::GetPad(0)->Mode > 3)
+					CPad::GetPad(0)->Mode = 0;
+				else if (CPad::GetPad(0)->Mode < 0)
+					CPad::GetPad(0)->Mode = 3;
+				SaveSettings();
+				break;
+#endif
+			case MENUACTION_RADIO:
+				ChangeRadioStation(changeAmount);
+				break;
+			case MENUACTION_RADARMODE:
+				m_PrefsRadarMode += changeAmount;
+				if (m_PrefsRadarMode < 0)
+					m_PrefsRadarMode = 2;
+				if (m_PrefsRadarMode > 2)
+					m_PrefsRadarMode = 0;
+				break;
+#ifdef ASPECT_RATIO_SCALE
+			case MENUACTION_WIDESCREEN:
+				if (changeAmount > 0) {
+					m_PrefsUseWideScreen++;
+					if (m_PrefsUseWideScreen > AR_MAX - 1)
+						m_PrefsUseWideScreen = 0;
+				} else {
+					m_PrefsUseWideScreen--;
+					if (m_PrefsUseWideScreen < 0)
+						m_PrefsUseWideScreen = AR_MAX - 1;
+				}
+				SaveSettings();
+				break;
+#endif
+			case MENUACTION_SCREENRES:
+				if (m_bGameNotLoaded) {
+					RwChar** videoMods = _psGetVideoModeList();
+					if (changeAmount > 0) {
+						do {
+							++m_nDisplayVideoMode;
+
+							if (m_nDisplayVideoMode >= _psGetNumVideModes())
+								m_nDisplayVideoMode = 0;
+						} while (!videoMods[m_nDisplayVideoMode]);
+					} else {
+						do {
+							--m_nDisplayVideoMode;
+
+							if (m_nDisplayVideoMode < 0)
+								m_nDisplayVideoMode = _psGetNumVideModes() - 1;
+						} while (!videoMods[m_nDisplayVideoMode]);
+					}
+				}
+				break;
+			case MENUACTION_AUDIOHW:
+				if (m_nPrefsAudio3DProviderIndex != NO_AUDIO_PROVIDER) {
+					m_nPrefsAudio3DProviderIndex += changeAmount;
+
+					bool checkIfForbidden = true;
+					while (checkIfForbidden) {
+						checkIfForbidden = false;
+
+						if (m_nPrefsAudio3DProviderIndex < -1)
+							m_nPrefsAudio3DProviderIndex = DMAudio.GetNum3DProvidersAvailable() - 1;
+						else if (m_nPrefsAudio3DProviderIndex > DMAudio.GetNum3DProvidersAvailable() - 1)
+							m_nPrefsAudio3DProviderIndex = -1;
+
+						// what a retarded move...
+						if (m_nPrefsAudio3DProviderIndex != -1) {
+							char* provider = DMAudio.Get3DProviderName(m_nPrefsAudio3DProviderIndex);
+							strupr(provider);
+							if (!strcmp(provider, "MILES FAST 2D POSITIONAL AUDIO")) {
+								m_nPrefsAudio3DProviderIndex += changeAmount;
+								checkIfForbidden = true;
+
+							} else if (!strcmp(provider, "AUREAL A3D 2.0 (TM)")) {
+								m_nPrefsAudio3DProviderIndex += changeAmount;
+								checkIfForbidden = true;
+
+							} else if (!strcmp(provider, "AUREAL A3D INTERACTIVE (TM)")) {
+								m_nPrefsAudio3DProviderIndex += changeAmount;
+								checkIfForbidden = true;
+							}
+						}
+					}
+				}
+				break;
+			case MENUACTION_SPEAKERCONF:
+				if (m_nPrefsAudio3DProviderIndex != NO_AUDIO_PROVIDER) {
+					m_PrefsSpeakers -= changeAmount;
+					m_PrefsSpeakers = clamp(m_PrefsSpeakers, 0, 2);
+					DMAudio.SetSpeakerConfig(m_PrefsSpeakers);
+					SaveSettings();
+				}
+				break;
+			case MENUACTION_CTRLMETHOD:
+				m_ControlMethod = !m_ControlMethod;
+				CCamera::m_bUseMouse3rdPerson = !m_ControlMethod;
+				SaveSettings();
+				break;
+#ifdef CUSTOM_FRONTEND_OPTIONS
+			case MENUACTION_CFO_SELECT:
+			case MENUACTION_CFO_DYNAMIC:
+				CMenuScreenCustom::CMenuEntry &option = aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption];
+				if (option.m_Action == MENUACTION_CFO_SELECT) {
+					if (option.m_CFOSelect->disableIfGameLoaded && !m_bGameNotLoaded)
+						break;
+					
+					if (changeAmount > 0) {
+						option.m_CFOSelect->displayedValue++;
+						if (option.m_CFOSelect->displayedValue >= option.m_CFOSelect->numRightTexts)
+							option.m_CFOSelect->displayedValue = 0;
+					} else {
+						option.m_CFOSelect->displayedValue--;
+						if (option.m_CFOSelect->displayedValue < 0)
+							option.m_CFOSelect->displayedValue = option.m_CFOSelect->numRightTexts - 1;
+					}
+					if (!option.m_CFOSelect->onlyApplyOnEnter) {
+						int8 oldValue = *option.m_CFO->value;
+
+						*option.m_CFO->value = option.m_CFOSelect->lastSavedValue = option.m_CFOSelect->displayedValue;
+
+						// Now everything is saved in .ini, and LOAD_INI_SETTINGS is fundamental for CFO
+						// if (option.m_CFOSelect->save)
+							SaveSettings();
+
+						if (option.m_CFOSelect->displayedValue != oldValue && option.m_CFOSelect->changeFunc)
+							option.m_CFOSelect->changeFunc(oldValue, option.m_CFOSelect->displayedValue);
+					}
+				} else if (option.m_Action == MENUACTION_CFO_DYNAMIC && option.m_CFODynamic->buttonPressFunc) {
+					option.m_CFODynamic->buttonPressFunc(changeAmount > 0 ? FEOPTION_ACTION_RIGHT : FEOPTION_ACTION_LEFT);
+				}
+				break;
+#endif
+		}
+		CheckSliderMovement(changeAmount);
+		ProcessOnOffMenuOptions();
+		if (m_nCurrScreen == MENUPAGE_KEYBOARD_CONTROLS) {
+			if (changeAmount < 1) {
+				m_nSelectedContSetupColumn = CONTSETUP_PED_COLUMN;
+			} else {
+				m_nSelectedContSetupColumn = CONTSETUP_VEHICLE_COLUMN;
+			}
+		}
+	}
+}
+
+void
+CMenuManager::ProcessOnOffMenuOptions()
+{
+	switch (aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_Action) {
+#ifdef GAMEPAD_MENU
+	case MENUACTION_CTRLVIBRATION:
+		m_PrefsUseVibration = !m_PrefsUseVibration;
+		if (m_PrefsUseVibration) {
+			CPad::GetPad(0)->StartShake(350, 150);
+			TimeToStopPadShaking = CTimer::GetTimeInMillisecondsPauseMode() + 500;
+		}
+		SaveSettings();
+		break;
+#endif
+	case MENUACTION_INVERTPADY:
+		CPad::bInvertLook4Pad = !CPad::bInvertLook4Pad;
+		SaveSettings(); // FIX: Why don't SaveSettings? Because of it's an hidden option? :(
+		break;
+	case MENUACTION_CTRLDISPLAY:
+		m_DisplayControllerOnFoot = !m_DisplayControllerOnFoot;
+		break;
+	case MENUACTION_FRAMESYNC:
+		m_PrefsVsyncDisp = !m_PrefsVsyncDisp;
+		SaveSettings(); // FIX: Again... This makes me very unhappy
+		break;
+	case MENUACTION_FRAMELIMIT:
+		m_PrefsFrameLimiter = !m_PrefsFrameLimiter;
+		SaveSettings();
+		break;
+	case MENUACTION_TRAILS:
+		CMBlur::BlurOn = !CMBlur::BlurOn;
+		SaveSettings();
+		break;
+	case MENUACTION_SUBTITLES:
+		m_PrefsShowSubtitles = !m_PrefsShowSubtitles;
+		SaveSettings();
+		break;
+#ifndef ASPECT_RATIO_SCALE
+	case MENUACTION_WIDESCREEN:
+		m_PrefsUseWideScreen = !m_PrefsUseWideScreen;
+		SaveSettings();
+		break;
+#endif
+	case MENUACTION_LEGENDS:
+		m_PrefsShowLegends = !m_PrefsShowLegends;
+		break;
+	case MENUACTION_HUD:
+		m_PrefsShowHud = !m_PrefsShowHud;
+		SaveSettings();
+		break;
+#ifdef LEGACY_MENU_OPTIONS
+	case MENUACTION_SETDBGFLAG:
+		CTheScripts::InvertDebugFlag();
+		break;
+	case MENUACTION_SWITCHBIGWHITEDEBUGLIGHT:
+		gbBigWhiteDebugLightSwitchedOn = !gbBigWhiteDebugLightSwitchedOn;
+		break;
+	case MENUACTION_COLLISIONPOLYS:
+		gbShowCollisionPolys = !gbShowCollisionPolys;
+		break;
+#endif
+	case MENUACTION_SHOWHEADBOB:
+		TheCamera.m_bHeadBob = !TheCamera.m_bHeadBob;
+		SaveSettings();
+		break;
+	case MENUACTION_INVVERT:
+		MousePointerStateHelper.bInvertVertically = !MousePointerStateHelper.bInvertVertically;
+		SaveSettings();
+		break;
+	case MENUACTION_DYNAMICACOUSTIC:
+		m_PrefsDMA = !m_PrefsDMA;
+		DMAudio.SetDynamicAcousticModelingStatus(m_PrefsDMA);
+		SaveSettings();
+		break;
+	case MENUACTION_MOUSESTEER:
+		if (m_ControlMethod == CONTROL_STANDARD) {
+			CVehicle::m_bDisableMouseSteering = !CVehicle::m_bDisableMouseSteering;
+			SaveSettings();
+		}
+		break;
+	}
+}
+
+void
+CMenuManager::RequestFrontEndShutDown()
+{
+	m_bShutDownFrontEndRequested = true;
+}
+
+void
+CMenuManager::RequestFrontEndStartUp()
+{
+	m_bStartUpFrontEndRequested = true;
+}
+
+void
+CMenuManager::ResetHelperText() 
+{
+	m_nHelperTextMsgId = 0;
+	m_nHelperTextAlpha = 300;
+}
+
+void
+CMenuManager::SetHelperText(int text)
+{
+	m_nHelperTextMsgId = text;
+	m_nHelperTextAlpha = 300;
+}
+
+float
+CMenuManager::StretchX(float x)
+{
+	if (SCREEN_WIDTH == DEFAULT_SCREEN_WIDTH)
+		return x;
+	else
+		// We won't make this SCREEN_SCALE, because many cases relies on stretching and we want the code to be portable.
+		// Instead we will use MENU_X_LEFT_ALIGNED or SCREEN_SCALE_X when needed.
+		return SCREEN_STRETCH_X(x);
+}
+
+float CMenuManager::StretchY(float y)
+{
+	if (SCREEN_HEIGHT == DEFAULT_SCREEN_HEIGHT)
+		return y;
+	else
+		return SCREEN_STRETCH_Y(y);
+}
+
+#ifdef XBOX_MESSAGE_SCREEN
+void
+CMenuManager::CloseDialog(void)
+{
+	// We don't have this on PC GXT :shrug:
+	static wchar* gameSaved = AllocUnicode("Game saved successfully!");
+
+	if (m_bSaveWasSuccessful && DialogTextCmp("FESZ_WR")) {
+		m_bSaveWasSuccessful = false; // i don't know where XBOX resets that
+		m_pDialogText = gameSaved;
+		SetDialogTimer(1000);
+	    ProcessDialogTimer();
+	} else {
+		ToggleDialog(false);
+	}
+
+}
+
+void
+CMenuManager::ProcessDialogTimer(void)
+{
+	if (!m_bDialogOpen || m_nDialogHideTimer == 0)
+		return;
+
+	// Also XBOX has unified time source for in-game/menu, but we don't have that
+	if (m_bMenuActive && CTimer::GetTimeInMilliseconds() > m_nDialogHideTimer || !m_bMenuActive && CTimer::GetTimeInMillisecondsPauseMode() > m_nDialogHideTimerPauseMode) {
+
+		// This is originally activePage.funcs->closePage()
+		CloseDialog();
+	}
+}
+
+void
+CMenuManager::SetDialogTimer(uint32 timer)
+{
+	// XBOX iterates some page list(actives?) and then sets timer variable of specified page to specified value. We only have dialog right now.
+	// Also XBOX has unified time source for in-game/menu, but we don't have that, thus 2 timer variables...
+
+	m_nDialogHideTimer = CTimer::GetTimeInMilliseconds() + timer;
+	m_nDialogHideTimerPauseMode = CTimer::GetTimeInMillisecondsPauseMode() + timer;
+}
+
+void
+CMenuManager::SetDialogText(const char* key)
+{
+	// There are many things going around here, idk why
+	m_pDialogText = TheText.Get(key);
+}
+
+bool
+CMenuManager::DialogTextCmp(const char* key)
+{
+	wchar *value = TheText.Get(key);
+	wchar *i = m_pDialogText;
+	for (; *i != '\0' && *value != '\0'; i++, value++) {
+		if (*i != *value)
+			return false;
+	}
+	return *i == '\0' && *value == '\0';
+}
+
+void
+CMenuManager::ToggleDialog(bool toggle)
+{
+	// This originally calls some mysterious function on enable and close CB on disable, along with decreasing some counter. Which is no use for dialog
+
+	// XBOX doesn't do that
+	if (toggle)
+		m_nDialogHideTimer = 0;
+
+	m_bDialogOpen = toggle;
+}
+
+void
+DrawDialogBg(float offset, uint8 alpha)
+{
+	CSprite2d::Draw2DPolygon(SCALE_AND_CENTER_X(84.f + offset), MENU_Y(126.f + offset),
+		SCALE_AND_CENTER_X(512.f + offset), MENU_Y(109.f + offset),
+		SCALE_AND_CENTER_X(100.f + offset), MENU_Y(303.f + offset),
+		SCALE_AND_CENTER_X(474.f + offset), MENU_Y(311.f + offset), CRGBA(107, 193, 236, alpha));
+	CSprite2d::Draw2DPolygon(SCALE_AND_CENTER_X(523.f + offset), MENU_Y(108.f + offset),
+		SCALE_AND_CENTER_X(542.f + offset), MENU_Y(107.f + offset),
+		SCALE_AND_CENTER_X(485.f + offset), MENU_Y(310.f + offset),
+		SCALE_AND_CENTER_X(516.f + offset), MENU_Y(311.f + offset), CRGBA(107, 193, 236, alpha));
+}
+
+void
+CMenuManager::DrawOverlays(void)
+{
+	// This is stripped to show only Dialog box, XBOX does much more in here.
+
+	if (!m_bDialogOpen)
+		return;
+
+	DefinedState();
+
+	CSprite2d::DrawRect(CRect(0, SCREEN_HEIGHT, SCREEN_WIDTH, 0), CRGBA(0, 0, 0, 160));
+
+	// Ofc this is not hardcoded like that on Xbox, it should be a texture
+	DrawDialogBg(20.f, 160); // shadow
+	DrawDialogBg(0.f, 255);
+
+	CFont::SetBackgroundOff();
+	CFont::SetPropOn();
+	CFont::SetJustifyOn();
+	CFont::SetBackGroundOnlyTextOn();
+	CFont::SetFontStyle(FONT_LOCALE(FONT_STANDARD));
+	CFont::SetCentreSize(SCREEN_SCALE_X(380.0f));
+	CFont::SetCentreOn();
+	CFont::SetColor(CRGBA(LABEL_COLOR.r, LABEL_COLOR.g, LABEL_COLOR.b, 255));
+	CFont::SetDropShadowPosition(2);
+	CFont::SetDropColor(CRGBA(0, 0, 0, 255));
+	// Both of those are 0.9 on Xbox, which is ofcouse wrong...
+	CFont::SetScale(SCREEN_SCALE_X(BIGTEXT_X_SCALE), SCREEN_SCALE_Y(BIGTEXT_Y_SCALE));
+	
+	int x = SCREEN_WIDTH / 2.f - SCREEN_SCALE_X(30.0f);
+	int y = SCREEN_HEIGHT / 2.f - SCREEN_SCALE_Y(30.0f);
+	int numOfLines = CFont::GetNumberLines(x, y, m_pDialogText);
+	CFont::PrintString(x, y - SCREEN_SCALE_Y(numOfLines / 2.f), m_pDialogText);
+	CFont::DrawFonts();
+}
+#endif
+
+void
+CMenuManager::ProcessFileActions()
+{
+	switch (m_nCurrScreen) {
+		case MENUPAGE_LOADING_IN_PROGRESS:
+			if (CheckSlotDataValid(m_nCurrSaveSlot)) {
+#ifdef USE_DEBUG_SCRIPT_LOADER
+				scriptToLoad = 0;
+#endif
+
+#ifdef XBOX_MESSAGE_SCREEN
+				SetDialogText("FELD_WR");
+				ToggleDialog(true);
+#else
+				if (!m_bGameNotLoaded)
+					MessageScreen("FELD_WR", true);
+#endif
+				DoSettingsBeforeStartingAGame();
+				m_bWantToLoad = true;
+			} else
+				SwitchToNewScreen(MENUPAGE_NEW_GAME);
+
+			break;
+		case MENUPAGE_DELETING_IN_PROGRESS:
+		{
+			static bool waitedForScreen = false;
+
+			if (waitedForScreen) {
+				bool SlotPopulated = false;
+				if (PcSaveHelper.DeleteSlot(m_nCurrSaveSlot)) {
+					PcSaveHelper.PopulateSlotInfo();
+					SlotPopulated = true;
+				}
+
+				if (SlotPopulated) {
+					SwitchToNewScreen(MENUPAGE_DELETE_SUCCESSFUL);
+				} else {
+					SwitchToNewScreen(MENUPAGE_SAVE_CUSTOM_WARNING);
+					strncpy(aScreens[m_nCurrScreen].m_ScreenName, "FES_DEL", 8);
+					strncpy(aScreens[m_nCurrScreen].m_aEntries[0].m_EntryName, "FES_DEE", 8);
+				}
+				waitedForScreen = false;
+			} else if (m_nMenuFadeAlpha >= 255)
+				waitedForScreen = true;
+
+			break;
+		}
+		case MENUPAGE_SAVING_IN_PROGRESS:
+		{
+#ifdef XBOX_MESSAGE_SCREEN
+			if (m_bDialogOpen && DialogTextCmp("FESZ_WR")) {
+				PauseModeTime startTime = CTimer::GetTimeInMillisecondsPauseMode();
+				int8 SaveSlot = PcSaveHelper.SaveSlot(m_nCurrSaveSlot);
+				PcSaveHelper.PopulateSlotInfo();
+
+				// Original code, but we don't want redundant saving text if it doesn't
+#if 0
+				CTimer::Update(); // not on Xbox, who updates it?
+
+				// it compensates the lag to show saving text always one second... how cute
+				int dialogDur = Max(1, startTime - CTimer::GetTimeInMillisecondsPauseMode() + 1000);
+#else
+				int dialogDur = 1;
+#endif
+
+				if (SaveSlot) {
+					// error. PC code
+					ToggleDialog(false);
+					SwitchToNewScreen(MENUPAGE_SAVE_CUSTOM_WARNING);
+					strncpy(aScreens[m_nCurrScreen].m_ScreenName, "FET_SG", 8);
+					strncpy(aScreens[m_nCurrScreen].m_aEntries[0].m_EntryName, "FES_CMP", 8);
+
+				} else {
+					m_bSaveWasSuccessful = true;
+					SetDialogTimer(dialogDur);
+					ProcessDialogTimer();
+					RequestFrontEndShutDown();
+				}
+
+			} else {
+				SetDialogText("FESZ_WR");
+				ToggleDialog(true);
+			}
+#else
+			static bool waitedForScreen = false;
+
+			if (waitedForScreen) {
+				int8 SaveSlot = PcSaveHelper.SaveSlot(m_nCurrSaveSlot);
+				PcSaveHelper.PopulateSlotInfo();
+				if (SaveSlot) {
+					SwitchToNewScreen(MENUPAGE_SAVE_CUSTOM_WARNING);
+					strncpy(aScreens[m_nCurrScreen].m_ScreenName, "FET_SG", 8);
+					strncpy(aScreens[m_nCurrScreen].m_aEntries[0].m_EntryName, "FES_CMP", 8);
+				} else
+					SwitchToNewScreen(MENUPAGE_SAVE_SUCCESSFUL);
+
+				waitedForScreen = false;
+			} else if (m_nMenuFadeAlpha >= 255)
+				waitedForScreen = true;
+#endif
+			break;
+		}
+	}
+}
+
+void
+CMenuManager::SwitchMenuOnAndOff()
+{
+	if (!TheCamera.m_WideScreenOn) {
+
+		// Reminder: You need REGISTER_START_BUTTON defined to make it work.
+		if ((CPad::GetPad(0)->GetStartJustDown() || CPad::GetPad(0)->GetEscapeJustDown())
+			&& (!m_bMenuActive || m_nCurrScreen == MENUPAGE_PAUSE_MENU || m_nCurrScreen == MENUPAGE_CHOOSE_SAVE_SLOT || m_nCurrScreen == MENUPAGE_SAVE_CHEAT_WARNING)
+			|| m_bShutDownFrontEndRequested || m_bStartUpFrontEndRequested
+#ifdef REGISTER_START_BUTTON
+			|| CPad::GetPad(0)->GetStartJustDown() && !m_bGameNotLoaded
+#endif
+			) {
+
+			if (m_nCurrScreen != MENUPAGE_LOADING_IN_PROGRESS
+#ifdef XBOX_MESSAGE_SCREEN
+				&& m_nCurrScreen != MENUPAGE_SAVING_IN_PROGRESS
+#endif
+				) {
+				DoRWStuffStartOfFrame(0, 0, 0, 0, 0, 0, 255);
+				DoRWStuffEndOfFrame();
+				DoRWStuffStartOfFrame(0, 0, 0, 0, 0, 0, 255);
+				DoRWStuffEndOfFrame();
+			}
+
+			if (m_bShutDownFrontEndRequested)
+				m_bMenuActive = false;
+			else if (m_bStartUpFrontEndRequested)
+				m_bMenuActive = true;
+			else
+				m_bMenuActive = !m_bMenuActive;
+
+			if (m_bMenuActive) {
+				if (_InputMouseNeedsExclusive()) {
+					_InputShutdownMouse();
+					_InputInitialiseMouse(false);
+				}
+				Initialise();
+				LoadAllTextures();
+#ifdef FIX_BUGS
+				CPad::StopPadsShaking();
+#endif
+			} else {
+#ifdef EXTENDED_COLOURFILTER
+				// we always expect CPostFX to be open
+				CMBlur::BlurOn = true;
+#endif
+				if (CMBlur::BlurOn)
+					CMBlur::MotionBlurOpen(Scene.camera);
+				else
+					CMBlur::MotionBlurClose();
+				DoRWStuffStartOfFrame(0, 0, 0, 0, 0, 0, 255);
+				DoRWStuffEndOfFrame();
+				DoRWStuffStartOfFrame(0, 0, 0, 0, 0, 0, 255);
+				DoRWStuffEndOfFrame();
+				if (_InputMouseNeedsExclusive()) {
+					_InputShutdownMouse();
+					_InputInitialiseMouse(true);
+				}
+
+				m_StatsScrollSpeed = 150.0f;
+#ifdef FIX_BUGS
+				ThingsToDoBeforeLeavingPage();
+#endif
+				SaveSettings();
+#ifdef LOAD_INI_SETTINGS
+				SaveINIControllerSettings();
+#endif
+				pControlEdit = nil;
+				pEditString = nil;
+				DisplayComboButtonErrMsg = false;
+				m_bShutDownFrontEndRequested = false;
+				m_bStartUpFrontEndRequested = false;
+				m_bWaitingForNewKeyBind = false;
+
+#ifdef REGISTER_START_BUTTON
+				int16 start1 = CPad::GetPad(0)->PCTempJoyState.Start, start2 = CPad::GetPad(0)->PCTempKeyState.Start,
+					start3 = CPad::GetPad(0)->OldState.Start, start4 = CPad::GetPad(0)->NewState.Start;
+#endif
+				CPad::GetPad(0)->Clear(false);
+				CPad::GetPad(1)->Clear(false);
+#ifdef REGISTER_START_BUTTON
+				CPad::GetPad(0)->PCTempJoyState.Start = start1;
+				CPad::GetPad(0)->PCTempKeyState.Start = start2;
+				CPad::GetPad(0)->OldState.Start = start3;
+				CPad::GetPad(0)->NewState.Start = start4;
+#endif
+				UnloadTextures();
+				CTimer::EndUserPause();
+				CTimer::Update();
+				m_OnlySaveMenu = false;
+			}
+		}
+	}
+
+	// Just entered the save/safe zone
+	if (m_bActivateSaveMenu) {
+		DoRWStuffStartOfFrame(0, 0, 0, 0, 0, 0, 255);
+		DoRWStuffEndOfFrame();
+		DoRWStuffStartOfFrame(0, 0, 0, 0, 0, 0, 255);
+		DoRWStuffEndOfFrame();
+		m_bActivateSaveMenu = false;
+		m_bMenuActive = true;
+		m_OnlySaveMenu = true;
+
+		if (_InputMouseNeedsExclusive()) {
+			_InputShutdownMouse();
+			_InputInitialiseMouse(false);
+		}
+
+		Initialise();
+		LoadAllTextures();
+
+		if (CPad::bHasPlayerCheated) {
+			m_nCurrScreen = MENUPAGE_SAVE_CHEAT_WARNING;
+			m_nCurrOption = 0;
+		} else {
+			m_nCurrScreen = MENUPAGE_CHOOSE_SAVE_SLOT;
+			m_nCurrOption = 8;
+		}
+	}
+
+	m_bStartUpFrontEndRequested = false;
+	m_bShutDownFrontEndRequested = false;
+
+#ifdef GAMEPAD_MENU
+	// Reset pad shaking.
+	if (TimeToStopPadShaking && TimeToStopPadShaking < CTimer::GetTimeInMillisecondsPauseMode()) {
+		CPad::StopPadsShaking();
+		TimeToStopPadShaking = 0;
+	}
+#endif
+}
+
+void
+CMenuManager::UnloadTextures()
+{
+	if (m_nCurrScreen == MENUPAGE_SOUND_SETTINGS)
+		DMAudio.StopFrontEndTrack();
+
+	DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_STARTING, 0);
+	DMAudio.ChangeMusicMode(MUSICMODE_GAME);
+	if (m_bSpritesLoaded) {
+		printf("REMOVE frontend\n");
+		int frontend = CTxdStore::FindTxdSlot("frontend1");
+		for (int i = 0; i < 3; ++i)
+			m_aFrontEndSprites[i].Delete();
+
+		CTxdStore::RemoveTxd(frontend);
+
+		if (!m_OnlySaveMenu) {
+			int frontend2 = CTxdStore::FindTxdSlot("frontend2");
+			for (int i = 3; i < NUM_MENU_SPRITES; ++i)
+				m_aFrontEndSprites[i].Delete();
+
+			CTxdStore::RemoveTxd(frontend2);
+
+#ifdef GAMEPAD_MENU
+			// Unload controller txd
+			int frontend_controller = CTxdStore::FindTxdSlot("frontend_controller");
+			if (frontend_controller != -1)
+				CTxdStore::RemoveTxd(frontend_controller);
+#endif
+		}
+
+		m_bSpritesLoaded = false;
+	}
+	m_OnlySaveMenu = false;
+	CUserDisplay::PlaceName.ProcessAfterFrontEndShutDown();
+}
+
+void
+CMenuManager::WaitForUserCD()
+{
+	CSprite2d *splash;
+	char *splashscreen = nil;
+
+	splash = LoadSplash(splashscreen);
+
+	if (RsGlobal.quit)
+		return;
+
+	HandleExit();
+	CPad::UpdatePads();
+	MessageScreen("NO_PCCD", true);
+
+	if (CPad::GetPad(0)->GetEscapeJustDown()) {
+		m_bQuitGameNoCD = true;
+		RsEventHandler(rsQUITAPP, nil);
+	}
+}
+
+void
+CMenuManager::DrawQuitGameScreen(void)
+{
+	static int32 exitSignalTimer = 0;
+
+#ifdef FIX_BUGS
+	int alpha = clamp(m_nMenuFadeAlpha, 0, 255);
+#else
+	int alpha = m_nMenuFadeAlpha;
+#endif
+
+#ifndef MUCH_SHORTER_OUTRO_SCREEN
+	static PauseModeTime lastTickIncrease = 0;
+	if (alpha == 255 && CTimer::GetTimeInMillisecondsPauseMode() - lastTickIncrease > 10) {
+		exitSignalTimer++;
+		lastTickIncrease = CTimer::GetTimeInMillisecondsPauseMode();
+	}
+#else
+	static PauseModeTime firstTick = CTimer::GetTimeInMillisecondsPauseMode();
+	if (alpha == 255 && CTimer::GetTimeInMillisecondsPauseMode() - firstTick > 750) {
+		exitSignalTimer = 150;
+	}
+#endif
+	static CSprite2d *splash = nil;
+
+	if (splash == nil)
+		splash = LoadSplash("OUTRO");
+
+	m_aFrontEndSprites[MENUSPRITE_VCLOGO].Draw(CRect(SCREEN_STRETCH_X(28.0f), MENU_Y(8.0f), SCREEN_STRETCH_X(27.0f) + MENU_X(130.f), MENU_Y(138.0f)), CRGBA(255, 255, 255, 255 - alpha));
+
+	// Or we can see menu background from sides
+#ifdef ASPECT_RATIO_SCALE
+	CSprite2d::DrawRect(CRect(0, 0, MENU_X_LEFT_ALIGNED(0.f), SCREEN_HEIGHT), CRGBA(0, 0, 0, alpha));
+	CSprite2d::DrawRect(CRect(MENU_X_RIGHT_ALIGNED(0.f), 0, SCREEN_WIDTH, SCREEN_HEIGHT), CRGBA(0, 0, 0, alpha));
+#endif
+
+	splash->Draw(CRect(MENU_X_LEFT_ALIGNED(0.f), 0, MENU_X_RIGHT_ALIGNED(0.f), SCREEN_HEIGHT), CRGBA(255, 255, 255, alpha));
+	if (alpha == 255 && exitSignalTimer == 150)
+		RsEventHandler(rsQUITAPP, nil);
+
+	m_bShowMouse = false;
+	m_AllowNavigation = false;
+}
+
+void
+CMenuManager::PrintMap(void)
+{
+	m_bMenuMapActive = true;
+	CRadar::InitFrontEndMap();
+
+	// Because m_fMapSize is half of the map length(hence * 2), and map consists of 3x3 tiles(hence / 3).
+	float halfTile = m_fMapSize * 2.f / 3.f / 2.f;
+
+	RwRenderStateSet(rwRENDERSTATETEXTUREFILTER, (void*)rwFILTERLINEAR);
+
+	if (SCREEN_WIDTH >= m_fMapCenterX - m_fMapSize || SCREEN_HEIGHT >= m_fMapCenterY - m_fMapSize) {
+		m_aFrontEndSprites[MENUSPRITE_MAPTOP01].Draw(CRect(m_fMapCenterX - m_fMapSize, m_fMapCenterY - m_fMapSize,
+			m_fMapCenterX - halfTile, m_fMapCenterY - halfTile), CRGBA(255, 255, 255, FadeIn(255)));
+	}
+
+	if (SCREEN_WIDTH >= m_fMapCenterX - halfTile || SCREEN_HEIGHT >= m_fMapCenterY - m_fMapSize) {
+		m_aFrontEndSprites[MENUSPRITE_MAPTOP02].Draw(CRect(m_fMapCenterX - halfTile, m_fMapCenterY - m_fMapSize,
+			m_fMapCenterX + halfTile, m_fMapCenterY - halfTile), CRGBA(255, 255, 255, FadeIn(255)));
+	}
+
+	if (SCREEN_WIDTH >= m_fMapCenterX + halfTile || SCREEN_HEIGHT >= m_fMapCenterY - m_fMapSize) {
+		m_aFrontEndSprites[MENUSPRITE_MAPTOP03].Draw(CRect(m_fMapCenterX + halfTile, m_fMapCenterY - m_fMapSize,
+			m_fMapCenterX + m_fMapSize, m_fMapCenterY - halfTile), CRGBA(255, 255, 255, FadeIn(255)));
+	}
+
+	if (SCREEN_WIDTH >= m_fMapCenterX - m_fMapSize || SCREEN_HEIGHT >= m_fMapCenterY - halfTile) {
+		m_aFrontEndSprites[MENUSPRITE_MAPMID01].Draw(CRect(m_fMapCenterX - m_fMapSize, m_fMapCenterY - halfTile,
+			m_fMapCenterX - halfTile, m_fMapCenterY + halfTile), CRGBA(255, 255, 255, FadeIn(255)));
+	}
+
+	if (SCREEN_WIDTH >= m_fMapCenterX - halfTile || SCREEN_HEIGHT >= m_fMapCenterY - halfTile) {
+		m_aFrontEndSprites[MENUSPRITE_MAPMID02].Draw(CRect(m_fMapCenterX - halfTile, m_fMapCenterY - halfTile,
+			m_fMapCenterX + halfTile, m_fMapCenterY + halfTile), CRGBA(255, 255, 255, FadeIn(255)));
+	}
+
+	if (SCREEN_WIDTH >= m_fMapCenterX + halfTile || SCREEN_HEIGHT >= m_fMapCenterY - halfTile) {
+		m_aFrontEndSprites[MENUSPRITE_MAPMID03].Draw(CRect(m_fMapCenterX + halfTile, m_fMapCenterY - halfTile,
+			m_fMapCenterX + m_fMapSize, m_fMapCenterY + halfTile), CRGBA(255, 255, 255, FadeIn(255)));
+	}
+
+	if (SCREEN_WIDTH >= m_fMapCenterX - m_fMapSize || SCREEN_HEIGHT >= m_fMapCenterY + halfTile) {
+		m_aFrontEndSprites[MENUSPRITE_MAPBOT01].Draw(CRect(m_fMapCenterX - m_fMapSize, m_fMapCenterY + halfTile,
+			m_fMapCenterX - halfTile, m_fMapCenterY + m_fMapSize), CRGBA(255, 255, 255, FadeIn(255)));
+	}
+
+	if (SCREEN_WIDTH >= m_fMapCenterX - halfTile || SCREEN_HEIGHT >= m_fMapCenterY + halfTile) {
+		m_aFrontEndSprites[MENUSPRITE_MAPBOT02].Draw(CRect(m_fMapCenterX - halfTile, m_fMapCenterY + halfTile,
+			m_fMapCenterX + halfTile, m_fMapCenterY + m_fMapSize), CRGBA(255, 255, 255, FadeIn(255)));
+	}
+
+	if (SCREEN_WIDTH >= m_fMapCenterX + halfTile || SCREEN_HEIGHT >= m_fMapCenterY + halfTile) {
+		m_aFrontEndSprites[MENUSPRITE_MAPBOT03].Draw(CRect(m_fMapCenterX + halfTile, m_fMapCenterY + halfTile,
+			m_fMapCenterX + m_fMapSize, m_fMapCenterY + m_fMapSize), CRGBA(255, 255, 255, FadeIn(255)));
+	}
+
+	CRadar::DrawBlips();
+	if (m_PrefsShowLegends) {
+		CFont::SetWrapx(MENU_X_RIGHT_ALIGNED(40.0f));
+		CFont::SetRightJustifyWrap(MENU_X_LEFT_ALIGNED(84.0f));
+		CFont::SetBackGroundOnlyTextOff();
+		CFont::SetColor(CRGBA(LABEL_COLOR.r, LABEL_COLOR.g, LABEL_COLOR.b, FadeIn(255)));
+		CFont::SetDropShadowPosition(2);
+		CFont::SetDropColor(CRGBA(0, 0, 0, FadeIn(255)));
+		CFont::SetCentreOn();
+		CFont::SetFontStyle(FONT_LOCALE(FONT_HEADING));
+		CFont::SetScale(SCREEN_SCALE_X(0.65f), SCREEN_SCALE_Y(0.95f));
+
+		int secondColumnStart = (CRadar::MapLegendCounter - 1) / 2;
+		int boxBottom = MENU_Y(100.0f);
+
+		// + 3, because we want 19*3 px padding
+		for (int i = 0; i < secondColumnStart + 3; i++) {
+			boxBottom += MENU_Y(19.f);
+		}
+
+		CSprite2d::DrawRect(CRect(MENU_X_LEFT_ALIGNED(95.0f), MENU_Y(100.0f), MENU_X_LEFT_ALIGNED(555.f), boxBottom),
+			CRGBA(0, 0, 0, FadeIn(190)));
+
+		CFont::PrintString(MENU_X_LEFT_ALIGNED(320.0f), MENU_Y(102.0f), TheText.Get("FE_MLG"));
+		CFont::SetRightJustifyOff();
+		CFont::SetFontStyle(FONT_LOCALE(FONT_STANDARD));
+		if (m_PrefsLanguage == LANGUAGE_AMERICAN)
+			CFont::SetScale(SCREEN_SCALE_X(0.55f), SCREEN_SCALE_Y(0.55f));
+		else
+			CFont::SetScale(SCREEN_SCALE_X(0.45f), SCREEN_SCALE_Y(0.55f));
+
+		CFont::SetColor(CRGBA(225, 225, 225, FadeIn(255)));
+		CFont::SetDropShadowPosition(0);
+
+		int y = MENU_Y(127.0f);
+		int x = MENU_X_LEFT_ALIGNED(160.0f);
+
+		for (int16 i = 0; i < CRadar::MapLegendCounter; i++) {
+			CRadar::DrawLegend(x, y, CRadar::MapLegendList[i]);
+
+			if (i == secondColumnStart) {
+				x = MENU_X_LEFT_ALIGNED(350.0f);
+				y = MENU_Y(127.0f);
+			} else {
+				y += MENU_Y(19.0f);
+			}
+		}
+	}
+
+#ifdef MAP_ENHANCEMENTS
+	if (m_nMenuFadeAlpha != 255 && !m_bShowMouse) {
+		mapCrosshair.x = SCREEN_WIDTH / 2;
+		mapCrosshair.y = SCREEN_HEIGHT / 2;
+	} else if (m_bShowMouse) {
+		mapCrosshair.x = m_nMousePosX;
+		mapCrosshair.y = m_nMousePosY;
+	}
+
+	CSprite2d::DrawRect(CRect(mapCrosshair.x - MENU_X(1.0f), 0.0f,
+		mapCrosshair.x + MENU_X(1.0f), SCREEN_HEIGHT),
+		CRGBA(0, 0, 0, 150));
+	CSprite2d::DrawRect(CRect(0.0f, mapCrosshair.y + MENU_X(1.0f),
+		SCREEN_WIDTH, mapCrosshair.y - MENU_X(1.0f)),
+		CRGBA(0, 0, 0, 150));
+
+#endif
+	m_bMenuMapActive = false;
+
+	CFont::SetWrapx(MENU_X_RIGHT_ALIGNED(MENU_X_MARGIN));
+	CFont::SetRightJustifyWrap(MENU_X_LEFT_ALIGNED(MENU_X_MARGIN));
+	DisplayHelperText("FEH_MPH");
+}
+
+void
+CMenuManager::ChangeRadioStation(int8 increaseBy)
+{
+	if (m_ScrollRadioBy != 0)
+		return;
+
+	m_PrefsRadioStation += increaseBy;
+	m_ScrollRadioBy = increaseBy;
+	if (m_ScrollRadioBy == 1) {
+		DMAudio.PlayFrontEndSound(SOUND_FRONTEND_ENTER_OR_ADJUST, 0);
+		m_LeftMostRadioX = MENU_X_LEFT_ALIGNED(MENURADIO_ICON_FIRST_X);
+	} else {
+		DMAudio.PlayFrontEndSound(SOUND_FRONTEND_ENTER_OR_ADJUST, 0);
+		m_LeftMostRadioX = MENU_X_LEFT_ALIGNED(MENURADIO_ICON_FIRST_X - (2 * MENURADIO_ICON_SIZE));
+	}
+
+	if (DMAudio.IsMP3RadioChannelAvailable()) {
+		if (m_PrefsRadioStation < WILDSTYLE)
+			m_PrefsRadioStation = USERTRACK;
+		if (m_PrefsRadioStation > USERTRACK)
+			m_PrefsRadioStation = WILDSTYLE;
+	} else {
+		if (m_PrefsRadioStation < WILDSTYLE)
+			m_PrefsRadioStation = WAVE;
+		if (m_PrefsRadioStation > WAVE)
+			m_PrefsRadioStation = WILDSTYLE;
+	}
+	DMAudio.StopFrontEndTrack();
+	DMAudio.PlayFrontEndSound(SOUND_RADIO_CHANGE, 0);
+}
+
+#if 0
+uint8 CMenuManager::GetNumberOfMenuOptions()
+{
+	uint8 Rows = -1;
+	for (int i = 0; i < NUM_MENUROWS; i++) {
+		if (aScreens[m_nCurrScreen].m_aEntries[i].m_Action == MENUACTION_NOTHING)
+			break;
+
+		++Rows;
+	}
+	return Rows;
+}
+#endif
+
+#ifdef GAMEPAD_MENU
+const char* controllerTypesPaths[] = {
+	"MODELS/FRONTEND_DS2.TXD",
+	"MODELS/FRONTEND_DS3.TXD",
+	"MODELS/FRONTEND_DS4.TXD",
+	"MODELS/FRONTEND_X360.TXD",
+	"MODELS/FRONTEND_XONE.TXD",
+};
+
+void
+CMenuManager::PrintController(void)
+{
+	// Don't print anything if controller texture is missing
+	if (!m_aFrontEndSprites[MENUSPRITE_CONTROLLER].m_pTexture) return;
+
+	const float scale = 0.9f;
+	const float CONTROLLER_SIZE_X = 235.2f;
+	const float CONTROLLER_SIZE_Y = 175.2f;
+	const float CONTROLLER_POS_X = (DEFAULT_SCREEN_WIDTH - CONTROLLER_SIZE_X) / 2.0f;
+	const float CONTROLLER_POS_Y = 220.0f;
+
+	float centerX = CONTROLLER_POS_X + CONTROLLER_SIZE_X / 2;
+	float centerY = CONTROLLER_POS_Y + CONTROLLER_SIZE_Y / 2;
+
+#define X(f) ((f)*scale + centerX)
+#define Y(f) ((f)*scale + centerY)
+
+	m_aFrontEndSprites[MENUSPRITE_CONTROLLER].Draw(MENU_X_LEFT_ALIGNED(X(-CONTROLLER_SIZE_X / 2)), MENU_Y(Y(-CONTROLLER_SIZE_Y / 2)), MENU_X(CONTROLLER_SIZE_X * scale), MENU_Y(CONTROLLER_SIZE_Y * scale), CRGBA(255, 255, 255, FadeIn(255)));
+	if (m_DisplayControllerOnFoot) {
+		if ((int)CTimer::GetTimeInMillisecondsPauseMode() & 0x400)
+			m_aFrontEndSprites[MENUSPRITE_ARROWS1].Draw(MENU_X_LEFT_ALIGNED(X(-CONTROLLER_SIZE_X / 2)), MENU_Y(Y(-CONTROLLER_SIZE_Y / 2)), MENU_X(CONTROLLER_SIZE_X * scale), MENU_Y(CONTROLLER_SIZE_Y * scale), CRGBA(255, 255, 255, FadeIn(255)));
+		else
+			m_aFrontEndSprites[MENUSPRITE_ARROWS3].Draw(MENU_X_LEFT_ALIGNED(X(-CONTROLLER_SIZE_X / 2)), MENU_Y(Y(-CONTROLLER_SIZE_Y / 2)), MENU_X(CONTROLLER_SIZE_X * scale), MENU_Y(CONTROLLER_SIZE_Y * scale), CRGBA(255, 255, 255, FadeIn(255)));
+	}
+	else {
+		if ((int)CTimer::GetTimeInMillisecondsPauseMode() & 0x400)
+			m_aFrontEndSprites[MENUSPRITE_ARROWS2].Draw(MENU_X_LEFT_ALIGNED(X(-CONTROLLER_SIZE_X / 2)), MENU_Y(Y(-CONTROLLER_SIZE_Y / 2)), MENU_X(CONTROLLER_SIZE_X * scale), MENU_Y(CONTROLLER_SIZE_Y * scale), CRGBA(255, 255, 255, FadeIn(255)));
+		else
+			m_aFrontEndSprites[MENUSPRITE_ARROWS4].Draw(MENU_X_LEFT_ALIGNED(X(-CONTROLLER_SIZE_X / 2)), MENU_Y(Y(-CONTROLLER_SIZE_Y / 2)), MENU_X(CONTROLLER_SIZE_X * scale), MENU_Y(CONTROLLER_SIZE_Y * scale), CRGBA(255, 255, 255, FadeIn(255)));
+	}
+
+	CFont::SetFontStyle(FONT_LOCALE(FONT_STANDARD));
+
+	CFont::SetScale(MENU_X(SMALLESTTEXT_X_SCALE * 2 * scale * 0.9f), MENU_Y(SMALLESTTEXT_Y_SCALE * scale * 0.9f)); // X
+
+	CFont::SetDropColor(CRGBA(0, 0, 0, FadeIn(255)));
+	CFont::SetDropShadowPosition(0);
+	CFont::SetColor(CRGBA(0, 0, 0, FadeIn(255)));
+	CFont::SetWrapx(SCREEN_WIDTH);
+
+	float TEXT_L2_X = 85.0f + CONTROLLER_POS_X - centerX, TEXT_L2_Y = -14.0f + CONTROLLER_POS_Y - centerY;
+	float TEXT_L1_X = -4.0f + CONTROLLER_POS_X - centerX, TEXT_L1_Y = 27.0f + CONTROLLER_POS_Y - centerY, TEXT_L1_Y_VEH = 3.0f + TEXT_L1_Y;
+	float TEXT_DPAD_X = -4.0f + CONTROLLER_POS_X - centerX, TEXT_DPAD_Y = 67.0f + CONTROLLER_POS_Y - centerY;
+	float TEXT_LSTICK_X = -4.0f + CONTROLLER_POS_X - centerX, TEXT_LSTICK_Y = 97.0f + CONTROLLER_POS_Y - centerY;
+	float TEXT_SELECT_X = 170.0f + CONTROLLER_POS_X - centerX, TEXT_SELECT_Y = 141.0f + CONTROLLER_POS_Y - centerY;
+	float TEXT_START_X = 130.0f + CONTROLLER_POS_X - centerX, TEXT_START_Y = 128.0f + CONTROLLER_POS_Y - centerY;
+	float TEXT_R2_X = 164.0f + CONTROLLER_POS_X - centerX, TEXT_R2_Y = -14.0f + CONTROLLER_POS_Y - centerY;
+	float TEXT_R1_X = 242.0f + CONTROLLER_POS_X - centerX, TEXT_R1_Y = 27.0f + CONTROLLER_POS_Y - centerY;
+
+	float TEXT_SQUARE_X = 147.0f + CONTROLLER_POS_X - centerX, TEXT_SQUARE_Y = 30.0f + CONTROLLER_POS_Y - centerY;
+	float TEXT_TRIANGLE_X = 242.0f + CONTROLLER_POS_X - centerX, TEXT_TRIANGLE_Y = 55.0f + CONTROLLER_POS_Y - centerY;
+	float TEXT_CIRCLE_X = 242.0f + CONTROLLER_POS_X - centerX, TEXT_CIRCLE_Y = 67.0f + CONTROLLER_POS_Y - centerY;
+	float TEXT_CROSS_X = 242.0f + CONTROLLER_POS_X - centerX, TEXT_CROSS_Y = 80.0f + CONTROLLER_POS_Y - centerY;
+	float TEXT_RSTICK_X = 242.0f + CONTROLLER_POS_X - centerX, TEXT_RSTICK_Y = 97.0f + CONTROLLER_POS_Y - centerY;
+	float TEXT_R3_X = 242.0f + CONTROLLER_POS_X - centerX, TEXT_R3_Y = 110.0f + CONTROLLER_POS_Y - centerY;
+	float TEXT_L3_X = 94.0f + CONTROLLER_POS_X - centerX, TEXT_L3_Y = 162.0f + CONTROLLER_POS_Y - centerY;
+	float TEXT_L2R2_X = 120.0f + CONTROLLER_POS_X - centerX, TEXT_L2R2_Y = -4.0f + CONTROLLER_POS_Y - centerY;
+
+	switch (m_PrefsControllerType)
+	{
+	case CONTROLLER_DUALSHOCK4:
+		TEXT_L1_Y += 7.0f;
+		TEXT_L1_Y_VEH = TEXT_L1_Y;
+		TEXT_R1_Y += 7.0f;
+		TEXT_TRIANGLE_Y -= 1.0f;
+		TEXT_CIRCLE_Y -= 1.0f;
+		TEXT_CROSS_Y -= 1.0f;
+		TEXT_RSTICK_Y -= 4.0f;
+		TEXT_R3_Y -= 4.0f;
+		TEXT_DPAD_Y -= 2.0f;
+		TEXT_LSTICK_Y -= 6.0f;
+		TEXT_L3_X -= 2.0f;
+		break;
+	case CONTROLLER_XBOXONE:
+		TEXT_L2_X -= 2.0f;
+		TEXT_R2_X += 2.0f;
+		TEXT_L1_Y += 15.0f;
+		TEXT_L1_Y_VEH = TEXT_L1_Y;
+		TEXT_R1_Y += 15.0f;
+		TEXT_TRIANGLE_Y += 4.0f;
+		TEXT_CIRCLE_Y += 4.0f;
+		TEXT_CROSS_Y += 4.0f;
+		TEXT_RSTICK_Y += 1.0f;
+		TEXT_R3_Y += 1.0f;
+		TEXT_DPAD_Y += 29.0f;
+		TEXT_LSTICK_Y -= 20.0f;
+		TEXT_L3_X -= 36.0f;
+		TEXT_L2R2_Y += 5.0f;
+		TEXT_SELECT_X += 4.0f;
+		break;
+	case CONTROLLER_XBOX360:
+		TEXT_L2_X += 8.0f;
+		TEXT_R2_X -= 8.0f;
+		TEXT_L1_Y += 15.0f;
+		TEXT_L1_Y_VEH = TEXT_L1_Y;
+		TEXT_R1_Y += 15.0f;
+		TEXT_TRIANGLE_Y += 4.0f;
+		TEXT_CIRCLE_Y += 4.0f;
+		TEXT_CROSS_Y += 4.0f;
+		TEXT_RSTICK_Y += 4.0f;
+		TEXT_R3_Y += 4.0f;
+		TEXT_DPAD_Y += 30.0f;
+		TEXT_LSTICK_Y -= 19.0f;
+		TEXT_L3_X -= 36.0f;
+		TEXT_L2R2_Y += 5.0f;
+		TEXT_SELECT_X += 3.0f;
+		break;
+	};
+
+	if (m_DisplayControllerOnFoot) {
+		switch (CPad::GetPad(0)->Mode) {
+		case 0:
+			CFont::SetRightJustifyOn();
+			switch (m_PrefsLanguage)
+			{
+			case LANGUAGE_FRENCH:
+			case LANGUAGE_SPANISH:
+				TEXT_L2_X -= 45.0f;
+				CFont::SetRightJustifyWrap(MENU_X_LEFT_ALIGNED(X(TEXT_L1_X)) - SCREEN_SCALE_X(85));
+				break;
+			default:
+				CFont::SetRightJustifyWrap(0);
+				break;
+			}
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_L2_X)), MENU_Y(Y(TEXT_L2_Y)), TheText.Get("FEC_CWL"));
+			CFont::SetRightJustifyWrap(0);
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_L1_X)), MENU_Y(Y(TEXT_L1_Y)), TheText.Get("FEC_LOF"));
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_DPAD_X)), MENU_Y(Y(TEXT_DPAD_Y)), TheText.Get("FEC_MOV"));
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_LSTICK_X)), MENU_Y(Y(TEXT_LSTICK_Y)), TheText.Get("FEC_MOV"));
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_LSTICK_X)), MENU_Y(Y(TEXT_R3_Y)), TheText.Get("FEC_CR3"));
+			CFont::SetRightJustifyOn();
+			switch (m_PrefsLanguage)
+			{
+			case LANGUAGE_GERMAN:
+				TEXT_SELECT_X += 20.0f;
+				break;
+			case LANGUAGE_SPANISH:
+				TEXT_SELECT_X += 15.0f;
+				break;
+			default:
+				break;
+			}
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_SELECT_X)), MENU_Y(Y(TEXT_SELECT_Y)), TheText.Get("FEC_CAM"));
+			CFont::SetJustifyOn();
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_START_X)), MENU_Y(Y(TEXT_START_Y)), TheText.Get("FEC_PAU"));
+			switch (m_PrefsLanguage)
+			{
+			case LANGUAGE_FRENCH:
+			case LANGUAGE_SPANISH:
+				TEXT_R2_X += 30.0f;
+				CFont::SetJustifyOff();
+				CFont::SetWrapx(MENU_X_LEFT_ALIGNED(X(TEXT_R2_X)) + SCREEN_SCALE_X(120));
+				break;
+			default:
+				break;
+			}
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_R2_X)), MENU_Y(Y(TEXT_R2_Y)), TheText.Get("FEC_CWR"));
+			CFont::SetJustifyOn();
+			CFont::SetWrapx(SCREEN_WIDTH);
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_R1_X)), MENU_Y(Y(TEXT_R1_Y)), TheText.Get("FEC_TAR"));
+			CFont::SetRightJustifyOn();
+			CFont::PrintStringFromBottom(MENU_X_LEFT_ALIGNED(X(TEXT_SQUARE_X)), MENU_Y(Y(TEXT_SQUARE_Y)), TheText.Get("FEC_JUM"));
+			CFont::SetJustifyOn();
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_TRIANGLE_X)), MENU_Y(Y(TEXT_TRIANGLE_Y)), TheText.Get("FEC_ENV"));
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_CIRCLE_X)), MENU_Y(Y(TEXT_CIRCLE_Y)), TheText.Get("FEC_ATT"));
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_CROSS_X)), MENU_Y(Y(TEXT_CROSS_Y)), TheText.Get("FEC_RUN"));
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_RSTICK_X)), MENU_Y(Y(TEXT_RSTICK_Y)), TheText.Get("FEC_FPC"));
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_R3_X)), MENU_Y(Y(TEXT_R3_Y)), TheText.Get("FEC_LB3"));
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_R3_X)), MENU_Y(Y(TEXT_R3_Y + 13.0f)), TheText.Get("FEC_R3"));
+			break;
+		case 1:
+			CFont::SetRightJustifyOn();
+			switch (m_PrefsLanguage)
+			{
+			case LANGUAGE_FRENCH:
+			case LANGUAGE_SPANISH:
+				TEXT_L2_X -= 45.0f;
+				CFont::SetRightJustifyWrap(MENU_X_LEFT_ALIGNED(X(TEXT_L1_X)) - SCREEN_SCALE_X(85));
+				break;
+			default:
+				CFont::SetRightJustifyWrap(0);
+				break;
+			}
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_L2_X)), MENU_Y(Y(TEXT_L2_Y)), TheText.Get("FEC_CWL"));
+			CFont::SetRightJustifyWrap(0);
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_L1_X)), MENU_Y(Y(TEXT_L1_Y)), TheText.Get("FEC_LOF"));
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_DPAD_X)), MENU_Y(Y(TEXT_DPAD_Y)), TheText.Get("FEC_CAM"));
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_LSTICK_X)), MENU_Y(Y(TEXT_LSTICK_Y)), TheText.Get("FEC_MOV"));
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_LSTICK_X)), MENU_Y(Y(TEXT_R3_Y)), TheText.Get("FEC_CR3"));
+			switch (m_PrefsLanguage)
+			{
+			case LANGUAGE_GERMAN:
+				CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_SELECT_X)), MENU_Y(Y(TEXT_SELECT_Y)), TheText.Get("FEC_NA"));
+				break;
+			default:
+				CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_SELECT_X - 50)), MENU_Y(Y(TEXT_SELECT_Y)), TheText.Get("FEC_NA"));
+				break;
+			}
+			CFont::SetJustifyOn();
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_START_X)), MENU_Y(Y(TEXT_START_Y)), TheText.Get("FEC_PAU"));
+			switch (m_PrefsLanguage)
+			{
+			case LANGUAGE_FRENCH:
+			case LANGUAGE_SPANISH:
+				TEXT_R2_X += 30.0f;
+				CFont::SetJustifyOff();
+				CFont::SetWrapx(MENU_X_LEFT_ALIGNED(X(TEXT_R2_X)) + SCREEN_SCALE_X(120));
+				break;
+			default:
+				break;
+			}
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_R2_X)), MENU_Y(Y(TEXT_R2_Y)), TheText.Get("FEC_CWR"));
+			CFont::SetJustifyOn();
+			CFont::SetWrapx(SCREEN_WIDTH);
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_R1_X)), MENU_Y(Y(TEXT_R1_Y)), TheText.Get("FEC_TAR"));
+			CFont::SetRightJustifyOn();
+			CFont::PrintStringFromBottom(MENU_X_LEFT_ALIGNED(X(TEXT_SQUARE_X)), MENU_Y(Y(TEXT_SQUARE_Y)), TheText.Get("FEC_JUM"));
+			CFont::SetJustifyOn();
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_TRIANGLE_X)), MENU_Y(Y(TEXT_TRIANGLE_Y)), TheText.Get("FEC_ENV"));
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_CIRCLE_X)), MENU_Y(Y(TEXT_CIRCLE_Y)), TheText.Get("FEC_ATT"));
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_CROSS_X)), MENU_Y(Y(TEXT_CROSS_Y)), TheText.Get("FEC_RUN"));
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_RSTICK_X)), MENU_Y(Y(TEXT_RSTICK_Y)), TheText.Get("FEC_FPC"));
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_R3_X)), MENU_Y(Y(TEXT_R3_Y)), TheText.Get("FEC_LB3"));
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_R3_X)), MENU_Y(Y(TEXT_R3_Y + 13.0f)), TheText.Get("FEC_R3"));
+			break;
+		case 2:
+			CFont::SetRightJustifyOn();
+			switch (m_PrefsLanguage)
+			{
+			case LANGUAGE_FRENCH:
+			case LANGUAGE_SPANISH:
+				TEXT_L2_X -= 45.0f;
+				CFont::SetRightJustifyWrap(MENU_X_LEFT_ALIGNED(X(TEXT_L1_X)) - SCREEN_SCALE_X(85));
+				break;
+			default:
+				CFont::SetRightJustifyWrap(0);
+				break;
+			}
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_L2_X)), MENU_Y(Y(TEXT_L2_Y)), TheText.Get("FEC_CWL"));
+			CFont::SetRightJustifyWrap(0);
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_L1_X)), MENU_Y(Y(TEXT_L1_Y)), TheText.Get("FEC_ENV"));
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_DPAD_X)), MENU_Y(Y(TEXT_DPAD_Y)), TheText.Get("FEC_MOV"));
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_LSTICK_X)), MENU_Y(Y(TEXT_LSTICK_Y)), TheText.Get("FEC_MOV"));
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_LSTICK_X)), MENU_Y(Y(TEXT_R3_Y)), TheText.Get("FEC_CR3"));
+			CFont::SetRightJustifyOn();
+			switch (m_PrefsLanguage)
+			{
+			case LANGUAGE_GERMAN:
+				TEXT_SELECT_X += 20.0f;
+				break;
+			case LANGUAGE_SPANISH:
+				TEXT_SELECT_X += 15.0f;
+				break;
+			default:
+				break;
+			}
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_SELECT_X)), MENU_Y(Y(TEXT_SELECT_Y)), TheText.Get("FEC_CAM"));
+			CFont::SetJustifyOn();
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_START_X)), MENU_Y(Y(TEXT_START_Y)), TheText.Get("FEC_PAU"));
+			switch (m_PrefsLanguage)
+			{
+			case LANGUAGE_FRENCH:
+			case LANGUAGE_SPANISH:
+				TEXT_R2_X += 30.0f;
+				CFont::SetJustifyOff();
+				CFont::SetWrapx(MENU_X_LEFT_ALIGNED(X(TEXT_R2_X)) + SCREEN_SCALE_X(120));
+				break;
+			default:
+				break;
+			}
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_R2_X)), MENU_Y(Y(TEXT_R2_Y)), TheText.Get("FEC_CWR"));
+			CFont::SetJustifyOn();
+			CFont::SetWrapx(SCREEN_WIDTH);
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_R1_X)), MENU_Y(Y(TEXT_R1_Y)), TheText.Get("FEC_TAR"));
+			CFont::SetRightJustifyOn();
+			CFont::PrintStringFromBottom(MENU_X_LEFT_ALIGNED(X(TEXT_SQUARE_X)), MENU_Y(Y(TEXT_SQUARE_Y)), TheText.Get("FEC_JUM"));
+			CFont::SetJustifyOn();
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_TRIANGLE_X)), MENU_Y(Y(TEXT_TRIANGLE_Y)), TheText.Get("FEC_LOF"));
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_CIRCLE_X)), MENU_Y(Y(TEXT_CIRCLE_Y)), TheText.Get("FEC_RUN"));
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_CROSS_X)), MENU_Y(Y(TEXT_CROSS_Y)), TheText.Get("FEC_ATT"));
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_RSTICK_X)), MENU_Y(Y(TEXT_RSTICK_Y)), TheText.Get("FEC_FPC"));
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_R3_X)), MENU_Y(Y(TEXT_R3_Y)), TheText.Get("FEC_LB3"));
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_R3_X)), MENU_Y(Y(TEXT_R3_Y + 13.0f)), TheText.Get("FEC_R3"));
+			break;
+		case 3:
+			CFont::SetRightJustifyOn();
+			switch (m_PrefsLanguage)
+			{
+			case LANGUAGE_FRENCH:
+			case LANGUAGE_SPANISH:
+				TEXT_L2_X -= 45.0f;
+				CFont::SetRightJustifyWrap(MENU_X_LEFT_ALIGNED(X(TEXT_L1_X)) - SCREEN_SCALE_X(85));
+				break;
+			default:
+				CFont::SetRightJustifyWrap(0);
+				break;
+			}
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_L2_X)), MENU_Y(Y(TEXT_L2_Y)), TheText.Get("FEC_CWL"));
+			CFont::SetRightJustifyWrap(0);
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_L1_X)), MENU_Y(Y(TEXT_L1_Y)), TheText.Get("FEC_TAR"));
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_DPAD_X)), MENU_Y(Y(TEXT_DPAD_Y)), TheText.Get("FEC_NA"));
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_LSTICK_X)), MENU_Y(Y(TEXT_LSTICK_Y)), TheText.Get("FEC_MOV"));
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_LSTICK_X)), MENU_Y(Y(TEXT_R3_Y)), TheText.Get("FEC_CR3"));
+			CFont::SetRightJustifyOn();
+			switch (m_PrefsLanguage)
+			{
+			case LANGUAGE_GERMAN:
+				TEXT_SELECT_X += 20.0f;
+				break;
+			case LANGUAGE_SPANISH:
+				TEXT_SELECT_X += 15.0f;
+				break;
+			default:
+				break;
+			}
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_SELECT_X)), MENU_Y(Y(TEXT_SELECT_Y)), TheText.Get("FEC_CAM"));
+			CFont::SetJustifyOn();
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_START_X)), MENU_Y(Y(TEXT_START_Y)), TheText.Get("FEC_PAU"));
+			switch (m_PrefsLanguage)
+			{
+			case LANGUAGE_FRENCH:
+			case LANGUAGE_SPANISH:
+				TEXT_R2_X += 30.0f;
+				CFont::SetJustifyOff();
+				CFont::SetWrapx(MENU_X_LEFT_ALIGNED(X(TEXT_R2_X)) + SCREEN_SCALE_X(120));
+				break;
+			default:
+				break;
+			}
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_R2_X)), MENU_Y(Y(TEXT_R2_Y)), TheText.Get("FEC_CWR"));
+			CFont::SetJustifyOn();
+			CFont::SetWrapx(SCREEN_WIDTH);
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_R1_X)), MENU_Y(Y(TEXT_R1_Y)), TheText.Get("FEC_ATT"));
+			CFont::SetRightJustifyOn();
+			CFont::PrintStringFromBottom(MENU_X_LEFT_ALIGNED(X(TEXT_SQUARE_X)), MENU_Y(Y(TEXT_SQUARE_Y)), TheText.Get("FEC_JUM"));
+			CFont::SetJustifyOn();
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_TRIANGLE_X)), MENU_Y(Y(TEXT_TRIANGLE_Y)), TheText.Get("FEC_ENV"));
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_CIRCLE_X)), MENU_Y(Y(TEXT_CIRCLE_Y)), TheText.Get("FEC_LOF"));
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_CROSS_X)), MENU_Y(Y(TEXT_CROSS_Y)), TheText.Get("FEC_RUN"));
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_RSTICK_X)), MENU_Y(Y(TEXT_RSTICK_Y)), TheText.Get("FEC_FPC"));
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_R3_X)), MENU_Y(Y(TEXT_R3_Y)), TheText.Get("FEC_LB3"));
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_R3_X)), MENU_Y(Y(TEXT_R3_Y + 13.0f)), TheText.Get("FEC_R3"));
+			break;
+		default:
+			return;
+		}
+	}
+	else {
+		CFont::SetCentreOn();
+		switch (m_PrefsLanguage)
+		{
+		case LANGUAGE_ITALIAN:
+			if (m_PrefsControllerType != CONTROLLER_XBOX360)
+				break;
+		case LANGUAGE_FRENCH:
+		case LANGUAGE_GERMAN:
+			CFont::SetScale(MENU_X(SMALLESTTEXT_X_SCALE * 2 * scale * 0.65f), MENU_Y(SMALLESTTEXT_Y_SCALE * scale * 0.65f));
+			break;
+		default:
+			break;
+		}
+		CFont::PrintString(MENU_X_LEFT_ALIGNED(X(0.0f)), MENU_Y(Y(TEXT_L2R2_Y)), TheText.Get("FEC_LB"));
+		CFont::SetScale(MENU_X(SMALLESTTEXT_X_SCALE * 2 * scale * 0.9f), MENU_Y(SMALLESTTEXT_Y_SCALE* scale * 0.9f));
+		switch (CPad::GetPad(0)->Mode) {
+		case 0:
+			CFont::SetRightJustifyOn();
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_L2_X)), MENU_Y(Y(TEXT_L2_Y)), TheText.Get("FEC_LL"));
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_L1_X)), MENU_Y(Y(TEXT_L1_Y_VEH)), TheText.Get("FEC_RSC"));
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_DPAD_X)), MENU_Y(Y(TEXT_DPAD_Y)), TheText.Get("FEC_VES"));
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_LSTICK_X)), MENU_Y(Y(TEXT_LSTICK_Y)), TheText.Get("FEC_VES"));
+			CFont::SetRightJustifyOn();
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_L3_X)), MENU_Y(Y(TEXT_L3_Y)), TheText.Get("FEC_HO3"));
+			switch (m_PrefsLanguage)
+			{
+			case LANGUAGE_FRENCH:
+				TEXT_SELECT_X -= 5.0f;
+				break;
+			case LANGUAGE_GERMAN:
+				TEXT_SELECT_X += 20.0f;
+				break;
+			case LANGUAGE_SPANISH:
+				TEXT_SELECT_X += 15.0f;
+				break;
+			default:
+				break;
+			}
+			CFont::SetRightJustifyWrap(MENU_X_LEFT_ALIGNED(X(TEXT_SELECT_X)) - SCREEN_SCALE_X(80));
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_SELECT_X)), MENU_Y(Y(TEXT_SELECT_Y)), TheText.Get("FEC_CAM"));
+			CFont::SetJustifyOn();
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_START_X)), MENU_Y(Y(TEXT_START_Y)), TheText.Get("FEC_PAU"));
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_R2_X)), MENU_Y(Y(TEXT_R2_Y)), TheText.Get("FEC_LR"));
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_R1_X)), MENU_Y(Y(TEXT_R1_Y)), TheText.Get("FEC_HAB"));
+			CFont::SetJustifyOn();
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_TRIANGLE_X)), MENU_Y(Y(TEXT_TRIANGLE_Y)), TheText.Get("FEC_EXV"));
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_CIRCLE_X)), MENU_Y(Y(TEXT_CIRCLE_Y)), TheText.Get("FEC_CAW"));
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_CROSS_X)), MENU_Y(Y(TEXT_CROSS_Y)), TheText.Get("FEC_ACC"));
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_RSTICK_X)), MENU_Y(Y(TEXT_RSTICK_Y)), TheText.Get("FEC_TUC"));
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_R3_X)), MENU_Y(Y(TEXT_R3_Y)), TheText.Get("FEC_SM3"));
+			CFont::SetRightJustifyOn();
+			switch (m_PrefsControllerType)
+			{
+			case CONTROLLER_XBOXONE:
+			case CONTROLLER_XBOX360:
+				CFont::SetScale(MENU_X(SMALLESTTEXT_X_SCALE * 2 * scale * 0.65f), MENU_Y(SMALLESTTEXT_Y_SCALE * scale * 0.65f));
+				switch (m_PrefsLanguage)
+				{
+				case LANGUAGE_FRENCH:
+					TEXT_SQUARE_X += 3.0f;
+					CFont::SetRightJustifyWrap(MENU_X_LEFT_ALIGNED(X(TEXT_SQUARE_X)) - SCREEN_SCALE_X(90));
+					break;
+				case LANGUAGE_GERMAN:
+				case LANGUAGE_SPANISH:
+					TEXT_SQUARE_X += 18.0f;
+					CFont::SetRightJustifyWrap(MENU_X_LEFT_ALIGNED(X(TEXT_SQUARE_X)) - SCREEN_SCALE_X(90));
+					break;
+				default:
+					CFont::SetRightJustifyWrap(MENU_X_LEFT_ALIGNED(X(TEXT_SQUARE_X)) - SCREEN_SCALE_X(60));
+					break;
+				}
+				break;
+			default:
+				switch (m_PrefsLanguage)
+				{
+				case LANGUAGE_FRENCH:
+					TEXT_SQUARE_X -= 15.0f;
+					TEXT_SQUARE_Y += 5.0f;
+					CFont::SetScale(MENU_X(SMALLESTTEXT_X_SCALE * 2 * scale * 0.65f), MENU_Y(SMALLESTTEXT_Y_SCALE * scale * 0.65f));
+					CFont::SetRightJustifyWrap(MENU_X_LEFT_ALIGNED(X(TEXT_SQUARE_X)) - SCREEN_SCALE_X(60));
+					break;
+				case LANGUAGE_GERMAN:
+					TEXT_SQUARE_X -= 15.0f;
+					TEXT_SQUARE_Y += 10.0f;
+					CFont::SetScale(MENU_X(SMALLESTTEXT_X_SCALE * 2 * scale * 0.65f), MENU_Y(SMALLESTTEXT_Y_SCALE* scale * 0.65f));
+					CFont::SetRightJustifyWrap(MENU_X_LEFT_ALIGNED(X(TEXT_SQUARE_X)) - SCREEN_SCALE_X(60));
+					break;
+				case LANGUAGE_SPANISH:
+					TEXT_SQUARE_X += 15.0f;
+				case LANGUAGE_ITALIAN:
+					CFont::SetScale(MENU_X(SMALLESTTEXT_X_SCALE * 2 * scale * 0.65f), MENU_Y(SMALLESTTEXT_Y_SCALE * scale * 0.65f));
+				default:
+					CFont::SetRightJustifyWrap(MENU_X_LEFT_ALIGNED(X(TEXT_SQUARE_X)) - SCREEN_SCALE_X(100));
+					break;
+				}
+				break;
+			}
+			CFont::PrintStringFromBottom(MENU_X_LEFT_ALIGNED(X(TEXT_SQUARE_X)), MENU_Y(Y(TEXT_SQUARE_Y)), TheText.Get("FEC_BRA"));
+			break;
+		case 1:
+			CFont::SetRightJustifyOn();
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_L2_X)), MENU_Y(Y(TEXT_L2_Y)), TheText.Get("FEC_LL"));
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_L1_X)), MENU_Y(Y(TEXT_L1_Y_VEH)), TheText.Get("FEC_HOR"));
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_DPAD_X)), MENU_Y(Y(TEXT_DPAD_Y)), TheText.Get("FEC_CAM"));
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_LSTICK_X)), MENU_Y(Y(TEXT_LSTICK_Y)), TheText.Get("FEC_VES"));
+			CFont::SetRightJustifyOn();
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_L3_X)), MENU_Y(Y(TEXT_L3_Y)), TheText.Get("FEC_NA"));
+			switch (m_PrefsLanguage)
+			{
+			case LANGUAGE_GERMAN:
+				TEXT_SELECT_X += 20.0f;
+				break;
+			case LANGUAGE_SPANISH:
+				TEXT_SELECT_X += 12.0f;
+				break;
+			default:
+				break;
+			}
+			CFont::SetRightJustifyWrap(MENU_X_LEFT_ALIGNED(X(TEXT_SELECT_X)) - SCREEN_SCALE_X(80));
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_SELECT_X)), MENU_Y(Y(TEXT_SELECT_Y)), TheText.Get("FEC_RSC"));
+			CFont::SetJustifyOn();
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_START_X)), MENU_Y(Y(TEXT_START_Y)), TheText.Get("FEC_PAU"));
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_R2_X)), MENU_Y(Y(TEXT_R2_Y)), TheText.Get("FEC_LR"));
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_R1_X)), MENU_Y(Y(TEXT_R1_Y)), TheText.Get("FEC_HAB"));
+			CFont::SetJustifyOn();
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_TRIANGLE_X)), MENU_Y(Y(TEXT_TRIANGLE_Y)), TheText.Get("FEC_EXV"));
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_CIRCLE_X)), MENU_Y(Y(TEXT_CIRCLE_Y)), TheText.Get("FEC_CAW"));
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_CROSS_X)), MENU_Y(Y(TEXT_CROSS_Y)), TheText.Get("FEC_ACC"));
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_RSTICK_X)), MENU_Y(Y(TEXT_RSTICK_Y)), TheText.Get("FEC_TUC"));
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_R3_X)), MENU_Y(Y(TEXT_R3_Y)), TheText.Get("FEC_SM3"));
+			CFont::SetRightJustifyOn();
+			switch (m_PrefsControllerType)
+			{
+			case CONTROLLER_XBOXONE:
+			case CONTROLLER_XBOX360:
+				CFont::SetScale(MENU_X(SMALLESTTEXT_X_SCALE * 2 * scale * 0.65f), MENU_Y(SMALLESTTEXT_Y_SCALE * scale * 0.65f));
+				switch (m_PrefsLanguage)
+				{
+				case LANGUAGE_FRENCH:
+					TEXT_SQUARE_X += 3.0f;
+					CFont::SetRightJustifyWrap(MENU_X_LEFT_ALIGNED(X(TEXT_SQUARE_X)) - SCREEN_SCALE_X(90));
+					break;
+				case LANGUAGE_GERMAN:
+				case LANGUAGE_SPANISH:
+					TEXT_SQUARE_X += 18.0f;
+					CFont::SetRightJustifyWrap(MENU_X_LEFT_ALIGNED(X(TEXT_SQUARE_X)) - SCREEN_SCALE_X(90));
+					break;
+				default:
+					CFont::SetRightJustifyWrap(MENU_X_LEFT_ALIGNED(X(TEXT_SQUARE_X)) - SCREEN_SCALE_X(60));
+					break;
+				}
+				break;
+			default:
+				switch (m_PrefsLanguage)
+				{
+				case LANGUAGE_FRENCH:
+					TEXT_SQUARE_X -= 15.0f;
+					TEXT_SQUARE_Y += 5.0f;
+					CFont::SetScale(MENU_X(SMALLESTTEXT_X_SCALE * 2 * scale * 0.65f), MENU_Y(SMALLESTTEXT_Y_SCALE * scale * 0.65f));
+					CFont::SetRightJustifyWrap(MENU_X_LEFT_ALIGNED(X(TEXT_SQUARE_X)) - SCREEN_SCALE_X(60));
+					break;
+				case LANGUAGE_GERMAN:
+					TEXT_SQUARE_X -= 15.0f;
+					TEXT_SQUARE_Y += 10.0f;
+					CFont::SetScale(MENU_X(SMALLESTTEXT_X_SCALE * 2 * scale * 0.65f), MENU_Y(SMALLESTTEXT_Y_SCALE * scale * 0.65f));
+					CFont::SetRightJustifyWrap(MENU_X_LEFT_ALIGNED(X(TEXT_SQUARE_X)) - SCREEN_SCALE_X(60));
+					break;
+				case LANGUAGE_SPANISH:
+					TEXT_SQUARE_X += 15.0f;
+				case LANGUAGE_ITALIAN:
+					CFont::SetScale(MENU_X(SMALLESTTEXT_X_SCALE * 2 * scale * 0.65f), MENU_Y(SMALLESTTEXT_Y_SCALE * scale * 0.65f));
+				default:
+					CFont::SetRightJustifyWrap(MENU_X_LEFT_ALIGNED(X(TEXT_SQUARE_X)) - SCREEN_SCALE_X(100));
+					break;
+				}
+				break;
+			}
+			CFont::PrintStringFromBottom(MENU_X_LEFT_ALIGNED(X(TEXT_SQUARE_X)), MENU_Y(Y(TEXT_SQUARE_Y)), TheText.Get("FEC_BRA"));
+			break;
+		case 2:
+			CFont::SetRightJustifyOn();
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_L2_X)), MENU_Y(Y(TEXT_L2_Y)), TheText.Get("FEC_LL"));
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_L1_X)), MENU_Y(Y(TEXT_L1_Y_VEH)), TheText.Get("FEC_EXV"));
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_DPAD_X)), MENU_Y(Y(TEXT_DPAD_Y)), TheText.Get("FEC_VES"));
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_LSTICK_X)), MENU_Y(Y(TEXT_LSTICK_Y)), TheText.Get("FEC_VES"));
+			CFont::SetRightJustifyOn();
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_L3_X)), MENU_Y(Y(TEXT_L3_Y)), TheText.Get("FEC_RS3"));
+			switch (m_PrefsLanguage)
+			{
+			case LANGUAGE_FRENCH:
+				TEXT_SELECT_X -= 5.0f;
+				break;
+			case LANGUAGE_GERMAN:
+				TEXT_SELECT_X += 20.0f;
+				break;
+			case LANGUAGE_SPANISH:
+				TEXT_SELECT_X += 15.0f;
+				break;
+			default:
+				break;
+			}
+			CFont::SetRightJustifyWrap(MENU_X_LEFT_ALIGNED(X(TEXT_SELECT_X)) - SCREEN_SCALE_X(80));
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_SELECT_X)), MENU_Y(Y(TEXT_SELECT_Y)), TheText.Get("FEC_CAM"));
+			CFont::SetJustifyOn();
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_START_X)), MENU_Y(Y(TEXT_START_Y)), TheText.Get("FEC_PAU"));
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_R2_X)), MENU_Y(Y(TEXT_R2_Y)), TheText.Get("FEC_LR"));
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_R1_X)), MENU_Y(Y(TEXT_R1_Y)), TheText.Get("FEC_HOR"));
+			CFont::SetJustifyOn();
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_TRIANGLE_X)), MENU_Y(Y(TEXT_TRIANGLE_Y)), TheText.Get("FEC_HAB"));
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_CIRCLE_X)), MENU_Y(Y(TEXT_CIRCLE_Y)), TheText.Get("FEC_CAW"));
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_CROSS_X)), MENU_Y(Y(TEXT_CROSS_Y)), TheText.Get("FEC_ACC"));
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_RSTICK_X)), MENU_Y(Y(TEXT_RSTICK_Y)), TheText.Get("FEC_TUC"));
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_R3_X)), MENU_Y(Y(TEXT_R3_Y)), TheText.Get("FEC_SM3"));
+			CFont::SetRightJustifyOn();
+			switch (m_PrefsControllerType)
+			{
+			case CONTROLLER_XBOXONE:
+			case CONTROLLER_XBOX360:
+				CFont::SetScale(MENU_X(SMALLESTTEXT_X_SCALE * 2 * scale * 0.65f), MENU_Y(SMALLESTTEXT_Y_SCALE * scale * 0.65f));
+				switch (m_PrefsLanguage)
+				{
+				case LANGUAGE_FRENCH:
+					TEXT_SQUARE_X += 3.0f;
+					CFont::SetRightJustifyWrap(MENU_X_LEFT_ALIGNED(X(TEXT_SQUARE_X)) - SCREEN_SCALE_X(90));
+					break;
+				case LANGUAGE_GERMAN:
+				case LANGUAGE_SPANISH:
+					TEXT_SQUARE_X += 18.0f;
+					CFont::SetRightJustifyWrap(MENU_X_LEFT_ALIGNED(X(TEXT_SQUARE_X)) - SCREEN_SCALE_X(90));
+					break;
+				default:
+					CFont::SetRightJustifyWrap(MENU_X_LEFT_ALIGNED(X(TEXT_SQUARE_X)) - SCREEN_SCALE_X(60));
+					break;
+				}
+				break;
+			default:
+				switch (m_PrefsLanguage)
+				{
+				case LANGUAGE_FRENCH:
+					TEXT_SQUARE_X -= 15.0f;
+					TEXT_SQUARE_Y += 5.0f;
+					CFont::SetScale(MENU_X(SMALLESTTEXT_X_SCALE * 2 * scale * 0.65f), MENU_Y(SMALLESTTEXT_Y_SCALE * scale * 0.65f));
+					CFont::SetRightJustifyWrap(MENU_X_LEFT_ALIGNED(X(TEXT_SQUARE_X)) - SCREEN_SCALE_X(60));
+					break;
+				case LANGUAGE_GERMAN:
+					TEXT_SQUARE_X -= 15.0f;
+					TEXT_SQUARE_Y += 10.0f;
+					CFont::SetScale(MENU_X(SMALLESTTEXT_X_SCALE * 2 * scale * 0.65f), MENU_Y(SMALLESTTEXT_Y_SCALE * scale * 0.65f));
+					CFont::SetRightJustifyWrap(MENU_X_LEFT_ALIGNED(X(TEXT_SQUARE_X)) - SCREEN_SCALE_X(60));
+					break;
+				case LANGUAGE_SPANISH:
+					TEXT_SQUARE_X += 15.0f;
+				case LANGUAGE_ITALIAN:
+					CFont::SetScale(MENU_X(SMALLESTTEXT_X_SCALE * 2 * scale * 0.65f), MENU_Y(SMALLESTTEXT_Y_SCALE * scale * 0.65f));
+				default:
+					CFont::SetRightJustifyWrap(MENU_X_LEFT_ALIGNED(X(TEXT_SQUARE_X)) - SCREEN_SCALE_X(100));
+					break;
+				}
+				break;
+			}
+			CFont::PrintStringFromBottom(MENU_X_LEFT_ALIGNED(X(TEXT_SQUARE_X)), MENU_Y(Y(TEXT_SQUARE_Y)), TheText.Get("FEC_BRA"));
+			break;
+		case 3:
+			CFont::SetRightJustifyOn();
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_L2_X)), MENU_Y(Y(TEXT_L2_Y)), TheText.Get("FEC_LL"));
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_L1_X)), MENU_Y(Y(TEXT_L1_Y_VEH)), TheText.Get("FEC_HAB"));
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_DPAD_X)), MENU_Y(Y(TEXT_DPAD_Y)), TheText.Get("FEC_TUC"));
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_LSTICK_X)), MENU_Y(Y(TEXT_LSTICK_Y)), TheText.Get("FEC_VES"));
+			CFont::SetRightJustifyOn();
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_L3_X)), MENU_Y(Y(TEXT_L3_Y)), TheText.Get("FEC_HO3"));
+			switch (m_PrefsLanguage)
+			{
+			case LANGUAGE_FRENCH:
+				TEXT_SELECT_X -= 5.0f;
+				break;
+			case LANGUAGE_GERMAN:
+				TEXT_SELECT_X += 20.0f;
+				break;
+			case LANGUAGE_SPANISH:
+				TEXT_SELECT_X += 15.0f;
+				break;
+			default:
+				break;
+			}
+			CFont::SetRightJustifyWrap(MENU_X_LEFT_ALIGNED(X(TEXT_SELECT_X)) - SCREEN_SCALE_X(80));
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_SELECT_X)), MENU_Y(Y(TEXT_SELECT_Y)), TheText.Get("FEC_CAM"));
+			CFont::SetJustifyOn();
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_START_X)), MENU_Y(Y(TEXT_START_Y)), TheText.Get("FEC_PAU"));
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_R2_X)), MENU_Y(Y(TEXT_R2_Y)), TheText.Get("FEC_LR"));
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_R1_X)), MENU_Y(Y(TEXT_R1_Y)), TheText.Get("FEC_CAW"));
+			CFont::SetJustifyOn();
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_TRIANGLE_X)), MENU_Y(Y(TEXT_TRIANGLE_Y)), TheText.Get("FEC_EXV"));
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_CIRCLE_X)), MENU_Y(Y(TEXT_CIRCLE_Y)), TheText.Get("FEC_RSC"));
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_CROSS_X)), MENU_Y(Y(TEXT_CROSS_Y)), TheText.Get("FEC_NA"));
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_RSTICK_X)), MENU_Y(Y(TEXT_RSTICK_Y)), TheText.Get("FEC_ACC"));
+			CFont::PrintString(MENU_X_LEFT_ALIGNED(X(TEXT_R3_X)), MENU_Y(Y(TEXT_R3_Y)), TheText.Get("FEC_BRA"));
+			CFont::SetRightJustifyOn();
+			CFont::SetRightJustifyWrap(0);
+			switch (m_PrefsControllerType)
+			{
+			case CONTROLLER_XBOXONE:
+			case CONTROLLER_XBOX360:
+				CFont::SetScale(MENU_X(SMALLESTTEXT_X_SCALE * 2 * scale * 0.65f), MENU_Y(SMALLESTTEXT_Y_SCALE * scale * 0.65f));
+				CFont::PrintStringFromBottom(MENU_X_LEFT_ALIGNED(X(TEXT_SQUARE_X)), MENU_Y(Y(TEXT_SQUARE_Y)), TheText.Get("FEC_SMT"));
+				break;
+			default:
+				switch (m_PrefsLanguage)
+				{
+				case LANGUAGE_GERMAN:
+					TEXT_SQUARE_X += 5.0f;
+				case LANGUAGE_FRENCH:
+				case LANGUAGE_ITALIAN:
+					CFont::SetScale(MENU_X(SMALLESTTEXT_X_SCALE * 2 * scale * 0.65f), MENU_Y(SMALLESTTEXT_Y_SCALE * scale * 0.65f));
+					CFont::PrintStringFromBottom(MENU_X_LEFT_ALIGNED(X(TEXT_SQUARE_X)), MENU_Y(Y(TEXT_SQUARE_Y)), TheText.Get("FEC_SMT"));
+					break;
+				default:
+					CFont::PrintStringFromBottom(MENU_X_LEFT_ALIGNED(X(TEXT_SQUARE_X + 16.0f)), MENU_Y(Y(TEXT_SQUARE_Y)), TheText.Get("FEC_SMT"));
+					break;
+				}
+				break;
+			}
+			break;
+		default:
+			return;
+		}
+	}
+
+	CFont::SetDropShadowPosition(0); // X
+
+#undef X
+#undef Y
+}
+
+
+void
+CMenuManager::LoadController(int8 type)
+{
+	switch (type)
+	{
+	case CONTROLLER_DUALSHOCK2:
+	case CONTROLLER_DUALSHOCK3:
+	case CONTROLLER_DUALSHOCK4:
+		CFont::LoadButtons("MODELS/PS3BTNS.TXD");
+		break;
+	default:
+		CFont::LoadButtons("MODELS/X360BTNS.TXD");
+		break;
+	}
+
+	// Unload current textures
+	for (int i = MENUSPRITE_CONTROLLER; i <= MENUSPRITE_ARROWS4; i++)
+		m_aFrontEndSprites[i].Delete();
+
+	// Unload txd
+	int frontend_controller = CTxdStore::FindTxdSlot("frontend_controller");
+	if (frontend_controller != -1)
+		CTxdStore::RemoveTxd(frontend_controller);
+
+	// Find the new txd to load
+	bool bTxdMissing = true;
+	if (controllerTypesPaths[type])
+		if (int file = CFileMgr::OpenFile(controllerTypesPaths[type])) {
+			CFileMgr::CloseFile(file);
+			bTxdMissing = false;
+		}
+
+	int txdSlot = -1;
+
+	if (bTxdMissing)
+		// Not found, fall back to original textures
+		txdSlot = CTxdStore::FindTxdSlot("frontend2");
+	else {
+		// Found, load txd
+		txdSlot = frontend_controller;
+		if (txdSlot == -1)
+			txdSlot = CTxdStore::AddTxdSlot("frontend_controller");
+		CTxdStore::LoadTxd(txdSlot, controllerTypesPaths[type]);
+		CTxdStore::AddRef(txdSlot);
+	}
+
+	assert(txdSlot != -1);
+	// Load new textures
+	CTxdStore::SetCurrentTxd(txdSlot);
+	for (int i = MENUSPRITE_CONTROLLER; i <= MENUSPRITE_ARROWS4; i++) {
+		m_aFrontEndSprites[i].SetTexture(FrontendFilenames[i][0], FrontendFilenames[i][1]);
+		m_aFrontEndSprites[i].SetAddressing(rwTEXTUREADDRESSBORDER);
+	}
+}
+#endif // GAMEPAD_MENU
+
+#undef GetBackJustUp
+#undef GetBackJustDown
diff --git a/src/core/Frontend.h b/src/core/Frontend.h
new file mode 100644
index 0000000..112ea7a
--- /dev/null
+++ b/src/core/Frontend.h
@@ -0,0 +1,824 @@
+#pragma once
+#ifdef PS2_MENU
+#include "Frontend_PS2.h"
+#else
+
+#include "Sprite2d.h"
+#include "Timer.h"
+
+#define MENUHEADER_POS_X 10.0f
+#define MENUHEADER_POS_Y 10.0f
+#define MENUHEADER_HEIGHT 2.0f
+#define MENUHEADER_WIDTH 1.0f
+
+#define MENU_X_MARGIN 10.0f
+
+#define MENUACTION_SCALE_MULT 0.9f
+
+#define MENULABEL_X_MARGIN 80.0f
+#define MENULABEL_POS_X 100.0f
+#define MENULABEL_POS_Y 97.0f
+
+#define MENU_DEFAULT_CONTENT_X 320
+#define MENU_DEFAULT_CONTENT_Y 100
+#define MENU_DEFAULT_LINE_HEIGHT 29
+
+#define RIGHT_ALIGNED_TEXT_RIGHT_MARGIN(xMargin) (xMargin + 30.0f)
+
+#define MENURADIO_ICON_FIRST_X 238.f
+#define MENURADIO_ICON_Y 288.0f
+#define MENURADIO_ICON_SIZE 60.0f
+#define MENURADIO_SELECTOR_START_Y 285.f // other options should leave room on the screen
+#define MENURADIO_SELECTOR_HEIGHT 65.f
+
+#define MENUSLIDER_X 500.0f
+#define MENUSLIDER_UNK 100.0f
+#define MENUSLIDER_SMALLEST_BAR 8.0f
+#define MENUSLIDER_BIGGEST_BAR 25.0f
+
+#define BIGTEXT2_X_SCALE 0.6f // For FONT_STANDARD
+#define BIGTEXT2_Y_SCALE 1.2f
+#define BIGTEXT_X_SCALE 0.6f // For FONT_HEADING
+#define BIGTEXT_Y_SCALE 1.0f
+#define MEDIUMTEXT_X_SCALE 0.48f // For FONT_STANDARD
+#define MEDIUMTEXT_Y_SCALE 1.0f
+#define SMALLTEXT_X_SCALE 0.42f // For FONT_STANDARD
+#define SMALLTEXT_Y_SCALE 0.9f
+#define SMALLESTTEXT_X_SCALE 0.3f // For FONT_STANDARD
+#define SMALLESTTEXT_Y_SCALE 0.7f
+
+#define LISTITEM_X_SCALE 0.4f // Only unproportional and commonly used scale for FONT_STANDARD
+#define LISTITEM_Y_SCALE 0.6f
+
+#define HELPER_TEXT_RIGHT_MARGIN MENU_X_MARGIN
+#define HELPER_TEXT_BOTTOM_MARGIN 18.f
+
+#define PLAYERSETUP_LIST_TOP 58.0f
+#define PLAYERSETUP_LIST_BOTTOM 95.0f
+#define PLAYERSETUP_LIST_LEFT 200.0f
+#define PLAYERSETUP_LIST_RIGHT 36.0f
+#ifdef FIX_BUGS // See the scrollbar button drawing code
+#define PLAYERSETUP_SCROLLBAR_WIDTH 19.0f
+#else
+#define PLAYERSETUP_SCROLLBAR_WIDTH 16.0f
+#endif
+#define PLAYERSETUP_SCROLLBUTTON_HEIGHT 17.0f
+#define PLAYERSETUP_SCROLLBUTTON_TXD_DIMENSION 64
+#define PLAYERSETUP_SKIN_COLUMN_LEFT 220.0f
+#define PLAYERSETUP_DATE_COLUMN_RIGHT 56.0f
+#define PLAYERSETUP_LIST_BODY_TOP 77
+#define PLAYERSETUP_ROW_HEIGHT 9
+
+#define STATS_ROW_HEIGHT 17.0f
+#define STATS_ROW_LEFT_MARGIN 110.0f
+#define STATS_ROW_RIGHT_MARGIN 113.0f
+#define STATS_TOP_Y 135.0f // Just faded in
+#define STATS_BOTTOM_Y 300.0f // Starts to fade out after that
+#define STATS_FADING_AREA_LENGTH 50.0f
+#define STATS_VISIBLE_START_Y (STATS_TOP_Y - 10.f)
+#define STATS_VISIBLE_END_Y (STATS_BOTTOM_Y + 21.f)
+#define STATS_RATING_X 320.0f
+#define STATS_RATING_Y_1 85.0f
+#define STATS_RATING_Y_2 110.0f
+
+#define BRIEFS_TOP_MARGIN 140.0f
+#define BRIEFS_BOTTOM_MARGIN 280.0f
+#define BRIEFS_LINE_X 100.0f
+#define BRIEFS_LINE_HEIGHT 20.0f
+#define BRIEFS_LINE_SPACING 10.0f
+
+#define CONTSETUP_STANDARD_ROW_HEIGHT 10.7f
+#define CONTSETUP_CLASSIC_ROW_HEIGHT 9.0f
+#define CONTSETUP_BOUND_HIGHLIGHT_HEIGHT 10
+#define CONTSETUP_BOUND_COLUMN_WIDTH 190.0f
+#define CONTSETUP_LIST_TOP 58.0f
+#define CONTSETUP_LIST_RIGHT 18.0f
+#define CONTSETUP_LIST_BOTTOM 78.0f
+#define CONTSETUP_LIST_LEFT 30.0f
+#define CONTSETUP_COLUMN_1_X 40.0f
+#define CONTSETUP_COLUMN_2_X 210.0f
+#define CONTSETUP_COLUMN_3_X (CONTSETUP_COLUMN_2_X + CONTSETUP_BOUND_COLUMN_WIDTH + 10.0f)
+#define CONTSETUP_BACK_RIGHT 35.0f
+#define CONTSETUP_BACK_BOTTOM 82.0f
+#define CONTSETUP_BACK_HEIGHT 25.0f
+
+enum
+{
+	MENUALIGN_LEFT = 1,
+	MENUALIGN_RIGHT,
+	MENUALIGN_CENTER,
+};
+
+enum eMenuSprites
+{
+	MENUSPRITE_BACKGROUND,
+	MENUSPRITE_VCLOGO,
+	MENUSPRITE_MOUSE,
+	MENUSPRITE_MAPTOP01,
+	MENUSPRITE_MAPTOP02,
+	MENUSPRITE_MAPTOP03,
+	MENUSPRITE_MAPMID01,
+	MENUSPRITE_MAPMID02,
+	MENUSPRITE_MAPMID03,
+	MENUSPRITE_MAPBOT01,
+	MENUSPRITE_MAPBOT02,
+	MENUSPRITE_MAPBOT03,
+	MENUSPRITE_WILDSTYLE,
+	MENUSPRITE_FLASH,
+	MENUSPRITE_KCHAT,
+	MENUSPRITE_FEVER,
+	MENUSPRITE_VROCK,
+	MENUSPRITE_VCPR,
+	MENUSPRITE_ESPANTOSO,
+	MENUSPRITE_EMOTION,
+	MENUSPRITE_WAVE,
+	MENUSPRITE_MP3,
+	MENUSPRITE_DOWNOFF,
+	MENUSPRITE_DOWNON,
+	MENUSPRITE_UPOFF,
+	MENUSPRITE_UPON,
+#ifdef GAMEPAD_MENU
+	MENUSPRITE_CONTROLLER,
+	MENUSPRITE_ARROWS1,
+	MENUSPRITE_ARROWS2,
+	MENUSPRITE_ARROWS3,
+	MENUSPRITE_ARROWS4,
+#endif
+	NUM_MENU_SPRITES
+};
+
+enum eSaveSlot
+{
+	SAVESLOT_NONE,
+	SAVESLOT_0,
+	SAVESLOT_1,
+	SAVESLOT_2,
+	SAVESLOT_3,
+	SAVESLOT_4,
+	SAVESLOT_5,
+	SAVESLOT_6,
+	SAVESLOT_7,
+	SAVESLOT_8,
+	SAVESLOT_LABEL = 36
+};
+
+enum eMenuScreen
+{
+	MENUPAGE_DISABLED = -1,
+	MENUPAGE_STATS = 0,
+	MENUPAGE_NEW_GAME = 1,
+	MENUPAGE_BRIEFS = 2,
+	MENUPAGE_SOUND_SETTINGS = 3,
+	MENUPAGE_DISPLAY_SETTINGS = 4,
+	MENUPAGE_LANGUAGE_SETTINGS = 5,
+	MENUPAGE_MAP = 6,
+	MENUPAGE_NEW_GAME_RELOAD = 7,
+	MENUPAGE_CHOOSE_LOAD_SLOT = 8,
+	MENUPAGE_CHOOSE_DELETE_SLOT = 9,
+	MENUPAGE_LOAD_SLOT_CONFIRM = 10,
+	MENUPAGE_DELETE_SLOT_CONFIRM = 11,
+	MENUPAGE_LOADING_IN_PROGRESS = 12,
+	MENUPAGE_DELETING_IN_PROGRESS = 13,
+	MENUPAGE_DELETE_SUCCESSFUL = 14,
+	MENUPAGE_CHOOSE_SAVE_SLOT = 15,
+	MENUPAGE_SAVE_OVERWRITE_CONFIRM = 16,
+	MENUPAGE_SAVING_IN_PROGRESS = 17,
+	MENUPAGE_SAVE_SUCCESSFUL = 18,
+	MENUPAGE_SAVE_CUSTOM_WARNING = 19,
+	MENUPAGE_SAVE_CHEAT_WARNING = 20,
+	MENUPAGE_SKIN_SELECT = 21,
+	MENUPAGE_SAVE_UNUSED = 22,
+	MENUPAGE_SAVE_FAILED = 23,
+	MENUPAGE_SAVE_FAILED_2 = 24,
+	MENUPAGE_LOAD_FAILED = 25,
+	MENUPAGE_CONTROLLER_PC = 26,
+	MENUPAGE_OPTIONS = 27,
+	MENUPAGE_EXIT = 28,
+	MENUPAGE_START_MENU = 29,
+	MENUPAGE_KEYBOARD_CONTROLS = 30,
+	MENUPAGE_MOUSE_CONTROLS = 31,
+	MENUPAGE_PAUSE_MENU = 32,
+	MENUPAGE_NONE = 33, // Then chooses main menu or pause menu 
+#ifdef GAMEPAD_MENU
+	MENUPAGE_CONTROLLER_SETTINGS,
+#endif
+#ifdef LEGACY_MENU_OPTIONS
+	MENUPAGE_DEBUG_MENU,
+	MENUPAGE_CONTROLLER_PC_OLD1,
+	MENUPAGE_CONTROLLER_PC_OLD2,
+	MENUPAGE_CONTROLLER_PC_OLD3,
+	MENUPAGE_CONTROLLER_PC_OLD4,
+	MENUPAGE_CONTROLLER_DEBUG,
+#endif
+#ifdef CUSTOM_FRONTEND_OPTIONS
+
+#ifdef GRAPHICS_MENU_OPTIONS
+	MENUPAGE_GRAPHICS_SETTINGS,
+#endif
+#ifdef DETECT_JOYSTICK_MENU
+	MENUPAGE_DETECT_JOYSTICK,
+#endif
+
+#endif
+	MENUPAGE_OUTRO, // Originally 34, but CFO needs last screen to be empty to count number of menu pages
+	MENUPAGES
+};
+
+enum eMenuAction
+{
+#ifdef CUSTOM_FRONTEND_OPTIONS
+	MENUACTION_CFO_SELECT = -2,
+	MENUACTION_CFO_DYNAMIC = -1,
+#endif
+	MENUACTION_NOTHING,
+	MENUACTION_LABEL,
+	MENUACTION_YES,
+	MENUACTION_NO,
+	MENUACTION_CHANGEMENU,
+	MENUACTION_INVERTPADY,
+	MENUACTION_CTRLDISPLAY,
+	MENUACTION_FRAMESYNC,
+	MENUACTION_FRAMELIMIT,
+	MENUACTION_TRAILS,
+	MENUACTION_SUBTITLES,
+	MENUACTION_WIDESCREEN,
+	MENUACTION_BRIGHTNESS,
+	MENUACTION_MUSICVOLUME,
+	MENUACTION_SFXVOLUME,
+	MENUACTION_RADIO,
+	MENUACTION_LANG_ENG,
+	MENUACTION_LANG_FRE,
+	MENUACTION_LANG_GER,
+	MENUACTION_LANG_ITA,
+	MENUACTION_LANG_SPA,
+	MENUACTION_POPULATESLOTS_CHANGEMENU,
+	MENUACTION_CHECKSAVE,
+	MENUACTION_NEWGAME,
+	MENUACTION_RESUME_FROM_SAVEZONE,
+	MENUACTION_RELOADIDE,
+	MENUACTION_SETDBGFLAG,
+	MENUACTION_LOADRADIO,
+	MENUACTION_SAVEGAME,
+	MENUACTION_SWITCHBIGWHITEDEBUGLIGHT,
+	MENUACTION_COLLISIONPOLYS,
+	MENUACTION_LEGENDS,
+	MENUACTION_RADARMODE,
+	MENUACTION_HUD,
+	MENUACTION_GOBACK,
+	MENUACTION_KEYBOARDCTRLS,
+	MENUACTION_GETKEY,
+	MENUACTION_SHOWHEADBOB,
+	MENUACTION_UNK38, // MENUACTION_PARSEHEAP? MENUACTION_DEBUGSTREAM? MENUACTION_MEMCARDSAVECONFIRM?
+	MENUACTION_INVVERT,
+	MENUACTION_CANCELGAME,
+	MENUACTION_RESUME,
+	MENUACTION_DONTCANCEL,
+	MENUACTION_SCREENRES,
+	MENUACTION_AUDIOHW,
+	MENUACTION_SPEAKERCONF,
+	MENUACTION_PLAYERSETUP,
+	MENUACTION_RESTOREDEF,
+	MENUACTION_CTRLMETHOD,
+	MENUACTION_DYNAMICACOUSTIC,
+	MENUACTION_MOUSESTEER,
+	MENUACTION_DRAWDIST,
+	MENUACTION_MOUSESENS,
+	MENUACTION_MP3VOLUMEBOOST,
+#ifdef GAMEPAD_MENU
+	MENUACTION_CTRLVIBRATION,
+	MENUACTION_CTRLCONFIG,
+#endif
+};
+
+enum eCheckHover
+{
+	HOVEROPTION_0,
+	HOVEROPTION_1,
+	HOVEROPTION_RANDOM_ITEM,
+	HOVEROPTION_3,
+	HOVEROPTION_4,
+	HOVEROPTION_5,
+	HOVEROPTION_6,
+	HOVEROPTION_7,
+	HOVEROPTION_8,
+	HOVEROPTION_BACK,	// also layer in controller setup and skin menu
+	HOVEROPTION_10,
+	HOVEROPTION_11,
+	HOVEROPTION_OVER_SCROLL_UP,
+	HOVEROPTION_OVER_SCROLL_DOWN,
+	HOVEROPTION_CLICKED_SCROLL_UP,
+	HOVEROPTION_CLICKED_SCROLL_DOWN,
+	HOVEROPTION_HOLDING_SCROLLBAR,
+	HOVEROPTION_PAGEUP,
+	HOVEROPTION_PAGEDOWN,
+	HOVEROPTION_LIST, // also layer in controller setup and skin menu
+	HOVEROPTION_SKIN,
+	HOVEROPTION_USESKIN, // also layer in controller setup and skin menu
+	HOVEROPTION_NEXT_RADIO,
+	HOVEROPTION_PREV_RADIO,
+	HOVEROPTION_INCREASE_BRIGHTNESS,
+	HOVEROPTION_DECREASE_BRIGHTNESS,
+	HOVEROPTION_INCREASE_DRAWDIST,
+	HOVEROPTION_DECREASE_DRAWDIST,
+	HOVEROPTION_INCREASE_MUSICVOLUME,
+	HOVEROPTION_DECREASE_MUSICVOLUME,
+	HOVEROPTION_INCREASE_SFXVOLUME,
+	HOVEROPTION_DECREASE_SFXVOLUME,
+	HOVEROPTION_INCREASE_MOUSESENS,
+	HOVEROPTION_DECREASE_MOUSESENS,
+	HOVEROPTION_INCREASE_MP3BOOST,
+	HOVEROPTION_DECREASE_MP3BOOST,
+	HOVEROPTION_NOT_HOVERING,
+};
+
+enum
+{
+#if defined LEGACY_MENU_OPTIONS || defined CUSTOM_FRONTEND_OPTIONS
+	NUM_MENUROWS = 18,
+#else
+	NUM_MENUROWS = 12,
+#endif
+};
+
+enum eControlMethod
+{
+	CONTROL_STANDARD = 0,
+	CONTROL_CLASSIC,
+};
+
+// Why??
+enum ControllerSetupColumn
+{
+	CONTSETUP_PED_COLUMN = 0,
+	CONTSETUP_VEHICLE_COLUMN = 16,
+};
+
+struct tSkinInfo
+{
+	int32 skinId;
+	char skinNameDisplayed[256];
+	char skinNameOriginal[256];
+	char date[256];
+	tSkinInfo *nextSkin;
+};
+
+struct BottomBarOption
+{
+	char name[8];
+	int32 screenId;
+};
+
+#ifndef CUSTOM_FRONTEND_OPTIONS
+struct CMenuScreen
+{
+	char m_ScreenName[8];
+	int32 m_PreviousPage; // eMenuScreen
+	int32 m_ParentEntry; // row
+
+	struct CMenuEntry
+	{
+		int32 m_Action; // eMenuAction
+		char m_EntryName[8];
+		int32 m_SaveSlot; // eSaveSlot
+		int32 m_TargetMenu; // eMenuScreen
+		uint16 m_X;
+		uint16 m_Y;
+		uint8 m_Align;
+	} m_aEntries[NUM_MENUROWS];
+};
+extern CMenuScreen aScreens[MENUPAGES];
+#else
+#include "frontendoption.h"
+struct CCustomScreenLayout {
+	int startX; // not used at all if first entry has X and Y values
+	int startY; // not used at all if first entry has X and Y values
+	int lineHeight; // used to determine next entry's Y coordinate, if it has 0-0 as coordinates
+	bool showLeftRightHelper;
+	bool noInvasiveBorders; // not needed on pages already handled by game
+	int xMargin; // useful for two part texts - 0/empty = MENU_X_MARGIN
+};
+
+struct CCFO
+{
+	int8 *value;
+	const char *saveCat;
+	const char *save;
+};
+
+struct CCFOSelect : CCFO
+{
+	char** rightTexts;
+	int8 numRightTexts;
+	bool onlyApplyOnEnter;
+	int8 displayedValue; // only if onlyApplyOnEnter enabled for now
+	int8 lastSavedValue; // only if onlyApplyOnEnter enabled
+	ChangeFunc changeFunc;
+	bool disableIfGameLoaded;
+
+	CCFOSelect() {};
+	CCFOSelect(int8* value, const char* saveCat, const char* save, const char** rightTexts, int8 numRightTexts, bool onlyApplyOnEnter, ChangeFunc changeFunc = nil, bool disableIfGameLoaded = false){
+		this->value = value;
+		if (value)
+			this->lastSavedValue = this->displayedValue = *value;
+
+		this->saveCat = saveCat;
+		this->save = save;
+		this->rightTexts = (char**)rightTexts;
+		this->numRightTexts = numRightTexts;
+		this->onlyApplyOnEnter = onlyApplyOnEnter;
+		this->changeFunc = changeFunc;
+		this->disableIfGameLoaded = disableIfGameLoaded;
+	}
+};
+
+struct CCFODynamic : CCFO
+{
+	DrawFunc drawFunc;
+	ButtonPressFunc buttonPressFunc;
+
+	CCFODynamic() {};
+	CCFODynamic(int8* value, const char* saveCat, const char* save, DrawFunc drawFunc, ButtonPressFunc buttonPressFunc){
+		this->value = value;
+		this->saveCat = saveCat;
+		this->save = save;
+		this->drawFunc = drawFunc;
+		this->buttonPressFunc = buttonPressFunc;
+	}
+};
+
+struct CMenuScreenCustom
+{
+	char m_ScreenName[8];
+	int32 m_PreviousPage; // eMenuScreen
+	CCustomScreenLayout *layout;
+	ReturnPrevPageFunc returnPrevPageFunc;
+	
+	struct CMenuEntry
+	{
+		int32 m_Action; // eMenuAction - below zero is CFO
+		char m_EntryName[8];
+		struct {
+			union {
+				CCFO *m_CFO; // for initializing
+				CCFOSelect *m_CFOSelect;
+				CCFODynamic *m_CFODynamic;
+			};
+			int32 m_SaveSlot; // eSaveSlot
+			int32 m_TargetMenu; // eMenuScreen
+		};
+		uint16 m_X;
+		uint16 m_Y;
+		uint8 m_Align;
+	} m_aEntries[NUM_MENUROWS];
+};
+extern CMenuScreenCustom aScreens[MENUPAGES];
+#endif
+
+struct MenuTrapezoid
+{
+	float topLeft_x;
+	float topLeft_y;
+	float topRight_x;
+	float topRight_y;
+	float bottomLeft_x;
+	float bottomLeft_y;
+	float bottomRight_x;
+	float bottomRight_y;
+	float old_topRight_x;
+	float old_topRight_y;
+	float old_topLeft_x;
+	float old_topLeft_y;
+	float old_bottomLeft_x;
+	float old_bottomLeft_y;
+	float old_bottomRight_x;
+	float old_bottomRight_y;
+	float mult_topRight_x;
+	float mult_topRight_y;
+	float mult_topLeft_x;
+	float mult_topLeft_y;
+	float mult_bottomLeft_x;
+	float mult_bottomLeft_y;
+	float mult_bottomRight_x;
+	float mult_bottomRight_y;
+
+	MenuTrapezoid(float x1, float y1, float x2, float y2, float x3, float y3, float x4, float y4) {
+		topLeft_x = x1;
+		topLeft_y = y1;
+		topRight_x = x2;
+		topRight_y = y2;
+		bottomLeft_x = x3;
+		bottomLeft_y = y3;
+		bottomRight_x = x4;
+		bottomRight_y = y4;
+	};
+
+	void SaveCurrentCoors() {
+		old_topLeft_x = topLeft_x;
+		old_topLeft_y = topLeft_y;
+		old_topRight_x = topRight_x;
+		old_topRight_y = topRight_y;
+		old_bottomLeft_x = bottomLeft_x;
+		old_bottomLeft_y = bottomLeft_y;
+		old_bottomRight_x = bottomRight_x;
+		old_bottomRight_y = bottomRight_y;
+	}
+
+	void Translate(int delta) {
+		bottomRight_x = delta * mult_bottomRight_x + old_bottomRight_x;
+		bottomRight_y = delta * mult_bottomRight_y + old_bottomRight_y;
+		bottomLeft_x = delta * mult_bottomLeft_x + old_bottomLeft_x;
+		bottomLeft_y = delta * mult_bottomLeft_y + old_bottomLeft_y;
+		topRight_x = delta * mult_topRight_x + old_topRight_x;
+		topRight_y = delta * mult_topRight_y + old_topRight_y;
+		topLeft_x = delta * mult_topLeft_x + old_topLeft_x;
+		topLeft_y = delta * mult_topLeft_y + old_topLeft_y;
+	}
+
+	void UpdateMultipliers() {
+		mult_bottomRight_x = (bottomRight_x - old_bottomRight_x) / 255.0f;
+		mult_bottomRight_y = (bottomRight_y - old_bottomRight_y) / 255.0f;
+		mult_bottomLeft_x = (bottomLeft_x - old_bottomLeft_x) / 255.0f;
+		mult_bottomLeft_y = (bottomLeft_y - old_bottomLeft_y) / 255.0f;
+		mult_topRight_x = (topRight_x - old_topRight_x) / 255.0f;
+		mult_topRight_y = (topRight_y - old_topRight_y) / 255.0f;
+		mult_topLeft_x = (topLeft_x - old_topLeft_x) / 255.0f;
+		mult_topLeft_y = (topLeft_y - old_topLeft_y) / 255.0f;
+	}
+};
+
+class CMenuManager
+{
+public:
+	int8 m_StatsScrollDirection;
+	float m_StatsScrollSpeed;
+	uint8 field_8;
+	bool m_PrefsUseVibration;
+	bool m_PrefsShowHud;
+	int32 m_PrefsRadarMode;
+	bool m_DisplayControllerOnFoot;
+	bool m_bShutDownFrontEndRequested;
+	bool m_bStartUpFrontEndRequested;
+	int32 m_KeyPressedCode;
+	int32 m_PrefsBrightness;
+	float m_PrefsLOD;
+	int8 m_PrefsShowSubtitles;
+	int8 m_PrefsShowLegends;
+	int8 m_PrefsUseWideScreen;
+	int8 m_PrefsVsync;
+	int8 m_PrefsVsyncDisp;
+	int8 m_PrefsFrameLimiter;
+	int8 m_nPrefsAudio3DProviderIndex;
+	int8 m_PrefsSpeakers;
+	int8 m_PrefsDMA;
+	int8 m_PrefsSfxVolume;
+	int8 m_PrefsMusicVolume;
+	int8 m_PrefsRadioStation;
+	uint8 m_PrefsStereoMono; // unused except restore settings
+	int32 m_nCurrOption;
+	bool m_bQuitGameNoCD;
+	bool m_bMenuMapActive;
+	bool m_AllowNavigation;
+	uint8 field_37;
+	bool m_bMenuActive;
+	bool m_bWantToRestart;
+	bool m_bFirstTime;
+	bool m_bActivateSaveMenu;
+	bool m_bWantToLoad;
+	float m_fMapSize;
+	float m_fMapCenterX;
+	float m_fMapCenterY;
+	uint32 OS_Language;
+	int32 m_PrefsLanguage;
+	int32 field_54;
+	int8 m_bLanguageLoaded;
+	uint8 m_PrefsAllowNastyGame;
+	int8 m_PrefsMP3BoostVolume;
+	int8 m_ControlMethod;
+	int32 m_nPrefsVideoMode;
+	int32 m_nDisplayVideoMode;
+	int32 m_nMouseTempPosX;
+	int32 m_nMouseTempPosY;
+	bool m_bGameNotLoaded;
+	int8 m_lastWorking3DAudioProvider;
+	bool m_bFrontEnd_ReloadObrTxtGxt;
+	int32 *pEditString;
+	uint8 field_74[4];
+	int32 *pControlEdit;
+	bool m_OnlySaveMenu;
+	int32 m_firstStartCounter;
+	CSprite2d m_aFrontEndSprites[NUM_MENU_SPRITES];
+	bool m_bSpritesLoaded;
+	int32 m_LeftMostRadioX;
+	int32 m_ScrollRadioBy;
+	int32 m_nCurrScreen;
+	int32 m_nPrevScreen;
+	int32 m_nCurrSaveSlot;
+	uint32 m_LastScreenSwitch;
+	int32 m_nMenuFadeAlpha;
+	int32 m_nOptionHighlightTransitionBlend;
+	bool bMenuChangeOngoing;
+	int32 MouseButtonJustClicked;
+	int32 JoyButtonJustClicked;
+	bool DisplayComboButtonErrMsg;
+	bool m_NoEmptyBinding;
+	bool m_ShowEmptyBindingError;
+	int32 m_nHelperTextAlpha;
+	bool m_bPressedPgUpOnList;
+	bool m_bPressedPgDnOnList;
+	bool m_bPressedUpOnList;
+	bool m_bPressedDownOnList;
+	bool m_bPressedScrollButton;
+	uint8 field_129;
+	uint8 field_12A;
+	uint8 field_12B;
+	int32 m_nMousePosX;
+	int32 m_nMousePosY;
+	int32 m_nMouseOldPosX;
+	int32 m_nMouseOldPosY;
+	int32 m_nHoverOption;
+	bool m_bShowMouse;
+	int32 m_nOptionMouseHovering;
+	bool m_bStartWaitingForKeyBind;
+	bool m_bWaitingForNewKeyBind;
+	bool m_bKeyChangeNotProcessed;
+	int32 m_CurrCntrlAction;
+	uint8 field_150;
+	uint8 field_151;
+	uint8 field_152;
+	uint8 field_153;
+	int32 m_nSelectedContSetupColumn;
+	bool m_bKeyIsOK;
+	bool field_159;
+	uint8 m_nCurrExLayer;
+	char m_PrefsSkinFile[256];
+	char m_aSkinName[256];
+	uint8 field_35B;
+	int32 m_nHelperTextMsgId;
+	tSkinInfo m_pSkinListHead;
+	tSkinInfo *m_pSelectedSkin;
+	int32 m_nFirstVisibleRowOnList;
+	float m_nScrollbarTopMargin;
+	int32 m_nTotalListRow;
+	int32 m_nSkinsTotal;
+	uint8 field_67C[4];
+	int32 m_nSelectedListRow;
+	bool m_bSkinsEnumerated;
+
+#ifdef IMPROVED_VIDEOMODE
+	int32 m_nPrefsWidth;
+	int32 m_nPrefsHeight;
+	int32 m_nPrefsDepth;
+	int32 m_nPrefsWindowed;
+	int32 m_nPrefsSubsystem;
+	int32 m_nSelectedScreenMode;
+#endif
+#ifdef MULTISAMPLING
+	int8 m_nPrefsMSAALevel;
+	int8 m_nDisplayMSAALevel;
+#endif
+
+#ifdef GAMEPAD_MENU
+	enum
+	{
+		CONTROLLER_DUALSHOCK2 = 0,
+		CONTROLLER_DUALSHOCK3,
+		CONTROLLER_DUALSHOCK4,
+		CONTROLLER_XBOX360,
+		CONTROLLER_XBOXONE,
+	};
+
+	int8 m_PrefsControllerType;
+#endif
+	enum LANGUAGE
+	{
+		LANGUAGE_AMERICAN,
+		LANGUAGE_FRENCH,
+		LANGUAGE_GERMAN,
+		LANGUAGE_ITALIAN,
+		LANGUAGE_SPANISH,
+#ifdef MORE_LANGUAGES
+		LANGUAGE_POLISH,
+		LANGUAGE_RUSSIAN,
+		LANGUAGE_JAPANESE,
+#endif
+	};
+	bool GetIsMenuActive() {return !!m_bMenuActive;}
+
+#ifdef CUTSCENE_BORDERS_SWITCH
+	static bool m_PrefsCutsceneBorders;
+#endif
+
+#ifndef MASTER
+	static bool m_PrefsMarketing;
+	static bool m_PrefsDisableTutorials;
+#endif // !MASTER
+
+	CMenuManager(void);
+	~CMenuManager(void) { UnloadTextures(); }
+
+#ifdef NO_ISLAND_LOADING
+	enum
+	{
+		ISLAND_LOADING_LOW = 0,
+		ISLAND_LOADING_MEDIUM,
+		ISLAND_LOADING_HIGH
+	};
+
+	int8 m_PrefsIslandLoading;
+
+	#define ISLAND_LOADING_IS(p) if (FrontEndMenuManager.m_PrefsIslandLoading == CMenuManager::ISLAND_LOADING_##p)
+	#define ISLAND_LOADING_ISNT(p) if (FrontEndMenuManager.m_PrefsIslandLoading != CMenuManager::ISLAND_LOADING_##p)
+#else
+	#define ISLAND_LOADING_IS(p)
+	#define ISLAND_LOADING_ISNT(p)
+#endif
+
+#ifdef XBOX_MESSAGE_SCREEN
+	static uint32 m_nDialogHideTimer;
+	static PauseModeTime m_nDialogHideTimerPauseMode;
+	static bool m_bDialogOpen;
+	static wchar *m_pDialogText;
+	static bool m_bSaveWasSuccessful;
+
+	static void SetDialogText(const char*);
+	static bool DialogTextCmp(const char*);
+	static void ToggleDialog(bool);
+	static void SetDialogTimer(uint32);
+	void ProcessDialogTimer(void);
+	void DrawOverlays(void);
+	void CloseDialog(void);
+#endif
+
+	void Initialise();
+	void PrintMap();
+	void SetFrontEndRenderStates();
+	static void CentreMousePointer();
+	void CheckCodesForControls(int);
+	bool CheckHover(int x1, int x2, int y1, int y2);
+	void CheckSliderMovement(int);
+	void DisplayHelperText(char*);
+	int DisplaySlider(float, float, float, float, float, float, float);
+	void DoSettingsBeforeStartingAGame();
+	void DrawStandardMenus(bool);
+	void DrawControllerBound(int32, int32, int32, int8);
+	void DrawControllerScreenExtraText(int, int, int);
+	void DrawControllerSetupScreen();
+	void DrawQuitGameScreen();
+	void DrawFrontEnd();
+	void DrawBackground(bool transitionCall);
+	void DrawPlayerSetupScreen(bool);
+	int FadeIn(int alpha);
+	int GetStartOptionsCntrlConfigScreens();
+	void InitialiseChangedLanguageSettings();
+	void LoadAllTextures();
+	void LoadSettings();
+	void MessageScreen(const char *str, bool);
+	void SmallMessageScreen(const char *str);
+	void PrintBriefs();
+	static void PrintErrorMessage();
+	void PrintStats();
+	void Process();
+	void ProcessList(bool &optionSelected, bool &goBack);
+	void UserInput();
+	void ProcessUserInput(uint8, uint8, uint8, uint8, int8);
+	void ChangeRadioStation(int8);
+	void ProcessFileActions();
+	void ProcessOnOffMenuOptions();
+	void RequestFrontEndShutDown();
+	void RequestFrontEndStartUp();
+	void ResetHelperText();
+	void SaveSettings();
+	void SetHelperText(int text);
+	float StretchX(float);
+	float StretchY(float);
+	void SwitchMenuOnAndOff();
+	void UnloadTextures();
+	void WaitForUserCD();
+	int GetNumOptionsCntrlConfigScreens();
+	void SwitchToNewScreen(int8);
+	void AdditionalOptionInput(bool &goBack);
+	void ExportStats(void);
+	void PrintRadioSelector(void);
+
+	// New (not in function or inlined in the game)
+	void ThingsToDoBeforeLeavingPage();
+	void ScrollUpListByOne();
+	void ScrollDownListByOne();
+	void PageUpList(bool);
+	void PageDownList(bool);
+	int8 GetPreviousPageOption();
+	
+	// uint8 GetNumberOfMenuOptions();
+#ifdef GAMEPAD_MENU
+	void LoadController(int8 type);
+	void PrintController(void);
+#endif
+};
+
+#ifndef IMPROVED_VIDEOMODE
+VALIDATE_SIZE(CMenuManager, 0x688);
+#endif
+
+extern CMenuManager FrontEndMenuManager;
+
+#endif
diff --git a/src/core/FrontendTriggers.h b/src/core/FrontendTriggers.h
new file mode 100644
index 0000000..b2bde09
--- /dev/null
+++ b/src/core/FrontendTriggers.h
@@ -0,0 +1,1393 @@
+CTriggerCaller MemCardAccessTriggerCaller;
+
+void InitialiseTextsInMenuControllerInCar(CMenuPictureAndText *widget, CMenuManager::CONTRCONFIG cont);
+void InitialiseTextsInMenuControllerOnFoot(CMenuPictureAndText *widget, CMenuManager::CONTRCONFIG cont);
+void TriggerSave_BackToMainMenu(CMenuMultiChoiceTriggered *widget);
+void TriggerSave_BackToMainMenuTwoLines(CMenuMultiChoiceTwoLinesTriggered *widget);
+void TriggerSave_LoadGameLoadGameSelect(CMenuMultiChoiceTwoLinesTriggered *widget);
+void TriggerSave_DeleteGameDeleteGameSelect(CMenuMultiChoiceTwoLinesTriggered *widget);
+void TriggerSaveZone_BackToMainMenuTwoLines(CMenuMultiChoiceTwoLinesTriggered *widget);
+void TriggerSaveZone_BackToMainMenuTwoLines(CMenuMultiChoiceTwoLinesTriggered *widget);
+void TriggerSaveZone_SaveSlots(CMenuMultiChoiceTwoLinesTriggered *widget);
+
+void
+DisplayWarningControllerMsg()
+{
+	if ( CPad::bDisplayNoControllerMessage )
+	{
+		CSprite2d::DrawRect(CRect(X(20.0f), Y(140.0f), X(620.0f), Y(328.0)), CRGBA(64, 16, 16, 224)); // CRect(20.0f, 160.0f, 620.0f, 374.857117f)
+		
+		CFont::SetFontStyle(FONT_BANK);
+		CFont::SetBackgroundOff();
+		CFont::SetScale(X(0.84f), Y(1.26f)); // 1.440000
+		CFont::SetPropOn();
+		CFont::SetCentreOff();
+		CFont::SetJustifyOn();
+		CFont::SetRightJustifyOff();
+		CFont::SetBackGroundOnlyTextOn();
+		CFont::SetWrapx(SCRW-X(40.0f)); // 600.0f
+		
+		CPlaceableShText text;
+		text.SetPosition(X(60.0f), Y(180.0f), false); // 205.714294
+		text.SetColor(CRGBA(152, 152, 152, 255));
+		text.m_text = TheText.Get("NOCONTE"); // Please re-insert the analog controller (DUALSHOCK@) or analog controller (DUALSHOCK@2) in controller port 1 to continue
+		text.SetShadows(true, TEXT_SHADOW_COLOR, SHADOW_VECTOR*2.0f);
+		text.SetAlpha(255);
+		text.DrawShWrap(0.0f, 0.0f, X(600.0f+SHADOW_VECTOR.x), YF(600.0f)); //TODO check
+		
+		CFont::DrawFonts();
+	}
+	else if ( CPad::bObsoleteControllerMessage )
+	{
+		CSprite2d::DrawRect(CRect(X(20.0f), Y(140.0f), X(620.0f), Y(328.0)), CRGBA(64, 16, 16, 224)); // CRect(20.0f, 160.0f, 620.0f, 374.857117f)
+		CFont::SetFontStyle(FONT_BANK);
+		CFont::SetBackgroundOff();
+		CFont::SetScale(X(0.84f), Y(1.26f)); // 1.440000
+		CFont::SetPropOn();
+		CFont::SetCentreOff();
+		CFont::SetJustifyOn();
+		CFont::SetRightJustifyOff();
+		CFont::SetBackGroundOnlyTextOn();
+		CFont::SetWrapx(SCRW-X(40.0f)); // 600.0f
+		
+		CPlaceableShText text;
+		text.SetPosition(X(60.0f), Y(180.0f), false); // 205.714294
+		text.SetColor(CRGBA(152, 152, 152, 255));
+		text.m_text = TheText.Get("WRCONTE"); // Please re-insert the analog controller (DUALSHOCK@) or analog controller (DUALSHOCK@2) in controller port 1 to continue
+		text.SetShadows(true, TEXT_SHADOW_COLOR, SHADOW_VECTOR*2.0f);
+		text.SetAlpha(255);
+		text.DrawShWrap(0.0f, 0.0f, X(600.0f+SHADOW_VECTOR.x), YF(600.0f)); //TODO check
+		
+		CFont::DrawFonts();
+	}
+	
+}
+
+void
+TriggerMCSUM_Yes(CMenuMultiChoiceTriggered *widget)	
+{
+	if ( widget )
+		bMemoryCardStartUpMenus_ExitNow = true;
+}
+
+int32 nStatLinesIndex;
+wchar aStatLines[50+1][50];
+wchar *PrintStatLine(char const *text, void *stat, unsigned char itsFloat, void *stat2)
+{
+	if (text && stat && nStatLinesIndex < 50)
+	{
+		char  line [64];
+		wchar uline[64];
+		
+		memset(line, 0, sizeof(line));
+		memset(uline, 0, sizeof(uline));
+
+		if (stat2)
+		{
+			if ( itsFloat )
+				sprintf(line, "  %.2f %s %.2f", *(float*)stat, UnicodeToAscii(TheText.Get("FEST_OO")), *(float*)stat2);
+			else
+				sprintf(line, "  %d %s %d", *(int32*)stat, UnicodeToAscii(TheText.Get("FEST_OO")), *(int32*)stat2);
+		}
+		else
+		{
+			if (itsFloat)
+				sprintf(line, "  %.2f", *(float*)stat);
+			else
+				sprintf(line, "  %d", *(int32*)stat);
+		}
+		
+		wchar *pStatLine = aStatLines[nStatLinesIndex++];
+		
+		AsciiToUnicode(line, uline);
+		UnicodeStrcpy(pStatLine, uline);
+		
+		return pStatLine;
+	}
+
+	return nil;
+}
+
+void
+DisplayMemoryCardAccessMsg(wchar *msg, CRGBA const &color)	
+{	
+	CSprite2d::DrawRect(CRect(X(70.0f), Y(100.0f), X(570.0f), Y(270.0f)), color);
+	
+	CFont::SetFontStyle(FONT_BANK);
+	CFont::SetBackgroundOff();
+	CFont::SetScale(X(MEMCARD_ACCESS_MSG_SIZE_X), Y(MEMCARD_ACCESS_MSG_SIZE_Y));
+	CFont::SetPropOn();
+	CFont::SetJustifyOn();
+	CFont::SetRightJustifyOff();
+	CFont::SetBackGroundOnlyTextOn();
+	CFont::SetWrapx(SCRW-X(90.0f)); // 550.0f
+	CFont::SetCentreOn();
+	CFont::SetCentreSize(SCRW-X(180.0f)); // 460.0f
+	
+	CPlaceableShText text;
+	
+	text.SetPosition(X(320.0f), Y(120.0f), false); // 137.142868
+	text.SetColor(CRGBA(200, 200, 200, 255));
+	text.m_text = msg;
+		
+	text.SetShadows(true, TEXT_SHADOW_COLOR, SHADOW_VECTOR);
+	text.SetAlpha(255);
+	text.Draw(0.0f, 0.0f);
+	
+	CFont::DrawFonts();
+	DoRWStuffEndOfFrame();
+}
+
+void
+FillMenuWithMemCardFileListing(CMenuMultiChoiceTwoLinesTriggered *widget, void (*cancelTrigger)(CMenuMultiChoiceTwoLinesTriggered *), void (*selectTrigger)(CMenuMultiChoiceTwoLinesTriggered *), wchar *text, int32 y, int32 height, int32 offset)
+{
+	if ( widget )
+	{
+		int32 selected = 0;
+		if ( bMemoryCardSpecialZone )
+			selected = widget->m_cursor != -1 ? widget->m_cursor : 0;
+		
+		widget->DeactivateMenu(); // TODO check
+		widget->m_numOptions = 0;
+		widget->AddTitle(nil, 0.0f, 0.0f, 0);
+		
+		TheMemoryCard.PopulateSlotInfo(CARD_ONE);
+		
+		if ( TheMemoryCard.GetError() == CMemoryCard::NO_ERR_SUCCESS)
+		{
+			widget->AddOption(TheText.Get("FES_CAN"), 0.0f, YF(y), cancelTrigger, 0, 0);
+			
+			FrontEndMenuManager.field_3C = 0;
+			
+			y += offset;
+			
+			char buff[100];
+			
+			for ( int32 i = 0; i < CMemoryCard::MAX_SLOTS; i++ )
+			{
+				// SAVE FILE
+				sprintf(buff, "%s %d ", UnicodeToAscii(TheText.Get("FES_SLO")), i+1);
+				AsciiToUnicode(buff, MemoryCard_FileNames[i]);
+				
+				wchar *datetime = nil;
+				
+				switch ( TheMemoryCard.GetInfoOnSpecificSlot(i) )
+				{
+					case CMemoryCard::SLOT_CORRUPTED:
+					{
+						UnicodeStrcat(MemoryCard_FileNames[i], TheText.Get("FES_ISC")); // IS CORRUPTED
+						datetime = TheMemoryCard.GetDateAndTimeOfSavedGame(i);
+						break;
+					}
+					case CMemoryCard::SLOT_PRESENT:
+					{
+						if ( TheMemoryCard.GetNameOfSavedGame(i) != nil )
+						{
+							UnicodeStrcpy(MemoryCard_FileNames[i], TheMemoryCard.GetNameOfSavedGame(i));
+							datetime = TheMemoryCard.GetDateAndTimeOfSavedGame(i);
+						}
+						else
+						{
+							UnicodeStrcpy(MemoryCard_FileNames[i], TheText.Get("FES_SAG")); // PRESENT
+							datetime = TheMemoryCard.GetDateAndTimeOfSavedGame(i);
+						}
+						break;
+					}
+					case CMemoryCard::SLOT_NOTPRESENT:
+					{
+						UnicodeStrcat(MemoryCard_FileNames[i], TheText.Get("FES_ISF"));
+						datetime = TheMemoryCard.GetDateAndTimeOfSavedGame(i);
+						break;
+					}
+				}
+				
+				widget->AddOption(MemoryCard_FileNames[i], 0.0f, YF(y), datetime, 0.0f, YF(float(y)+(0.44f*height)), selectTrigger, 0, 0);
+				y += height;
+			}
+		}
+		else
+		{
+			if ( !gErrorSampleTriggered )
+			{
+				DMAudio.PlayFrontEndSound(SOUND_FRONTEND_FAIL, 0);
+				gErrorSampleTriggered = true;
+			}
+			
+			// Cancel
+			widget->AddOption(TheText.Get("FES_CAN"), 0.0f, YF(y+(height*2)), cancelTrigger, 0, 0);
+			
+			FrontEndMenuManager.field_3C = 1;
+			
+			y += height;
+			
+			TheMemoryCard.PopulateErrorMessage();
+			
+			// Error Reading Memory Card (PS2) in MEMORY CARD slot 1 please check and try again.
+			if ( TheMemoryCard.GetErrorMessage())
+				widget->AddTitle(TheMemoryCard.GetErrorMessage(), 0.0f, YF(y), 0);
+			else
+				widget->AddTitle(TheText.Get("FES_GME"), 0.0f, YF(y), 0);
+		}
+		
+		widget->SetMenuSelection(0);
+		widget->ActivateMenu(1);
+		
+		if ( bMemoryCardSpecialZone )
+		{
+			widget->GoFirst();
+			
+			for ( int32 i = 0; i < selected; i++ )
+				widget->GoNext();
+		}
+	}
+}
+
+void
+TriggerSaveZone_FormatFailedOK(CMenuMultiChoiceTriggered *widget)
+{
+	if ( widget )
+		pActiveMenuPage = &MenuPageSaveZone_SaveGame;
+}
+
+void
+TriggerSaveZone_BackToMainMenu(CMenuMultiChoiceTriggered *widget)
+{
+	bMemoryCardSpecialZone = false;
+	bIgnoreTriangleButton = false;
+	pActiveMenuPage = &MenuPageSaveZone_SaveGame;
+}
+
+void
+TriggerSaveZone_QuitMenu(CMenuMultiChoiceTriggered *widget)
+{
+	if ( widget )
+	{
+		FrontEndMenuManager.m_bMenuActive = false;
+		FrontEndMenuManager.m_bInSaveZone = false;
+		CTimer::EndUserPause();
+	}
+}
+
+void
+TriggerSaveZone_FormatCard(CMenuMultiChoiceTriggered *widget)
+{
+	if ( widget )
+	{
+		FillMenuWithMemCardFileListing(&MenuSaveZoneSSL_1, TriggerSaveZone_BackToMainMenuTwoLines, TriggerSaveZone_SaveSlots, nil, 0, 34, 22);
+		
+		if ( TheMemoryCard.GetError() == CMemoryCard::NO_ERR_SUCCESS)
+		{
+			MenuSaveZoneMSG_1.m_numTexts = 0;
+			MenuSaveZoneMSG_1.AddText(TheText.Get("FES_AFO"), X(-80.0f), 0.0f, TEXT_COLOR, 0);
+			
+			MenuSaveZoneMSG_2.m_numOptions = 0;
+			MenuSaveZoneMSG_2.AddOption(TheText.Get("FESZ_OK"), X(100.0f), YF(5.0f), TriggerSaveZone_BackToMainMenu, 0, 0);
+			
+			MenuPageSaveZone_Message.ActivatePage();
+			pActiveMenuPage = &MenuPageSaveZone_Message;
+		}
+		else if ( TheMemoryCard.GetError() != CMemoryCard::ERR_NOFORMAT)
+		{
+			MenuSaveZoneMSG_1.m_numTexts = 0;
+			MenuSaveZoneMSG_1.AddText(TheMemoryCard.GetErrorMessage(), X(-80.0f), 0.0f, TEXT_COLOR, 0);
+			
+			MenuSaveZoneMSG_2.m_numOptions = 0;
+			MenuSaveZoneMSG_2.AddOption(TheText.Get("FESZ_OK"), X(100.0f), YF(15.0f), TriggerSaveZone_BackToMainMenu, 0, 0);
+			
+			MenuPageSaveZone_Message.ActivatePage();
+			pActiveMenuPage = &MenuPageSaveZone_Message;
+		}
+		else
+		{
+			if ( !MemCardAccessTriggerCaller.CanCall() )
+				MemCardAccessTriggerCaller.SetTrigger(TriggerSaveZone_FormatCard, widget);
+			else
+			{
+				// Formatting Memory Card (PS2) in MEMORY CARD slot 1.  Please do not remove the Memory Card (PS2), reset or switch off the console.
+				DisplayMemoryCardAccessMsg(TheText.Get("FEFD_WR"), CRGBA(200, 50, 50, 192));
+				TheMemoryCard.FormatCard(CARD_ONE);
+				
+				if ( TheMemoryCard.GetError() == CMemoryCard::NO_ERR_SUCCESS )
+					pActiveMenuPage = &MenuPageSaveZone_SaveGame;
+				else
+				{
+					TheMemoryCard.PopulateErrorMessage();
+					
+					wchar *error = TheText.Get("FESZ_FF"); // Format Failed! Check Memory Card (PS2) in MEMORY CARD slot 1 and please try again.
+					
+					// missing switch
+					
+					if ( !error ) error = TheText.Get("FES_GME"); // Error Reading Memory Card (PS2) in MEMORY CARD slot 1 please check and try again.
+					
+					MenuSaveZoneMSG_1.m_numTexts = 0;
+					MenuSaveZoneMSG_1.AddText(error, X(-80.0f), 0.0f, TEXT_COLOR, 0);
+					
+					MenuSaveZoneMSG_2.m_numOptions = 0;
+					MenuSaveZoneMSG_2.AddOption(TheText.Get("FESZ_OK"), X(100.0f), YF(20.0f), TriggerSaveZone_BackToMainMenu, 0, 0);
+					
+					MenuPageSaveZone_Message.ActivatePage();
+					pActiveMenuPage = &MenuPageSaveZone_Message;
+				}
+				
+				if ( TheMemoryCard.GetError() == CMemoryCard::NO_ERR_SUCCESS )
+				{
+					FillMenuWithMemCardFileListing(&MenuSaveZoneSSL_1, TriggerSaveZone_BackToMainMenuTwoLines, TriggerSaveZone_SaveSlots, nil, 0, 34, 22);
+					pActiveMenuPage = &MenuPageSaveZone_SaveSlots;
+					bMemoryCardSpecialZone = true;
+					bIgnoreTriangleButton = true;
+					pActiveMenuPage->ActivatePage();
+				}
+				else
+				{
+					TheMemoryCard.PopulateErrorMessage();
+					
+					// Format Failed! Check Memory Card (PS2) in MEMORY CARD slot 1 and please try again.
+					wchar *error = TheText.Get("FESZ_FF");
+					
+					switch ( TheMemoryCard.GetError() )
+					{
+						case CMemoryCard::ERR_WRITEFULLDEVICE:
+						case CMemoryCard::ERR_DIRFULLDEVICE:
+						case CMemoryCard::ERR_SAVEFAILED:
+						{
+							error = TheMemoryCard.GetErrorMessage();
+							break;
+						}
+					}
+					
+					// Error Reading Memory Card (PS2) in MEMORY CARD slot 1 please check and try again.
+					if ( !error ) error = TheText.Get("FES_GME");
+					
+					MenuSaveZoneMSG_1.m_numTexts = 0;
+					MenuSaveZoneMSG_1.AddText(error, X(-80.0f), 0.0f, TEXT_COLOR, 0);
+					
+					MenuSaveZoneMSG_2.m_numOptions = 0;
+					MenuSaveZoneMSG_2.AddOption(TheText.Get("FESZ_OK"), X(100.0f), YF(20.0f), TriggerSaveZone_BackToMainMenu, 0, 0);
+					
+					MenuPageSaveZone_Message.ActivatePage();
+					pActiveMenuPage = &MenuPageSaveZone_Message;
+				}
+			}
+		}
+	}
+}
+
+void
+TriggerSaveZone_FormatCardSelect(CMenuMultiChoiceTriggered *widget)
+{
+	if ( widget )
+	{
+		FillMenuWithMemCardFileListing(&MenuSaveZoneSSL_1, TriggerSaveZone_BackToMainMenuTwoLines, TriggerSaveZone_SaveSlots, nil, 0, 34, 22);
+		
+		if ( TheMemoryCard.GetError() == CMemoryCard::NO_ERR_SUCCESS )
+		{
+			// This Memory Card (PS2) is already formatted.
+			MenuSaveZoneMSG_1.m_numTexts = 0;
+			MenuSaveZoneMSG_1.AddText(TheText.Get("FES_AFO"), X(-80.0f), 0.0f, TEXT_COLOR, 0);
+			
+			MenuSaveZoneMSG_2.m_numOptions = 0;
+			MenuSaveZoneMSG_2.AddOption(TheText.Get("FESZ_OK"), X(100.0f), YF(5.0f), TriggerSaveZone_BackToMainMenu, 0, 0);
+			
+			MenuPageSaveZone_Message.ActivatePage();
+			pActiveMenuPage = &MenuPageSaveZone_Message;
+		}
+		else if ( TheMemoryCard.GetError() != CMemoryCard::ERR_NOFORMAT )
+		{
+			MenuSaveZoneMSG_1.m_numTexts = 0;
+			MenuSaveZoneMSG_1.AddText(TheMemoryCard.GetErrorMessage(), X(-80.0f), 0.0f, TEXT_COLOR, 0);
+			
+			MenuSaveZoneMSG_2.m_numOptions = 0;
+			MenuSaveZoneMSG_2.AddOption(TheText.Get("FESZ_OK"), X(100.0f), YF(15.0f), TriggerSaveZone_BackToMainMenu, 0, 0);
+			
+			MenuPageSaveZone_Message.ActivatePage();
+			pActiveMenuPage = &MenuPageSaveZone_Message;
+		}
+		else
+		{
+			// Are you sure you wish to format the Memory Card (PS2) in MEMORY CARD slot 1? 
+			MenuSaveZoneQYN_1.m_numTexts = 0;
+			MenuSaveZoneQYN_1.AddText(TheText.Get("FESZ_QF"), X(-40.0f), 0.0f, TEXT_COLOR, 0);
+			
+			MenuSaveZoneQYN_2.m_numOptions = 0;
+			MenuSaveZoneQYN_2.AddOption(TheText.Get("FEM_NO"),  X(80.0f), YF(20.0f), TriggerSaveZone_BackToMainMenu, 0, 0);
+			MenuSaveZoneQYN_2.AddOption(TheText.Get("FEM_YES"), X(80.0f), 0.0f,  TriggerSaveZone_FormatCard,     0, 0);
+			
+			MenuPageSaveZone_QuestionYesNo.ActivatePage();
+			pActiveMenuPage = &MenuPageSaveZone_QuestionYesNo;
+		}
+	}
+}
+
+void
+TriggerSaveZone_DeleteSaveGame(CMenuMultiChoiceTriggered *widget)
+{	
+	if ( widget )
+	{
+		bMemoryCardSpecialZone = false;
+		bIgnoreTriangleButton = false;
+		
+		if ( !MemCardAccessTriggerCaller.CanCall() )
+			MemCardAccessTriggerCaller.SetTrigger(TriggerSaveZone_DeleteSaveGame, widget);
+		else
+		{
+			// Overwriting data. Please do not remove the Memory Card (PS2) in MEMORY CARD slot 1, reset or switch off the console.
+			DisplayMemoryCardAccessMsg(TheText.Get("FESZ_OW"), CRGBA(200, 50, 50, 192));
+			
+			TheMemoryCard.DeleteSlot(MemoryCardSlotSelected);
+			
+			if ( TheMemoryCard.GetError() != CMemoryCard::NO_ERR_SUCCESS )
+			{
+				TheMemoryCard.PopulateErrorMessage();
+				
+				wchar *error = TheText.Get("FES_DEE"); // Deleting Failed! Check Memory Card (PS2) in MEMORY CARD slot 1 and please try again.
+				
+				// switch missing
+				
+				if ( !error ) error = TheText.Get("FES_GME"); // Error Reading Memory Card (PS2) in MEMORY CARD slot 1 please check and try again.
+				
+				MenuSaveZoneMSG_1.m_numTexts = 0;
+				MenuSaveZoneMSG_1.AddText(error, X(-80.0f), 0.0f, TEXT_COLOR, 0);
+				
+				MenuSaveZoneMSG_2.m_numOptions = 0;
+				MenuSaveZoneMSG_2.AddOption(TheText.Get("FESZ_OK"), X(100.0f), YF(20.0f), TriggerSaveZone_BackToMainMenu, 0, 0);
+				
+				MenuPageSaveZone_Message.ActivatePage();
+				pActiveMenuPage = &MenuPageSaveZone_Message;
+			}
+			else
+			{
+				TheMemoryCard.SaveSlot(MemoryCardSlotSelected);
+				
+				if ( TheMemoryCard.GetError() == CMemoryCard::NO_ERR_SUCCESS )
+				{
+					// Game saved successfully!
+					MenuSaveZoneMSG_1.m_numTexts = 0;
+					MenuSaveZoneMSG_1.AddText(TheText.Get("FESZ_L1"), X(-20.0f), YF(10.0f), TEXT_COLOR, 0);
+					
+					MenuSaveZoneMSG_2.m_numOptions = 0;
+					MenuSaveZoneMSG_2.AddOption(TheText.Get("FESZ_OK"), X(110.0f), 0.0f, TriggerSaveZone_QuitMenu, 0, 0);
+					
+					MenuPageSaveZone_Message.ActivatePage();
+					pActiveMenuPage = &MenuPageSaveZone_Message;
+				}
+				else
+				{
+					TheMemoryCard.PopulateErrorMessage();
+					
+					wchar *error = TheText.Get("FESZ_SR"); // Save Failed! Check Memory Card (PS2) in MEMORY CARD slot 1 and please try again.
+					
+					switch ( TheMemoryCard.GetError() )
+					{
+						case CMemoryCard::ERR_WRITEFULLDEVICE:
+						case CMemoryCard::ERR_DIRFULLDEVICE:
+						case CMemoryCard::ERR_SAVEFAILED:
+						{
+							error = TheMemoryCard.GetErrorMessage();
+							break;
+						}
+					}
+					
+					if ( !error ) error = TheText.Get("FES_GME"); // Error Reading Memory Card (PS2) in MEMORY CARD slot 1 please check and try again.
+					
+					MenuSaveZoneMSG_1.m_numTexts = 0;
+					MenuSaveZoneMSG_1.AddText(error, X(-80.0f), 0.0f, TEXT_COLOR, 0);
+					
+					MenuSaveZoneMSG_2.m_numOptions = 0;
+					MenuSaveZoneMSG_2.AddOption(TheText.Get("FESZ_OK"), X(120.0f), YF(30.0f), TriggerSaveZone_BackToMainMenu, 0, 0);
+					
+					MenuPageSaveZone_Message.ActivatePage();
+					pActiveMenuPage = &MenuPageSaveZone_Message;
+				}
+			}
+		}
+	}
+}
+
+void
+TriggerSaveZone_SaveGame(CMenuMultiChoiceTriggered *widget)
+{	
+	if ( widget )
+	{
+		bMemoryCardSpecialZone = false;
+		bIgnoreTriangleButton  = false;
+		if ( !MemCardAccessTriggerCaller.CanCall() )
+			MemCardAccessTriggerCaller.SetTrigger(TriggerSaveZone_SaveGame, widget);
+		else
+		{
+			DisplayMemoryCardAccessMsg(TheText.Get("FESZ_WR"), CRGBA(200, 50, 50, 192));
+			
+			TheMemoryCard.SaveSlot(MemoryCardSlotSelected);
+			
+			if ( TheMemoryCard.GetError() == CMemoryCard::NO_ERR_SUCCESS )
+			{
+				// Game saved successfully!
+				MenuSaveZoneMSG_1.m_numTexts = 0;
+				MenuSaveZoneMSG_1.AddText(TheText.Get("FESZ_L1"), X(-20.0f), YF(10.0f), TEXT_COLOR, 0);
+				
+				MenuSaveZoneMSG_2.m_numOptions = 0;
+				MenuSaveZoneMSG_2.AddOption(TheText.Get("FESZ_OK"), X(110.0f), 0.0f, TriggerSaveZone_QuitMenu, 0, 0);
+				
+				MenuPageSaveZone_Message.ActivatePage();
+				pActiveMenuPage = &MenuPageSaveZone_Message;
+			}
+			else
+			{
+				TheMemoryCard.PopulateErrorMessage();
+				
+				wchar *error = TheText.Get("FESZ_SR"); // Save Failed! Check Memory Card (PS2) in MEMORY CARD slot 1 and please try again.
+				
+				switch ( TheMemoryCard.GetError() )
+				{
+					case CMemoryCard::ERR_WRITEFULLDEVICE:
+					case CMemoryCard::ERR_DIRFULLDEVICE:
+					case CMemoryCard::ERR_SAVEFAILED:
+					{
+						error = TheMemoryCard.GetErrorMessage();
+						break;
+					}
+				}
+				
+				if ( !error ) error = TheText.Get("FES_GME"); // Error Reading Memory Card (PS2) in MEMORY CARD slot 1 please check and try again.
+				
+				MenuSaveZoneMSG_1.m_numTexts = 0;
+				MenuSaveZoneMSG_1.AddText(error, X(-80.0f), 0.0f, TEXT_COLOR, 0);
+				
+				MenuSaveZoneMSG_2.m_numOptions = 0;
+				MenuSaveZoneMSG_2.AddOption(TheText.Get("FESZ_OK"), X(120.0f), YF(30.0f), TriggerSaveZone_BackToMainMenu, 0, 0);
+				
+				MenuPageSaveZone_Message.ActivatePage();
+				pActiveMenuPage = &MenuPageSaveZone_Message;
+			}
+		}
+	}
+}
+
+void
+TriggerSaveZone_SaveSlots(CMenuMultiChoiceTwoLinesTriggered *widget)
+{
+	if ( widget )
+	{
+		if ( widget->GetMenuSelection() > 0 )
+		{
+			MemoryCardSlotSelected = widget->GetMenuSelection() - 1;
+			
+			switch ( TheMemoryCard.GetInfoOnSpecificSlot(MemoryCardSlotSelected) )
+			{
+				case CMemoryCard::SLOT_PRESENT:
+				case CMemoryCard::SLOT_CORRUPTED:
+				{
+					// Proceed with overwriting this saved game? 
+					MenuSaveZoneQYN_1.m_numTexts = 0;
+					MenuSaveZoneQYN_1.AddText(TheText.Get("FESZ_QO"), X(-40.0f), 0.0f, TEXT_COLOR, 0);
+					
+					MenuSaveZoneQYN_2.m_numOptions = 0;
+					MenuSaveZoneQYN_2.AddOption(TheText.Get("FEM_NO"),  X(80.0f), YF(20.0f), TriggerSaveZone_BackToMainMenu, 0, 0);
+					MenuSaveZoneQYN_2.AddOption(TheText.Get("FEM_YES"), X(80.0f), 0.0f,  TriggerSaveZone_DeleteSaveGame, 0, 0);
+					
+					MenuPageSaveZone_QuestionYesNo.ActivatePage();
+					bMemoryCardSpecialZone = false;
+					pActiveMenuPage = &MenuPageSaveZone_QuestionYesNo;
+					break;
+				}
+				
+				case CMemoryCard::SLOT_NOTPRESENT:
+				{
+					// PROCEED WITH SAVE ?
+					MenuSaveZoneQYN_1.m_numTexts = 0;
+					MenuSaveZoneQYN_1.AddText(TheText.Get("FESZ_QS"), X(-40.0f), 0.0f, TEXT_COLOR, 0);
+					
+					MenuSaveZoneQYN_2.m_numOptions = 0;
+					MenuSaveZoneQYN_2.AddOption(TheText.Get("FEM_NO"),  X(80.0f), YF(20.0f), TriggerSaveZone_BackToMainMenu, 0, 0);
+					MenuSaveZoneQYN_2.AddOption(TheText.Get("FEM_YES"), X(80.0f), 0.0f,  TriggerSaveZone_SaveGame,       0, 0);
+					
+					MenuPageSaveZone_QuestionYesNo.ActivatePage();
+					bMemoryCardSpecialZone = false;
+					pActiveMenuPage = &MenuPageSaveZone_QuestionYesNo;
+					break;
+				}
+			}
+		}
+	}
+}
+
+void
+TriggerSaveZone_SaveGameSelect(CMenuMultiChoiceTriggered *widget)
+{	
+	if ( widget )
+	{
+		FillMenuWithMemCardFileListing(&MenuSaveZoneSSL_1, TriggerSaveZone_BackToMainMenuTwoLines, TriggerSaveZone_SaveSlots, nil, 0, 34, 22);
+		
+		if ( TheMemoryCard.GetError() == CMemoryCard::ERR_NOFORMAT)
+		{
+			gErrorSampleTriggered = false;
+			pActiveMenuPage = &MenuPageSaveZone_FormatCard;
+		}
+		else
+		{
+			bMemoryCardSpecialZone = true;
+			bIgnoreTriangleButton  = true;
+			pActiveMenuPage = &MenuPageSaveZone_SaveSlots;
+		}
+		
+		pActiveMenuPage->ActivatePage();
+	}
+}
+
+void
+TriggerControls_Vibrations(CMenuOnOffTriggered *widget)
+{
+	if ( widget )
+	{
+		CMenuManager::m_PrefsUseVibration = widget->GetMenuSelection();
+		if ( CMenuManager::m_PrefsUseVibration )
+		{
+			CPad::GetPad(0)->StartShake(300, 150);
+			TimeToStopPadShaking = CTimer::GetTimeInMillisecondsPauseMode() + 500;
+		}
+	}
+}
+
+void
+TriggerControls_ContrDisplay(CMenuMultiChoiceTriggeredAlways *widget)
+{
+	if ( widget )
+	{
+		int32 conf = MenuControls_1.GetMenuSelection();
+		int32 i  = MenuControls_2.GetMenuSelection();
+		if ( i == 1 )
+		{
+			if ( conf == CMenuManager::CONFIG_2 )
+				MenuPage_Controls.m_controls[0] = &MenuControls_7;
+			else
+				MenuPage_Controls.m_controls[0] = &MenuControls_4;
+		}
+		else if ( i == 0 )
+		{
+			if ( conf == CMenuManager::CONFIG_2 )
+				MenuPage_Controls.m_controls[0] = &MenuControls_6;
+			else
+				MenuPage_Controls.m_controls[0] = &MenuControls_3;
+		}
+	}
+}
+
+void
+TriggerControls_DrawHNContrConfig(CMenuMultiChoiceTriggeredAlways *widget)
+{
+	if ( widget )
+	{
+		int32 conf = widget->GetMenuSelection();
+		
+		InitialiseTextsInMenuControllerOnFoot(&MenuControls_3, (CMenuManager::CONTRCONFIG)conf);
+		InitialiseTextsInMenuControllerInCar (&MenuControls_4, (CMenuManager::CONTRCONFIG)conf);
+		
+		int32 i = MenuControls_2.GetMenuSelection();
+		if ( i == 1 )
+		{
+			if ( conf == CMenuManager::CONFIG_2 )
+				MenuPage_Controls.m_controls[0] = &MenuControls_7;
+			else
+				MenuPage_Controls.m_controls[0] = &MenuControls_4;
+		}
+		else if ( i == 0 )
+		{
+			if ( conf == CMenuManager::CONFIG_2 )
+				MenuPage_Controls.m_controls[0] = &MenuControls_6;
+			else
+				MenuPage_Controls.m_controls[0] = &MenuControls_3;
+		}
+	}
+}
+
+void
+TriggerControls_DrawContrConfig(CMenuMultiChoiceTriggeredAlways *widget)
+{
+	if ( widget )
+	{
+		int32 conf = widget->GetMenuSelection();
+		if ( widget->m_cursor != -1 )
+			conf = widget->m_cursor;
+		
+		InitialiseTextsInMenuControllerOnFoot(&MenuControls_3, (CMenuManager::CONTRCONFIG)conf);
+		InitialiseTextsInMenuControllerInCar(&MenuControls_4, (CMenuManager::CONTRCONFIG)conf);
+		
+		int32 i = MenuControls_2.GetMenuSelection();
+		if ( i == 1 )
+		{
+			if ( conf == CMenuManager::CONFIG_2 )
+				MenuPage_Controls.m_controls[0] = &MenuControls_7;
+			else
+				MenuPage_Controls.m_controls[0] = &MenuControls_4;
+		}
+		else if ( i == 0 )
+		{
+			if ( conf == CMenuManager::CONFIG_2 )
+				MenuPage_Controls.m_controls[0] = &MenuControls_6;
+			else
+				MenuPage_Controls.m_controls[0] = &MenuControls_3;
+		}
+	}
+}
+
+void
+TriggerControls_ContrConfig(CMenuMultiChoiceTriggered *widget)
+{
+	if ( widget )
+	{
+		int32 conf = widget->GetMenuSelection();
+		
+		InitialiseTextsInMenuControllerOnFoot(&MenuControls_3, (CMenuManager::CONTRCONFIG)conf);
+		InitialiseTextsInMenuControllerInCar(&MenuControls_4, (CMenuManager::CONTRCONFIG)conf);
+		
+		int32 i = MenuControls_2.GetMenuSelection();
+		if ( i == 1 )
+		{
+			if ( conf == CMenuManager::CONFIG_2 )
+				MenuPage_Controls.m_controls[0] = &MenuControls_7;
+			else
+				MenuPage_Controls.m_controls[0] = &MenuControls_4;
+		}
+		else if ( i == 0 )
+		{
+			if ( conf == CMenuManager::CONFIG_2 )
+				MenuPage_Controls.m_controls[0] = &MenuControls_6;
+			else
+				MenuPage_Controls.m_controls[0] = &MenuControls_3;
+		}
+	}
+}
+
+void
+TriggerLanguage_Language(CMenuMultiChoiceTriggered *widget)
+{	
+	if ( widget )
+	{
+		if ( CMenuManager::m_PrefsLanguage != widget->GetMenuSelection() )
+		{
+			CMenuManager::m_PrefsLanguage = widget->GetMenuSelection();
+			FrontEndMenuManager.m_bInitialised = false;
+			bFrontEnd_ReloadObrTxtGxt = true;
+		}
+	}
+}
+
+void
+TriggerAudio_RadioStation(CMenuMultiChoicePicturedTriggered *widget)
+{
+	if ( widget )
+	{
+		if ( CMenuManager::m_PrefsRadioStation != widget->GetMenuSelection() )
+		{
+			CMenuManager::m_PrefsRadioStation = widget->GetMenuSelection();
+			DMAudio.PlayFrontEndTrack(CMenuManager::m_PrefsRadioStation, 1);
+			DMAudio.SetRadioInCar(CMenuManager::m_PrefsRadioStation);
+		}
+	}
+}
+
+void
+TriggerAudio_StereoMono(CMenuMultiChoiceTriggered *widget)
+{
+	if ( widget )
+	{	
+		if (widget->GetMenuSelection() == 1)
+		{
+			DMAudio.SetMonoMode(true);
+			DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MONO, 0);
+		}
+		else
+		{
+			DMAudio.SetMonoMode(false);
+			DMAudio.PlayFrontEndSound(SOUND_FRONTEND_STEREO, 0);
+		}
+	}
+}
+
+void
+TriggerAudio_MusicVolumeAlways(CMenuSliderTriggered *widget)
+{
+	;
+}
+
+void
+TriggerAudio_SfxVolumeAlways(CMenuSliderTriggered *widget)
+{
+	if ( widget )
+	{
+		static bool bTriggerTest = false;
+		
+		CMenuManager::m_PrefsSfxVolume = float(widget->GetMenuSelection()) / 100.0f * 127.0f + 0.5f;
+		
+		if ( CMenuManager::m_PrefsSfxVolume == 102 && !CPad::GetPad(0)->GetDPadLeft()&& !CPad::GetPad(0)->GetDPadRight() )
+		{
+			if ( bTriggerTest )
+			{
+				DMAudio.PlayFrontEndSound(SOUND_FRONTEND_AUDIO_TEST, 0);
+				bTriggerTest = false;
+			}
+		}
+		else
+			bTriggerTest = true;
+		
+		FrontEndMenuManager.SetSoundLevelsForMusicMenu();
+	}
+}
+
+void
+TriggerAudio_MusicVolume(CMenuSliderTriggered *widget)
+{	
+	if ( widget )
+	{
+		CMenuManager::m_PrefsMusicVolume = float(widget->GetMenuSelection()) / 100.0f * 127.0f + 0.5f;
+		FrontEndMenuManager.SetSoundLevelsForMusicMenu();
+	}
+}
+
+void
+TriggerAudio_SfxVolume(CMenuSliderTriggered *widget)
+{
+	;
+}
+
+void
+TriggerSave_NewGameNewGame(CMenuMultiChoiceTriggered *widget)
+{	
+	FrontEndMenuManager.m_bWantToRestart = true;
+	FrontEndMenuManager.m_bMenuActive    = false;
+	FrontEndMenuManager.m_bInSaveZone    = false;
+	bIgnoreTriangleButton = false;
+	
+	CTimer::EndUserPause();
+	
+	FrontEndMenuManager.AnaliseMenuContents();
+	
+	DMAudio.SetEffectsFadeVol(0);
+	DMAudio.SetMusicFadeVol(0);
+	DMAudio.ResetTimers(CTimer::GetTimeInMilliseconds());
+}
+
+void
+TriggerSave_NewGameSelectYes(CMenuMultiChoiceTriggered *widget)
+{
+	// Are you sure you want to start a new game? All progress since the last save game will be lost. Proceed?
+	MenuSaveZoneQYN_1.m_numTexts = 0;
+	MenuSaveZoneQYN_1.AddText(TheText.Get("FESZ_QR"), X(-100.0f), 0.0f, TEXT_COLOR, 0);
+	
+	MenuSaveZoneQYN_2.m_numOptions = 0;
+	MenuSaveZoneQYN_2.AddOption(TheText.Get("FEM_NO"),  X(80.0f), YF(30.0f), TriggerSave_BackToMainMenu, 0, 0);
+	MenuSaveZoneQYN_2.AddOption(TheText.Get("FEM_YES"), X(80.0f), YF(10.0f), TriggerSave_NewGameNewGame, 0, 0);
+	
+	MenuPageSaveZone_QuestionYesNo.ActivatePage();
+	pMenuSave = &MenuPageSaveZone_QuestionYesNo;
+	bIgnoreTriangleButton = true;
+}
+
+void
+TriggerSave_DeleteGameDeleteGame(CMenuMultiChoiceTriggered *widget)
+{
+	if ( widget )
+	{
+		bMemoryCardSpecialZone = false;
+		bIgnoreTriangleButton  = false;
+		
+		if ( !MemCardAccessTriggerCaller.CanCall() )
+			MemCardAccessTriggerCaller.SetTrigger(TriggerSave_DeleteGameDeleteGame, widget);
+		else
+		{
+			// Deleting data. Please do not remove the Memory Card (PS2) in MEMORY CARD slot 1, reset or switch off the console.
+			DisplayMemoryCardAccessMsg(TheText.Get("FEDL_WR"), CRGBA(200, 50, 50, 192));
+			
+			TheMemoryCard.DeleteSlot(MemoryCardSlotSelected);
+			
+			if ( TheMemoryCard.GetError() != CMemoryCard::NO_ERR_SUCCESS)
+			{
+				// Deleting Failed! Check Memory Card (PS2) in MEMORY CARD slot 1 and please try again.
+				MenuSaveZoneMSG_1.m_numTexts = 0;
+				MenuSaveZoneMSG_1.AddText(TheText.Get("FES_DEE"), X(-80.0f), YF(20.0f), TEXT_COLOR, 0);
+				
+				MenuSaveZoneMSG_2.m_numOptions = 0;
+				MenuSaveZoneMSG_2.AddOption(TheText.Get("FESZ_OK"), X(100.0f), YF(15.0f), TriggerSave_BackToMainMenu, 0, 0);
+				
+				MenuPageSaveZone_Message.ActivatePage();
+				pMenuSave = &MenuPageSaveZone_Message;
+				
+				bMemoryCardSpecialZone = false;
+				bIgnoreTriangleButton  = true;
+			}
+			else
+			{
+				FillMenuWithMemCardFileListing(&MenuSaveLG_2, TriggerSave_BackToMainMenuTwoLines, TriggerSave_LoadGameLoadGameSelect,     nil, 0, 34, 22);
+				FillMenuWithMemCardFileListing(&MenuSaveDG_2, TriggerSave_BackToMainMenuTwoLines, TriggerSave_DeleteGameDeleteGameSelect, nil, 0, 34, 22);
+				
+				pMenuSave = &MenuPage_SaveBasic;
+				pMenuSave->ActivatePage();
+			}
+		}
+	}
+}
+
+void
+TriggerSave_DeleteGameDeleteGameSelect(CMenuMultiChoiceTwoLinesTriggered *widget)
+{
+	if ( widget )
+	{
+		if ( widget->GetMenuSelection() > 0 )
+		{
+			MemoryCardSlotSelected = widget->GetMenuSelection() - 1;
+			
+			switch ( TheMemoryCard.GetInfoOnSpecificSlot(MemoryCardSlotSelected) )
+			{
+				case CMemoryCard::SLOT_NOTPRESENT:
+				{
+					break;
+				}
+				case CMemoryCard::SLOT_CORRUPTED:
+				case CMemoryCard::SLOT_PRESENT:
+				{
+					// Proceed with deleting this saved game? 
+					MenuSaveZoneQYN_1.m_numTexts = 0;
+					MenuSaveZoneQYN_1.AddText(TheText.Get("FESZ_QD"), X(-40.0f), 0.0f, TEXT_COLOR, 0);
+					
+					MenuSaveZoneQYN_2.m_numOptions = 0;
+					MenuSaveZoneQYN_2.AddOption(TheText.Get("FEM_NO"), X(80.0f), YF(20.0f), TriggerSave_BackToMainMenu, 0, 0);
+					MenuSaveZoneQYN_2.AddOption(TheText.Get("FEM_YES"), X(80.0f), 0.0f, TriggerSave_DeleteGameDeleteGame, 0, 0);
+					
+					MenuPageSaveZone_QuestionYesNo.ActivatePage();
+					pMenuSave = &MenuPageSaveZone_QuestionYesNo;
+					bMemoryCardSpecialZone = false;
+					break;
+				}
+			}
+		}
+	}
+}
+
+void
+TriggerSave_DeleteGameSelect(CMenuMultiChoiceTriggered *widget)
+{	
+	FillMenuWithMemCardFileListing(&MenuSaveDG_2, TriggerSave_BackToMainMenuTwoLines, TriggerSave_DeleteGameDeleteGameSelect, nil, 0, 34, 22);
+	FillMenuWithMemCardFileListing(&MenuSaveLG_2, TriggerSave_BackToMainMenuTwoLines, TriggerSave_LoadGameLoadGameSelect,     nil, 0, 34, 22);
+	
+	pMenuSave = &MenuPage_SaveDeleteGame;
+	pMenuSave->ActivatePage();
+	
+	gErrorSampleTriggered  = false;
+	bMemoryCardSpecialZone = true;
+	bIgnoreTriangleButton  = true;
+}
+
+void
+TriggerSave_LoadGameLoadGame(CMenuMultiChoiceTriggered *widget)
+{	
+	if ( widget )
+	{
+		bMemoryCardSpecialZone = false;
+		bIgnoreTriangleButton  = false;
+		
+		if ( !MemCardAccessTriggerCaller.CanCall() )
+			MemCardAccessTriggerCaller.SetTrigger(TriggerSave_LoadGameLoadGame, widget);
+		else
+		{
+			// Loading data. Please do not remove the Memory Card (PS2) in MEMORY CARD slot 1, reset or switch off the console.
+			DisplayMemoryCardAccessMsg(TheText.Get("FELD_WR"), CRGBA(200, 50, 50, 192));
+			TheMemoryCard.LoadSlotToBuffer(MemoryCardSlotSelected);
+			
+			if ( TheMemoryCard.GetError() == CMemoryCard::NO_ERR_SUCCESS)
+			{
+				FrontEndMenuManager.m_bWantToRestart = true;
+				FrontEndMenuManager.AnaliseMenuContents();
+				FrontEndMenuManager.m_bMenuActive = false;
+				FrontEndMenuManager.m_bInSaveZone = false;
+				
+				CTimer::EndUserPause();
+				
+				TheMemoryCard.m_bWantToLoad = true;
+				
+				DMAudio.SetEffectsFadeVol(0);
+				DMAudio.SetMusicFadeVol(0);
+				DMAudio.ResetTimers(CTimer::GetTimeInMilliseconds());
+			}
+			else
+			{
+				// Load Failed! Check Memory Card (PS2) in MEMORY CARD slot 1 and please try again.
+				MenuSaveZoneMSG_1.m_numTexts = 0;
+				MenuSaveZoneMSG_1.AddText(TheText.Get("FES_LOE"), X(-80.0f), YF(20.0f), TEXT_COLOR, 0);
+				
+				MenuSaveZoneMSG_2.m_numOptions = 0;
+				MenuSaveZoneMSG_2.AddOption(TheText.Get("FESZ_OK"), X(100.0f), YF(25.0f), TriggerSave_BackToMainMenu, 0, 0);
+				
+				pMenuSave = &MenuPageSaveZone_Message;
+				pMenuSave->ActivatePage();
+				
+				bMemoryCardSpecialZone = false;
+				bIgnoreTriangleButton = true;
+			}
+		}
+	}
+}
+
+void
+TriggerSave_LoadGameLoadGameSelect(CMenuMultiChoiceTwoLinesTriggered *widget)
+{	
+	if ( widget )
+	{
+		if ( widget->GetMenuSelection() > 0 )
+		{
+			MemoryCardSlotSelected = widget->GetMenuSelection() - 1;
+			
+			switch ( TheMemoryCard.GetInfoOnSpecificSlot(MemoryCardSlotSelected) )
+			{
+				case CMemoryCard::SLOT_NOTPRESENT:
+				{
+					break;
+				}
+				case CMemoryCard::SLOT_CORRUPTED:
+				{
+					// Load Failed.
+					MenuSaveZoneMSG_1.m_numTexts = 0;
+					MenuSaveZoneMSG_1.AddText(TheText.Get("FES_LOF"), X(50.0f), YF(20.0f), TEXT_COLOR, 0);
+					
+					MenuSaveZoneMSG_2.m_numOptions = 0;
+					MenuSaveZoneMSG_2.AddOption(TheText.Get("FESZ_OK"), X(100.0f), 0.0f, TriggerSave_BackToMainMenu, 0, 0);
+					
+					MenuPageSaveZone_Message.ActivatePage();
+					pMenuSave = &MenuPageSaveZone_Message;
+					bMemoryCardSpecialZone = false;
+					break;
+				}
+				case CMemoryCard::SLOT_PRESENT:
+				{
+					// All unsaved progress in your current game will be lost. Proceed with loading? 
+					MenuSaveZoneQYN_1.m_numTexts = 0;
+					MenuSaveZoneQYN_1.AddText(TheText.Get("FESZ_QL"), X(-40.0f), 0.0f, TEXT_COLOR, 0);
+					
+					MenuSaveZoneQYN_2.m_numOptions = 0;
+					MenuSaveZoneQYN_2.AddOption(TheText.Get("FEM_NO"),  X(80.0f), YF(20.0f), TriggerSave_BackToMainMenu,   0, 0);
+					MenuSaveZoneQYN_2.AddOption(TheText.Get("FEM_YES"), X(80.0f), 0.0f,  TriggerSave_LoadGameLoadGame, 0, 0);
+					
+					MenuPageSaveZone_QuestionYesNo.ActivatePage();
+					pMenuSave = &MenuPageSaveZone_QuestionYesNo;
+					bMemoryCardSpecialZone = false;
+					break;
+				}
+			}
+		}
+	}
+}
+
+void
+TriggerSave_LoadGameSelect(CMenuMultiChoiceTriggered *widget)
+{
+	FillMenuWithMemCardFileListing(&MenuSaveLG_2, TriggerSave_BackToMainMenuTwoLines, TriggerSave_LoadGameLoadGameSelect,     nil, 0, 34, 22);
+	FillMenuWithMemCardFileListing(&MenuSaveDG_2, TriggerSave_BackToMainMenuTwoLines, TriggerSave_DeleteGameDeleteGameSelect, nil, 0, 34, 22);
+	
+	pMenuSave = &MenuPage_SaveLoadGame;
+	pMenuSave->ActivatePage();
+	
+	gErrorSampleTriggered  = false;
+	bMemoryCardSpecialZone = true;
+	bIgnoreTriangleButton  = true;
+}
+
+void
+TriggerSave_BackToMainMenu(CMenuMultiChoiceTriggered *widget)
+{
+	pMenuSave = &MenuPage_SaveBasic;
+	pMenuSave->ActivatePage();
+	bMemoryCardSpecialZone = false;
+	bIgnoreTriangleButton  = false;
+}
+
+void InitialiseTextsInMenuControllerInCar(CMenuPictureAndText *widget, CMenuManager::CONTRCONFIG cont)
+{
+	if ( widget )
+	{
+		widget->m_numTexts = 0;
+		
+		switch ( cont )
+		{
+			case CMenuManager::CONFIG_1:
+			{
+				widget->AddText(TheText.Get("FEC_LL"),  X(50.0f),  Y(-14.0f), PAD_TEXT_COLOR, true);  // -16.0f
+				widget->AddText(TheText.Get("FEC_RSC"), X(-4.0f),  Y(29.0f),  PAD_TEXT_COLOR, true);  // 33.142860f
+				widget->AddText(TheText.Get("FEC_VES"), X(-4.0f),  Y(65.0f),  PAD_TEXT_COLOR, true);  // 74.285721f
+				widget->AddText(TheText.Get("FEC_VES"), X(-4.0f),  Y(97.0f),  PAD_TEXT_COLOR, true);  // 110.857147f
+				widget->AddText(TheText.Get("FEC_HO3"), X(84.0f),  Y(162.0f), PAD_TEXT_COLOR, false); // 185.142868f
+				widget->AddText(TheText.Get("FEC_CAM"), X(103.0f), Y(141.0f), PAD_TEXT_COLOR, false); // 161.142868f
+				widget->AddText(TheText.Get("FEC_PAU"), X(130.0f), Y(128.0f), PAD_TEXT_COLOR, false); // 146.285721f
+				widget->AddText(TheText.Get("FEC_LB"),  X(68.0f),  Y(-6.0f),  PAD_TEXT_COLOR, false); // -6.857143f
+				widget->AddText(TheText.Get("FEC_LR"),  X(184.0f), Y(-14.0f), PAD_TEXT_COLOR, false); // -16.0f
+				widget->AddText(TheText.Get("FEC_HAB"), X(238.0f), Y(25.0f),  PAD_TEXT_COLOR, false); // 28.571430f
+				widget->AddText(TheText.Get("FEC_BRA"), X(155.0f), Y(18.0f),  PAD_TEXT_COLOR, true);  //  20.571430f
+				widget->AddText(TheText.Get("FEC_EXV"), X(238.0f), Y(52.0f),  PAD_TEXT_COLOR, false); // 59.428574f
+				widget->AddText(TheText.Get("FEC_CAW"), X(238.0f), Y(65.0f),  PAD_TEXT_COLOR, false); //  74.285721f
+				widget->AddText(TheText.Get("FEC_ACC"), X(238.0f), Y(78.0f),  PAD_TEXT_COLOR, false); // 89.142860f
+				widget->AddText(TheText.Get("FEC_TUC"), X(238.0f), Y(94.0f),  PAD_TEXT_COLOR, false); // 107.428574f
+				widget->AddText(TheText.Get("FEC_SM3"), X(238.0f), Y(109.0f), PAD_TEXT_COLOR, false); // 124.571434f
+				
+				break;
+			}
+			
+			case CMenuManager::CONFIG_2:
+			{
+				widget->AddText(TheText.Get("FEC_LL"),  X(50.0f),  Y(-14.0f), PAD_TEXT_COLOR, true);  // -16.0f
+				widget->AddText(TheText.Get("FEC_HOR"), X(-4.0f),  Y(29.0f),  PAD_TEXT_COLOR, true);  // 33.142860f
+				widget->AddText(TheText.Get("FEC_CAM"), X(-4.0f),  Y(65.0f),  PAD_TEXT_COLOR, true);  // 74.285721f
+				widget->AddText(TheText.Get("FEC_VES"), X(-4.0f),  Y(97.0f),  PAD_TEXT_COLOR, true);  // 110.857147f
+				widget->AddText(TheText.Get("FEC_NA"),  X(84.0f),  Y(162.0f), PAD_TEXT_COLOR, false); // 185.142868f
+				widget->AddText(TheText.Get("FEC_RSC"), X(103.0f), Y(141.0f), PAD_TEXT_COLOR, false); // 161.142868f
+				widget->AddText(TheText.Get("FEC_PAU"), X(130.0f), Y(128.0f), PAD_TEXT_COLOR, false); // 146.285721f
+				widget->AddText(TheText.Get("FEC_LB"),  X(68.0f),  Y(-6.0f),  PAD_TEXT_COLOR, false); // -6.857143f
+				widget->AddText(TheText.Get("FEC_LR"),  X(184.0f), Y(-14.0f), PAD_TEXT_COLOR, false); // -16.0f
+				widget->AddText(TheText.Get("FEC_HAB"), X(238.0f), Y(25.0f),  PAD_TEXT_COLOR, false); // 28.571430f
+				widget->AddText(TheText.Get("FEC_BRA"), X(155.0f), Y(18.0f),  PAD_TEXT_COLOR, true);  //  20.571430f
+				widget->AddText(TheText.Get("FEC_EXV"), X(238.0f), Y(52.0f),  PAD_TEXT_COLOR, false); // 59.428574f
+				widget->AddText(TheText.Get("FEC_CAW"), X(238.0f), Y(65.0f),  PAD_TEXT_COLOR, false); //  74.285721f
+				widget->AddText(TheText.Get("FEC_ACC"), X(238.0f), Y(78.0f),  PAD_TEXT_COLOR, false); // 89.142860f
+				widget->AddText(TheText.Get("FEC_TUC"), X(238.0f), Y(94.0f),  PAD_TEXT_COLOR, false); // 107.428574f
+				widget->AddText(TheText.Get("FEC_SM3"), X(238.0f), Y(109.0f), PAD_TEXT_COLOR, false); // 124.571434f
+				
+				break;
+			}
+			
+			case CMenuManager::CONFIG_3:
+			{
+				widget->AddText(TheText.Get("FEC_LL"),  X(50.0f),  Y(-14.0f), PAD_TEXT_COLOR, true);  // -16.0f
+				widget->AddText(TheText.Get("FEC_EXV"), X(-4.0f),  Y(29.0f),  PAD_TEXT_COLOR, true);  // 33.142860f
+				widget->AddText(TheText.Get("FEC_VES"), X(-4.0f),  Y(65.0f),  PAD_TEXT_COLOR, true);  // 74.285721f
+				widget->AddText(TheText.Get("FEC_VES"), X(-4.0f),  Y(97.0f),  PAD_TEXT_COLOR, true);  // 110.857147f
+				widget->AddText(TheText.Get("FEC_RS3"), X(84.0f),  Y(162.0f), PAD_TEXT_COLOR, false); // 185.142868f
+				widget->AddText(TheText.Get("FEC_CAM"), X(103.0f), Y(141.0f), PAD_TEXT_COLOR, false); // 161.142868f
+				widget->AddText(TheText.Get("FEC_PAU"), X(130.0f), Y(128.0f), PAD_TEXT_COLOR, false); // 146.285721f
+				widget->AddText(TheText.Get("FEC_LB"),  X(68.0f),  Y(-6.0f),  PAD_TEXT_COLOR, false); // -6.857143f
+				widget->AddText(TheText.Get("FEC_LR"),  X(184.0f), Y(-14.0f), PAD_TEXT_COLOR, false); // -16.0f
+				widget->AddText(TheText.Get("FEC_HOR"), X(238.0f), Y(25.0f),  PAD_TEXT_COLOR, false); // 28.571430f
+				widget->AddText(TheText.Get("FEC_BRA"), X(155.0f), Y(18.0f),  PAD_TEXT_COLOR, true);  //  20.571430f
+				widget->AddText(TheText.Get("FEC_HAB"), X(238.0f), Y(52.0f),  PAD_TEXT_COLOR, false); // 59.428574f
+				widget->AddText(TheText.Get("FEC_CAW"), X(238.0f), Y(65.0f),  PAD_TEXT_COLOR, false); //  74.285721f
+				widget->AddText(TheText.Get("FEC_ACC"), X(238.0f), Y(78.0f),  PAD_TEXT_COLOR, false); // 89.142860f
+				widget->AddText(TheText.Get("FEC_TUC"), X(238.0f), Y(94.0f),  PAD_TEXT_COLOR, false); // 107.428574f
+				widget->AddText(TheText.Get("FEC_SM3"), X(238.0f), Y(109.0f), PAD_TEXT_COLOR, false); // 124.571434f
+				
+				break;
+			}
+			
+			case CMenuManager::CONFIG_4:
+			{
+				widget->AddText(TheText.Get("FEC_LL"),  X(50.0f),  Y(-14.0f), PAD_TEXT_COLOR, true);  // -16.0f
+				widget->AddText(TheText.Get("FEC_HAB"), X(-4.0f),  Y(29.0f),  PAD_TEXT_COLOR, true);  // 33.142860f
+				widget->AddText(TheText.Get("FEC_TUC"), X(-4.0f),  Y(65.0f),  PAD_TEXT_COLOR, true);  // 74.285721f
+				widget->AddText(TheText.Get("FEC_VES"), X(-4.0f),  Y(97.0f),  PAD_TEXT_COLOR, true);  // 110.857147f
+				widget->AddText(TheText.Get("FEC_HO3"), X(84.0f),  Y(162.0f), PAD_TEXT_COLOR, false); //  185.142868f
+				widget->AddText(TheText.Get("FEC_CAM"), X(103.0f), Y(141.0f), PAD_TEXT_COLOR, false); //  161.142868f
+				widget->AddText(TheText.Get("FEC_PAU"), X(130.0f), Y(128.0f), PAD_TEXT_COLOR, false); // 146.285721f
+				widget->AddText(TheText.Get("FEC_LB"),  X(68.0f),  Y(-6.0f),  PAD_TEXT_COLOR, false); //  -6.857143f
+				widget->AddText(TheText.Get("FEC_LR"),  X(184.0f), Y(-14.0f), PAD_TEXT_COLOR, false); // -16.0f
+				widget->AddText(TheText.Get("FEC_CAW"), X(238.0f), Y(25.0f),  PAD_TEXT_COLOR, false); //  28.571430f
+				widget->AddText(TheText.Get("FEC_SMT"), X(155.0f), Y(18.0f),  PAD_TEXT_COLOR, true);  //  20.571430f
+				widget->AddText(TheText.Get("FEC_EXV"), X(238.0f), Y(52.0f),  PAD_TEXT_COLOR, false); // 59.428574f
+				widget->AddText(TheText.Get("FEC_RSC"), X(238.0f), Y(65.0f),  PAD_TEXT_COLOR, false); //  74.285721f
+				widget->AddText(TheText.Get("FEC_NA"),  X(238.0f), Y(78.0f),  PAD_TEXT_COLOR, false); // 89.142860f
+				widget->AddText(TheText.Get("FEC_ACC"), X(238.0f), Y(94.0f),  PAD_TEXT_COLOR, false); // 107.428574f
+				widget->AddText(TheText.Get("FEC_BRA"), X(238.0f), Y(109.0f), PAD_TEXT_COLOR, false); // 124.571434f
+				
+				break;
+			}
+		}
+	}
+}
+
+void InitialiseTextsInMenuControllerOnFoot(CMenuPictureAndText *widget, CMenuManager::CONTRCONFIG cont)
+{
+	if ( widget )
+	{
+		widget->m_numTexts = 0;
+		
+		
+		switch ( cont )
+		{
+			case CMenuManager::CONFIG_1:
+			{
+				widget->AddText(TheText.Get("FEC_CWL"),  X(50.0f),   Y(-14.0f), PAD_TEXT_COLOR, true);  // -16.0f
+				widget->AddText(TheText.Get("FEC_LOF"),  X(-4.0f),   Y(25.0f),  PAD_TEXT_COLOR, true);  // 28.571430f
+				widget->AddText(TheText.Get("FEC_MOV"),  X(-4.0f),   Y(65.0f),  PAD_TEXT_COLOR, true);  // 74.285721f
+				widget->AddText(TheText.Get("FEC_MOV"),  X(-4.0f),   Y(97.0f),  PAD_TEXT_COLOR, true);  // 110.857147f
+				widget->AddText(TheText.Get("FEC_CAM"),  X(103.0f),  Y(141.0f), PAD_TEXT_COLOR, false); // 161.142868f
+				widget->AddText(TheText.Get("FEC_PAU"),  X(130.0f),  Y(128.0f), PAD_TEXT_COLOR, false); // 146.285721f
+				widget->AddText(TheText.Get("FEC_CWR"),  X(184.0f),  Y(-14.0f), PAD_TEXT_COLOR, false); // -16.0f
+				widget->AddText(TheText.Get("FEC_TAR"),  X(238.0f),  Y(25.0f),  PAD_TEXT_COLOR, false); // 28.571430f
+				widget->AddText(TheText.Get("FEC_JUM"),  X(144.0f),  Y(18.0f),  PAD_TEXT_COLOR, true);  // 20.571430f
+				widget->AddText(TheText.Get("FEC_ENV"),  X(238.0f),  Y(52.0f),  PAD_TEXT_COLOR, false); // 59.428574f
+				widget->AddText(TheText.Get("FEC_ATT"),  X(238.0f),  Y(65.0f),  PAD_TEXT_COLOR, false); // 74.285721f
+				widget->AddText(TheText.Get("FEC_RUN"),  X(238.0f),  Y(78.0f),  PAD_TEXT_COLOR, false); // 89.142860f
+				widget->AddText(TheText.Get("FEC_FPC"),  X(238.0f),  Y(94.0f),  PAD_TEXT_COLOR, false); // 107.428574f
+				widget->AddText(TheText.Get("FEC_LB3"),  X(238.0f),  Y(109.0f), PAD_TEXT_COLOR, false); // 124.571434f
+				widget->AddText(TheText.Get("FEC_R3"),   X(238.0f),  Y(122.0f), PAD_TEXT_COLOR, false); // 139.428574f
+				
+				break;
+			}
+		
+			case CMenuManager::CONFIG_2:
+			{
+				widget->AddText(TheText.Get("FEC_CWL"),  X(50.0f),   Y(-14.0f), PAD_TEXT_COLOR, true);  // -16.0f
+				widget->AddText(TheText.Get("FEC_LOF"),  X(-4.0f),   Y(25.0f),  PAD_TEXT_COLOR, true);  // 28.571430f
+				widget->AddText(TheText.Get("FEC_CAM"),  X(-4.0f),   Y(65.0f),  PAD_TEXT_COLOR, true);  // 74.285721f
+				widget->AddText(TheText.Get("FEC_MOV"),  X(-4.0f),   Y(97.0f),  PAD_TEXT_COLOR, true);  // 110.857147f
+				widget->AddText(TheText.Get("FEC_NA"),   X(103.0f),  Y(141.0f), PAD_TEXT_COLOR, false); // 161.142868f
+				widget->AddText(TheText.Get("FEC_PAU"),  X(130.0f),  Y(128.0f), PAD_TEXT_COLOR, false); // 146.285721f
+				widget->AddText(TheText.Get("FEC_CWR"),  X(184.0f),  Y(-14.0f), PAD_TEXT_COLOR, false); // -16.0f
+				widget->AddText(TheText.Get("FEC_TAR"),  X(238.0f),  Y(25.0f),  PAD_TEXT_COLOR, false); // 28.571430f
+				widget->AddText(TheText.Get("FEC_JUM"),  X(144.0f),  Y(18.0f),  PAD_TEXT_COLOR, true);  // 20.571430f
+				widget->AddText(TheText.Get("FEC_ENV"),  X(238.0f),  Y(52.0f),  PAD_TEXT_COLOR, false); // 59.428574f
+				widget->AddText(TheText.Get("FEC_ATT"),  X(238.0f),  Y(65.0f),  PAD_TEXT_COLOR, false); // 74.285721f
+				widget->AddText(TheText.Get("FEC_RUN"),  X(238.0f),  Y(78.0f),  PAD_TEXT_COLOR, false); // 89.142860f
+				widget->AddText(TheText.Get("FEC_FPC"),  X(238.0f),  Y(94.0f),  PAD_TEXT_COLOR, false); // 107.428574f
+				widget->AddText(TheText.Get("FEC_LB3"),  X(238.0f),  Y(109.0f), PAD_TEXT_COLOR, false); // 124.571434f
+				widget->AddText(TheText.Get("FEC_R3"),   X(238.0f),  Y(122.0f), PAD_TEXT_COLOR, false); // 139.428574f
+				
+				break;
+			}
+		
+			case CMenuManager::CONFIG_3:
+			{
+				widget->AddText(TheText.Get("FEC_CWL"),  X(50.0f),   Y(-14.0f), PAD_TEXT_COLOR, true);  // -16.0f
+				widget->AddText(TheText.Get("FEC_ENV"),  X(-4.0f),   Y(25.0f),  PAD_TEXT_COLOR, true);  // 28.571430f
+				widget->AddText(TheText.Get("FEC_MOV"),  X(-4.0f),   Y(65.0f),  PAD_TEXT_COLOR, true);  // 74.285721f
+				widget->AddText(TheText.Get("FEC_MOV"),  X(-4.0f),   Y(97.0f),  PAD_TEXT_COLOR, true);  // 110.857147f
+				widget->AddText(TheText.Get("FEC_CAM"),  X(103.0f),  Y(141.0f), PAD_TEXT_COLOR, false); // 161.142868f
+				widget->AddText(TheText.Get("FEC_PAU"),  X(130.0f),  Y(128.0f), PAD_TEXT_COLOR, false); // 146.285721f
+				widget->AddText(TheText.Get("FEC_CWR"),  X(184.0f),  Y(-14.0f), PAD_TEXT_COLOR, false); // -16.0f
+				widget->AddText(TheText.Get("FEC_TAR"),  X(238.0f),  Y(25.0f),  PAD_TEXT_COLOR, false); // 28.571430f
+				widget->AddText(TheText.Get("FEC_JUM"),  X(144.0f),  Y(18.0f),  PAD_TEXT_COLOR, true);  // 20.571430f
+				widget->AddText(TheText.Get("FEC_LOF"),  X(238.0f),  Y(52.0f),  PAD_TEXT_COLOR, false); // 59.428574f
+				widget->AddText(TheText.Get("FEC_RUN"),  X(238.0f),  Y(65.0f),  PAD_TEXT_COLOR, false); // 74.285721f
+				widget->AddText(TheText.Get("FEC_ATT"),  X(238.0f),  Y(78.0f),  PAD_TEXT_COLOR, false); // 89.142860f
+				widget->AddText(TheText.Get("FEC_FPC"),  X(238.0f),  Y(94.0f),  PAD_TEXT_COLOR, false); // 107.428574f
+				widget->AddText(TheText.Get("FEC_LB3"),  X(238.0f),  Y(109.0f), PAD_TEXT_COLOR, false); // 124.571434f
+				widget->AddText(TheText.Get("FEC_R3"),   X(238.0f),  Y(122.0f), PAD_TEXT_COLOR, false); // 139.428574f
+				
+				break;
+			}
+			
+			case CMenuManager::CONFIG_4:
+			{
+				widget->AddText(TheText.Get("FEC_CWL"),  X(50.0f),   Y(-14.0f), PAD_TEXT_COLOR, true);  // -16.0f
+				widget->AddText(TheText.Get("FEC_TAR"),  X(-4.0f),   Y(25.0f),  PAD_TEXT_COLOR, true);  // 28.571430f
+				widget->AddText(TheText.Get("FEC_NA"),   X(-4.0f),   Y(65.0f),  PAD_TEXT_COLOR, true);  // 74.285721f
+				widget->AddText(TheText.Get("FEC_MOV"),  X(-4.0f),   Y(97.0f),  PAD_TEXT_COLOR, true);  // 110.857147f
+				widget->AddText(TheText.Get("FEC_CAM"),  X(103.0f),  Y(141.0f), PAD_TEXT_COLOR, false); // 161.142868f
+				widget->AddText(TheText.Get("FEC_PAU"),  X(130.0f),  Y(128.0f), PAD_TEXT_COLOR, false); // 146.285721f
+				widget->AddText(TheText.Get("FEC_CWR"),  X(184.0f),  Y(-14.0f), PAD_TEXT_COLOR, false); // -16.0f
+				widget->AddText(TheText.Get("FEC_ATT"),  X(238.0f),  Y(25.0f),  PAD_TEXT_COLOR, false); // 28.571430f
+				widget->AddText(TheText.Get("FEC_JUM"),  X(144.0f),  Y(18.0f),  PAD_TEXT_COLOR, true);  // 20.571430f
+				widget->AddText(TheText.Get("FEC_ENV"),  X(238.0f),  Y(52.0f),  PAD_TEXT_COLOR, false); // 59.428574f
+				widget->AddText(TheText.Get("FEC_LOF"),  X(238.0f),  Y(65.0f),  PAD_TEXT_COLOR, false); // 74.285721f
+				widget->AddText(TheText.Get("FEC_RUN"),  X(238.0f),  Y(78.0f),  PAD_TEXT_COLOR, false); // 89.142860f
+				widget->AddText(TheText.Get("FEC_FPC"),  X(238.0f),  Y(94.0f),  PAD_TEXT_COLOR, false); // 107.428574f
+				widget->AddText(TheText.Get("FEC_LB3"),  X(238.0f),  Y(109.0f), PAD_TEXT_COLOR, false); // 124.571434f
+				widget->AddText(TheText.Get("FEC_R3"),   X(238.0f),  Y(122.0f), PAD_TEXT_COLOR, false); // 139.428574f
+				
+				break;
+			}
+		}
+	}
+}
+
+void
+TriggerSaveZone_BackToMainMenuTwoLines(CMenuMultiChoiceTwoLinesTriggered *widget)
+{
+	bMemoryCardSpecialZone = false;
+	bIgnoreTriangleButton = false;
+	pActiveMenuPage = &MenuPageSaveZone_SaveGame;
+}
+
+void
+TriggerSave_BackToMainMenuTwoLines(CMenuMultiChoiceTwoLinesTriggered *widget)
+{
+	pMenuSave = &MenuPage_SaveBasic;
+	pMenuSave->ActivatePage();
+	bMemoryCardSpecialZone = false;
+	bIgnoreTriangleButton = false;
+}
+
+void
+SetRandomActiveTextlineColor(uint8 bText)
+{
+	if ( bMemoryCardSpecialZone )
+		rgbaATC = SELECTED_TEXT_COLOR;
+	else
+	{
+		bool bSelected = false;
+		bool bHighlignted = false;
+		
+		switch ( FrontEndMenuManager.m_pageState )
+		{
+			case PAGESTATE_NORMAL:
+				break;
+			case PAGESTATE_HIGHLIGHTED:
+				bHighlignted = true;
+				break;
+			case PAGESTATE_SELECTED:
+				bSelected = true;
+				break;
+		}
+		
+		if ( FrontEndMenuManager.m_bInSaveZone )
+			bSelected = true;
+		
+		if ( bSelected || bText )
+		{
+			static uint32 delayTime = 0;
+			static bool bAddVal = true;
+			
+			if ( delayTime < CTimer::GetTimeInMillisecondsPauseMode() )
+			{
+				delayTime = CTimer::GetTimeInMillisecondsPauseMode() + 200;
+				
+				if ( bAddVal )
+					rgbaATC = TEXT_COLOR;
+				else
+					rgbaATC = SELECTED_TEXT_COLOR;
+				
+				bAddVal = !bAddVal;
+			}
+		}
+		
+		if ( bHighlignted )
+		{
+			static uint32 delayTime = 0;
+			static bool bAddVal = true;
+			
+			if ( delayTime < CTimer::GetTimeInMillisecondsPauseMode() )
+			{
+				delayTime = CTimer::GetTimeInMillisecondsPauseMode() + 200;
+				
+				if ( bAddVal )
+					rgbaATC = TITLE_TEXT_COLOR;
+				else
+					rgbaATC = MENU_SELECTED_COLOR;
+				
+				bAddVal = !bAddVal;
+			}
+		}
+	}
+}
+
+#ifdef GTA_PC
+
+void
+TriggerDisplay_Trails(CMenuOnOffTriggered *widget)
+{
+	if ( widget )
+	{
+		CMenuManager::m_PrefsShowTrails = widget->GetMenuSelection();
+		CMBlur::BlurOn = CMenuManager::m_PrefsShowTrails;
+		
+		if ( CMBlur::BlurOn )
+			CMBlur::MotionBlurOpen(Scene.camera);
+		else
+			CMBlur::MotionBlurClose();
+	}
+}
+
+#endif
\ No newline at end of file
diff --git a/src/core/Frontend_PS2.cpp b/src/core/Frontend_PS2.cpp
new file mode 100644
index 0000000..c0fcc65
--- /dev/null
+++ b/src/core/Frontend_PS2.cpp
@@ -0,0 +1,3020 @@
+#include "common.h"
+#ifdef PS2_MENU
+#include "platform.h"
+#include "main.h"
+#include "Timer.h"
+#include "Pad.h"
+#include "Sprite2d.h"
+#include "Text.h"
+#include "Font.h"
+#include "Hud.h"
+#include "MBlur.h"
+#include "DMAudio.h"
+#include "Streaming.h"
+#include "Camera.h"
+#include "Credits.h"
+#include "General.h"
+#include "TxdStore.h"
+#include "FileMgr.h"
+#include "Messages.h"
+#include "Frontend_PS2.h"
+#include "Stats.h"
+#include "Game.h"
+#include "World.h"
+#include "PlayerInfo.h"
+#include "FrontEndControls.h"
+#include "MemoryCard.h"
+
+#define CRect_SZ(x, y, w, h) CRect(x, y, x+w, y+h)
+
+wchar MemoryCard_FileNames[8][100+1];
+CMenuManager FrontEndMenuManager;
+
+// TEMP: put into header
+bool DoRWStuffStartOfFrame_Horizon(int16 TopRed, int16 TopGreen, int16 TopBlue, int16 BottomRed, int16 BottomGreen, int16 BottomBlue, int16 Alpha);
+bool DoRWStuffStartOfFrame(int16 TopRed, int16 TopGreen, int16 TopBlue, int16 BottomRed, int16 BottomGreen, int16 BottomBlue, int16 Alpha);
+void DoRWStuffEndOfFrame(void);
+
+
+#define SCRW SCREEN_WIDTH
+#define SCRH SCREEN_HEIGHT
+//#define X SCREEN_STRETCH_X
+//#define Y SCREEN_STRETCH_Y
+#define X SCREEN_SCALE_X
+#define Y SCREEN_SCALE_Y
+
+#define YF(x) Y(float(x)*(float(DEFAULT_SCREEN_HEIGHT)/float(SCREEN_HEIGHT_PAL)))
+//#define X(x) ((x)/640.0f*SCRW)
+//#define Y(y) ((y)/448.0f*SCRH)
+
+
+static float MENU_TEXT_SIZE_X = 0.644f;
+static float MENU_TEXT_SIZE_Y = 0.84f;	//0.96f;
+float BUTTONTAB_TEXT_SIZE_X = 0.35f;
+float BUTTONTAB_TEXT_SIZE_Y = 0.7f; //0.8f;
+float PANEL_TEXT_SIZE_X = 0.8f;
+float PANEL_TEXT_SIZE_Y = 1.2f;	//0.96f/0.7f;	//??
+float MEMCARD_ACCESS_MSG_SIZE_X = 0.84f;
+float MEMCARD_ACCESS_MSG_SIZE_Y = 1.12f;	//1.28f;
+
+CRGBA SELECTED_TEXT_COLOR(255, 182, 48, 255);
+CRGBA BACKGROUND_SPLASH_COLOR(48, 48, 48, 255);
+
+CVector2D CONTR_DESCR_NEW_TEXTSCALE(0.4564f, 0.63f);	// 0.72
+CVector2D CONFIGS_NEW_TEXTSCALE(0.49f, 0.7f);	// 0.8
+CVector2D AUDIO_OUTPUT_POS(0.0f, 0.0f);
+CVector2D AUDIO_RSTATION_POS(154.0f, 0.0f);
+CVector2D DISPLAY_BRIGHTNESS_POS(0.0f, 0.0f);
+
+CRGBA TEXT_COLOR(150, 110, 30, 255);
+CRGBA PAD_TEXT_COLOR(200, 200, 200, 255);
+CRGBA CRIM_RATING_TEXT_COLOR(255, 182, 48, 255);
+CRGBA SCROLL_TEXT_COLOR(150, 110, 30, 255);
+CRGBA TITLE_TEXT_COLOR(170, 130, 50, 255);
+CRGBA TEXT_SHADOW_COLOR(0, 0, 0, 255);
+CVector2D SHADOW_VECTOR(1.0f, 1.0f);
+CRGBA SLIDER_RIGHT_COLOR(20, 94, 136, 255);
+CRGBA SLIDER_LEFT_COLOR(86, 196, 255, 255);
+CRGBA MENU_SELECTED_COLOR(255, 212, 88, 255);
+CRGBA rgbaATC(96, 96, 96, 255);	// active text color. not constant
+
+float BUTTONTAB_TEXT_X_SCALES[NUM_PAGES] = { 1.0f };
+float PANEL_TEXT_X_SCALES[NUM_PAGES] = { 1.0f };
+
+int32 MemoryCardSlotSelected;
+uint32 TimeToStopPadShaking;
+bool bFrontEnd_ReloadObrTxtGxt;
+
+bool bMemoryCardStartUpMenus_ExitNow;
+
+extern CMenuPage MenuPage_SaveBasic;
+CMenuPage *pActiveMenuPage;
+CMenuPage *pMenuSave = &MenuPage_SaveBasic;
+bool bMemoryCardSpecialZone;
+bool bIgnoreTriangleButton;
+bool gErrorSampleTriggered;
+
+bool gMusicPlaying;
+
+CMenuPage MenuPage_Stats;
+ CMenuLineLister MenuStats_1;
+ CMenuPictureAndText MenuStats_2;	// criminal rating
+CMenuPage MenuPage_Briefs;
+ CMenuPictureAndText MenuBriefs_1;
+ CMenuDummy MenuBriefs_2;
+CMenuPage MenuPage_SaveBasic;
+ CMenuMultiChoiceTriggered MenuSaveB_1;	// "Load Game", "Delete Game", "New Game"
+CMenuPage MenuPage_SaveNewGame;
+ CMenuPictureAndText MenuSaveNG_1;	// "Load Game", "Delete Game", "New Game"
+ CMenuMultiChoiceTriggered MenuSaveNG_2;	// "No", "Yes"
+CMenuPage MenuPage_SaveLoadGame;
+ CMenuPictureAndText MenuSaveLG_1;	// "Load Game", "Delete Game", "New Game"
+ CMenuMultiChoiceTwoLinesTriggered MenuSaveLG_2;	// save games
+CMenuPage MenuPage_SaveDeleteGame;
+ CMenuPictureAndText MenuSaveDG_1;	// "Load Game", "Delete Game", "New Game"
+ CMenuMultiChoiceTwoLinesTriggered MenuSaveDG_2;	// save games
+CMenuPage MenuPage_Controls;
+ CMenuPictureAndText MenuControls_3; // controller images
+ CMenuPictureAndText MenuControls_6;
+ CMenuPictureAndText MenuControls_4;
+ CMenuPictureAndText MenuControls_7;
+ CMenuMultiChoiceTriggeredAlways MenuControls_1; // "Configuration:" "Setup1", "Setup2", "Setup3", "Setup4"
+ CMenuMultiChoiceTriggered MenuControls_2; // "Controller Display:" "On Foot", "In Car"
+ CMenuOnOffTriggered MenuControls_5; // "Vibration:"
+CMenuPageAnyMove MenuPage_Audio;
+ CMenuSliderTriggered MenuAudio_1;	// "Music Volume"
+ CMenuMultiChoiceTriggered MenuAudio_4;	// "Output:" "Stereo", "Mono"
+ CMenuSliderTriggered MenuAudio_2;	// "SFX Volume"
+ CMenuMultiChoicePicturedTriggeredAnyMove MenuAudio_3; // "Radio station select:"
+CMenuPage MenuPage_Display;
+ CMenuSlider MenuDisplay_1;	// "Brightness"
+#ifdef GTA_PC
+ CMenuOnOffTriggered MenuDisplay_2;	// "Trails:"
+#else
+ CMenuOnOff MenuDisplay_2;	// "Trails:"
+#endif
+ CMenuOnOff MenuDisplay_3;	// "Subtitles:"
+ CMenuOnOff MenuDisplay_4;	// "Wide Screen:"
+CMenuPage MenuPage_Language;
+ CMenuMultiChoiceTriggered MenuLanguage_1;	// "English", "French", "German", "Italian", "Spanish"
+
+CMenuPage MenuPageSaveZone_SaveGame;
+ CMenuMultiChoiceTriggered MenuSaveZoneSG_1;	// "Save game", "Cancel"
+CMenuPage MenuPageSaveZone_SaveSlots;
+ CMenuMultiChoiceTwoLinesTriggered MenuSaveZoneSSL_1;	// "Cancel"
+CMenuPage MenuPageSaveZone_SavedSuccessfully;
+ CMenuPictureAndText MenuSaveZoneSS_1;	// "Game saved successfully!" "Your saved filename is:"
+ CMenuMultiChoiceTriggered MenuSaveZoneSS_2;	// "Quit"
+CMenuPage MenuPageSaveZone_Message;
+ CMenuPictureAndText MenuSaveZoneMSG_1;	// "Save Failed! Check memory card (PS2) in MEMORY CARD slot 1 and please try again."
+ CMenuMultiChoiceTriggered MenuSaveZoneMSG_2;	// "OK"
+CMenuPage MenuPageSaveZone_QuestionYesNo;
+ CMenuPictureAndText MenuSaveZoneQYN_1;	// "Save Failed! Check memory card (PS2) in MEMORY CARD slot 1 and please try again."
+ CMenuMultiChoiceTriggered MenuSaveZoneQYN_2;	// "Yes", "No"
+CMenuPage MenuPageSaveZone_FormatCard;
+ CMenuMultiChoiceTriggered MenuSaveZoneFC_1;	// "Memory card (PS2) in MEMORY CARD slot 1 is unformatted. Would you like to format memory card (PS2) in MEMORY CARD slot 1?" "No" "Yes"
+CMenuPage MenuPageSaveZone_ErrorFormat;
+ CMenuMultiChoiceTriggered MenuSaveZoneEF_1;	// "Format Failed! Check memory card (PS2) in MEMORY CARD slot 1 and please try again." "OK"
+
+
+VALIDATE_SIZE(CPlaceableText, 0x10);
+VALIDATE_SIZE(CPlaceableShText, 0x20);
+VALIDATE_SIZE(CPlaceableShTextTwoLines, 0x30);
+VALIDATE_SIZE(CPlaceableShOption, 0x28);
+VALIDATE_SIZE(CPlaceableShOptionTwoLines, 0x38);
+VALIDATE_SIZE(CPlaceableSprite, 0x18);
+VALIDATE_SIZE(CPlaceableShSprite, 0x34);
+VALIDATE_SIZE(CMenuMultiChoice, 0x2CC);
+VALIDATE_SIZE(CMenuMultiChoiceTriggered, 0x310);
+VALIDATE_SIZE(CMenuMultiChoiceTwoLines, 0x3CC);
+VALIDATE_SIZE(CMenuOnOff, 0x90);
+
+#include "FrontendTriggers.h"
+
+static const char* FrontendFilenames[][2] =
+{
+	{"fe2_mainpanel_ul",  "" },
+	{"fe2_mainpanel_ur",  "" },
+	{"fe2_mainpanel_dl",  "" },
+	{"fe2_mainpanel_dr",  "" },
+	{"fe2_mainpanel_dr2", "" },
+	{"fe2_tabactive",     "" },
+	{"fe_iconbrief",      "" },
+	{"fe_iconstats",      "" },
+	{"fe_iconcontrols",   "" },
+	{"fe_iconsave",       "" },
+	{"fe_iconaudio",      "" },
+	{"fe_icondisplay",    "" },
+	{"fe_iconlanguage",   "" },
+	{"fe_controller",     "" },
+	{"fe_controllersh",   "" },
+	{"fe_arrows1",        "" },
+	{"fe_arrows2",        "" },
+	{"fe_arrows3",        "" },
+	{"fe_arrows4",        "" },
+	{"fe_radio1",         "" },
+	{"fe_radio2",         "" },
+	{"fe_radio3",         "" },
+	{"fe_radio4",         "" },
+	{"fe_radio5",         "" },
+	{"fe_radio6",         "" },
+	{"fe_radio7",         "" },
+	{"fe_radio8",         "" },
+	{"fe_radio9",         "" },
+};
+
+#ifdef CUTSCENE_BORDERS_SWITCH
+bool CMenuManager::m_PrefsCutsceneBorders = true;
+#endif
+
+int32 CMenuManager::m_PrefsSfxVolume = 102;
+int32 CMenuManager::m_PrefsMusicVolume = 102;
+int32 CMenuManager::m_PrefsBrightness = 256;
+bool CMenuManager::m_PrefsShowTrails = true;
+bool CMenuManager::m_PrefsShowSubtitles = true;
+bool CMenuManager::m_PrefsAllowNastyGame = true;
+
+int32 CMenuManager::m_PrefsRadioStation = 0;
+int32 CMenuManager::m_PrefsStereoMono = 0;
+int8 CMenuManager::m_PrefsUseWideScreen = 0;
+int32 CMenuManager::m_PrefsLanguage = 0;
+CMenuManager::CONTRCONFIG CMenuManager::m_PrefsControllerConfig = CONFIG_1;
+bool CMenuManager::m_PrefsUseVibration = false;
+
+
+#ifdef GTA_PC
+#include "PlayerSkin.h"
+int32 CMenuManager::OS_Language = 0;
+int8 CMenuManager::m_PrefsVsync = 1;
+int8 CMenuManager::m_PrefsVsyncDisp = 1;
+int8 CMenuManager::m_PrefsFrameLimiter = 1;
+int8 CMenuManager::m_PrefsSpeakers;
+int32 CMenuManager::m_ControlMethod = CONTROL_CLASSIC;
+int8 CMenuManager::m_PrefsDMA = 1;
+float CMenuManager::m_PrefsLOD = 1.0f;
+char CMenuManager::m_PrefsSkinFile[256] = DEFAULT_SKIN_NAME;
+
+#ifndef MASTER
+bool CMenuManager::m_PrefsMarketing;
+bool CMenuManager::m_PrefsDisableTutorials;
+#endif // !MASTER
+
+#ifdef MENU_MAP
+bool  CMenuManager::bMenuMapActive;
+float CMenuManager::fMapSize;
+float CMenuManager::fMapCenterY;
+float CMenuManager::fMapCenterX;
+#endif
+
+#endif
+
+
+CMenuManager::CMenuManager(void)
+{
+	int32 i;
+
+	SetSoundLevelsForMusicMenu();
+
+	m_pageState = PAGESTATE_NORMAL;
+	m_currentPage = PAGE_FIRST;
+	m_newPage = PAGE_FIRST;
+	m_bMenuActive = false;
+	m_bSaveMenuActive = false;
+	m_bRenderGameInMenu = false;
+	m_bTexturesLoaded = false;
+	m_nPageLeftTimer = 0;
+	m_nPageRightTimer = 0;
+	m_nChangePageTimer = 0;
+	field_18 = 0;
+	m_fade = 255;
+	m_someAlpha = 255;
+	m_position.x = 0.0f;
+	m_position.y = 0.0f;
+	m_nSlidingDir = SLIDE_TO_BOTTOM;
+	m_nStartPauseTimer = 0;
+	m_nEndPauseTimer = 0;
+	m_bInitialised = false;
+	m_bWantToUpdateContent = false;
+	field_3C = 0;
+	m_bInSaveZone = false;
+
+	for(i = 0; i < NUM_PAGES; i++){
+		BUTTONTAB_TEXT_X_SCALES[i] = 1.0f;
+		PANEL_TEXT_X_SCALES[i] = 1.0f;
+	}
+
+#ifdef GTA_PC
+	TheCamera.m_bUseMouse3rdPerson = m_ControlMethod == CONTROL_STANDARD;
+	CMBlur::BlurOn = m_PrefsShowTrails;
+#endif
+}
+
+void
+CMenuManager::LoadAllTextures(void)
+{
+	int32 i;
+
+	if(m_bTexturesLoaded)
+		return;
+
+	DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_STARTING, 0);
+	DMAudio.Service();
+	DoRWStuffStartOfFrame(0, 0, 0, 0, 0, 0, 255);
+	RwRenderStateSet(rwRENDERSTATETEXTUREFILTER, (void*)rwFILTERLINEAR);
+	CSprite2d *splash = LoadSplash(nil);
+	if(splash)
+		splash->Draw(CRect(0.0f, 0.0f, SCRW, SCRH), BACKGROUND_SPLASH_COLOR);
+	else // doesn't exist!!
+		CHud::Sprites[19].Draw(CRect(0.0f, 0.0f, SCRW, SCRH), BACKGROUND_SPLASH_COLOR);
+	RwRenderStateSet(rwRENDERSTATETEXTUREFILTER, (void*)rwFILTERMIPNEAREST);
+	DoRWStuffEndOfFrame();
+
+	CFileMgr::SetDir("");
+	CFileMgr::SetDir("");
+
+	CTimer::Stop();
+	CStreaming::MakeSpaceFor(60*1024);
+	CStreaming::ImGonnaUseStreamingMemory();
+	CGame::TidyUpMemory(false, true);
+	int32 slot = CTxdStore::FindTxdSlot("frontend");
+	if(slot == -1)
+		slot = CTxdStore::AddTxdSlot("frontend");
+	printf("LOAD frontend\n");
+	CTxdStore::LoadTxd(slot, "MODELS/FRONTEND.TXD");
+	CTxdStore::SetCurrentTxd(slot);
+	CStreaming::IHaveUsedStreamingMemory();
+	CTimer::Update();
+
+	for(i = 0; i < NUM_SPRIRES; i++)
+	{
+		m_sprites[i].SetTexture(FrontendFilenames[i][0], FrontendFilenames[i][1]);
+		m_sprites[i].SetAddressing(rwTEXTUREADDRESSBORDER);
+	}
+
+	m_bTexturesLoaded = true;
+}
+
+void
+CMenuManager::UnloadTextures(void)
+{
+	int32 slot;
+	int32 i;
+
+	if ( !m_bTexturesLoaded )
+		return;
+
+	slot = CTxdStore::FindTxdSlot("frontend");
+#ifdef FIX_BUGS
+	for(i = 0; i < NUM_SPRIRES; i++)
+		m_sprites[i].Delete();
+#endif
+
+	printf("REMOVE frontend\n");
+	CTxdStore::RemoveTxd(slot);
+	m_bTexturesLoaded = false;
+}
+
+void
+CMenuManager::InitialiseMenusOnce(void)
+{
+	if(m_bInitialised)
+		return;
+	m_bInitialised = true;
+
+	InitialiseChangedLanguageSettings();
+
+	// Normal menu
+	MenuPage_Stats.Initialise();
+	MenuPage_Briefs.Initialise();
+	MenuPage_SaveBasic.Initialise();
+	MenuPage_SaveNewGame.Initialise();
+	MenuPage_SaveLoadGame.Initialise();
+	MenuPage_SaveDeleteGame.Initialise();
+	MenuPage_Controls.Initialise();
+	MenuPage_Audio.Initialise();
+	MenuPage_Display.Initialise();
+	MenuPage_Language.Initialise();
+
+	// Save menu
+	MenuPageSaveZone_SaveGame.Initialise();
+	MenuPageSaveZone_SaveSlots.Initialise();
+	MenuPageSaveZone_SavedSuccessfully.Initialise();
+	MenuPageSaveZone_Message.Initialise();
+	MenuPageSaveZone_QuestionYesNo.Initialise();
+	MenuPageSaveZone_FormatCard.Initialise();
+	MenuPageSaveZone_ErrorFormat.Initialise();
+
+	/* Stats */
+
+	MenuStats_1.ResetNumberOfTextLines();
+	MenuStats_1.SetPosition(X(75.0f), Y(70.0f));
+	MenuStats_1.m_width = X(480.0f);
+	MenuStats_1.m_height = Y(274.0f);
+	MenuStats_1.field_10E8 = 0;	// unknown
+	MenuStats_1.m_lineSpacing = Y(20.0f);
+	MenuStats_1.m_scrollSpeed = 1.0f;
+	MenuStats_1.SetLinesColor(SCROLL_TEXT_COLOR);
+	MenuStats_1.ResetNumberOfTextLines();
+	MenuPage_Stats.AddMenu(&MenuStats_1);
+	MenuStats_2.SetPosition(X(75.0f), Y(50.0f));
+	MenuStats_2.SetTextsColor(CRIM_RATING_TEXT_COLOR);
+	MenuPage_Stats.AddMenu(&MenuStats_2);
+	MenuPage_Stats.SetShadows(true, TEXT_SHADOW_COLOR, SHADOW_VECTOR);
+	MenuPage_Stats.ActivatePage();
+
+
+	CVector2D saveGameTextScale(X(0.49f), Y(0.7f));
+	CVector2D defaultTextScale(X(MENU_TEXT_SIZE_X), Y(MENU_TEXT_SIZE_Y));
+
+	/* Basic Load/Delete/New Game */
+
+	MenuSaveB_1.m_numOptions = 0;
+	MenuSaveB_1.SetPosition(X(220.0f), Y(110.0f));
+	MenuSaveB_1.AddOption(TheText.Get("FES_LGA"), 0.0f, Y(20.0f), TriggerSave_LoadGameSelect, false, true);
+	MenuSaveB_1.AddOption(TheText.Get("FES_DGA"), 0.0f, Y(40.0f), TriggerSave_DeleteGameSelect, false, true);
+	MenuSaveB_1.AddOption(TheText.Get("FES_NGA"), 0.0f, Y(60.0f), TriggerSave_NewGameSelectYes, false, true);
+	MenuSaveB_1.SetColors(TITLE_TEXT_COLOR, TEXT_COLOR, TEXT_COLOR);
+	MenuPage_SaveBasic.AddMenu(&MenuSaveB_1);
+	MenuPage_SaveBasic.SetShadows(true, TEXT_SHADOW_COLOR, SHADOW_VECTOR);
+	MenuPage_SaveBasic.ActivatePage();
+
+	/* New Game - but unused */
+
+	MenuSaveNG_1.m_numTexts = 0;
+	MenuSaveNG_1.SetPosition(X(220.0f), Y(110.0f));
+	MenuSaveNG_1.AddText(TheText.Get("FES_LGA"), 0.0f, Y(20.0f), TEXT_COLOR, true);
+	MenuSaveNG_1.AddText(TheText.Get("FES_DGA"), 0.0f, Y(40.0f), TEXT_COLOR, true);
+	MenuSaveNG_1.AddText(TheText.Get("FES_NGA"), 0.0f, Y(60.0f), SELECTED_TEXT_COLOR, true);
+	MenuPage_SaveNewGame.AddMenu(&MenuSaveNG_1);
+	MenuSaveNG_2.m_numOptions = 0;
+	MenuSaveNG_2.SetPosition(X(250.0f), Y(170.0f));
+	MenuSaveNG_2.AddOption(TheText.Get("FEM_NO"), 0.0f, 0.0f, TriggerSave_BackToMainMenu, false, false);
+	MenuSaveNG_2.AddOption(TheText.Get("FEM_YES"), 0.0f, Y(20.0f), TriggerSave_NewGameSelectYes, false, false);
+	MenuSaveNG_2.SetColors(TITLE_TEXT_COLOR, TEXT_COLOR, TEXT_COLOR);
+	MenuSaveNG_2.m_defaultCancel = TriggerSave_BackToMainMenu;
+	MenuPage_SaveNewGame.AddMenu(&MenuSaveNG_2);
+	MenuPage_SaveNewGame.SetShadows(true, TEXT_SHADOW_COLOR, SHADOW_VECTOR);
+	MenuPage_SaveNewGame.ActivatePage();
+
+	/* Load Game */
+
+	MenuSaveLG_1.m_numTexts = 0;
+	MenuSaveLG_1.SetPosition(X(220.0f),  Y(110.0f));
+	MenuSaveLG_1.AddText(TheText.Get("FES_LGA"), 0.0f, Y(20.0f), SELECTED_TEXT_COLOR, true);
+	MenuSaveLG_1.AddText(TheText.Get("FES_DGA"), 0.0f, Y(40.0f), TEXT_COLOR, true);
+	MenuSaveLG_1.AddText(TheText.Get("FES_NGA"), 0.0f, Y(60.0f), TEXT_COLOR, true);
+	MenuPage_SaveLoadGame.AddMenu(&MenuSaveLG_1);
+	MenuSaveLG_2.m_numOptions = 0;
+	MenuSaveLG_2.SetPosition(X(250.0f),  Y(60.0f));
+	MenuSaveLG_2.SetColors(TITLE_TEXT_COLOR, TEXT_COLOR, TEXT_COLOR);
+	MenuSaveLG_2.m_defaultCancel = TriggerSave_BackToMainMenuTwoLines;
+	MenuSaveLG_2.SetNewOldTextScale(true, saveGameTextScale, defaultTextScale, false);
+	MenuPage_SaveLoadGame.AddMenu(&MenuSaveLG_2);
+	MenuPage_SaveLoadGame.SetShadows(true, TEXT_SHADOW_COLOR, SHADOW_VECTOR);
+	MenuPage_SaveLoadGame.ActivatePage();
+
+	/* Delete Game */
+
+	MenuSaveDG_1.m_numTexts = 0;
+	MenuSaveDG_1.SetPosition(X(220.0f),  Y(110.0f));
+	MenuSaveDG_1.AddText(TheText.Get("FES_LGA"), 0.0f, Y(20.0f), TEXT_COLOR, true);
+	MenuSaveDG_1.AddText(TheText.Get("FES_DGA"), 0.0f, Y(40.0f), SELECTED_TEXT_COLOR, true);
+	MenuSaveDG_1.AddText(TheText.Get("FES_NGA"), 0.0f, Y(60.0f), TEXT_COLOR, true);
+	MenuPage_SaveDeleteGame.AddMenu(&MenuSaveDG_1);
+	MenuSaveDG_2.m_numOptions = 0;
+	MenuSaveDG_2.SetPosition(X(250.0f),  Y(60.0f));
+	MenuSaveDG_2.SetColors(TITLE_TEXT_COLOR, TEXT_COLOR, TEXT_COLOR);
+	MenuSaveDG_2.m_defaultCancel = TriggerSave_BackToMainMenuTwoLines;
+	MenuSaveDG_2.SetNewOldTextScale(true, saveGameTextScale, defaultTextScale, false);
+	MenuPage_SaveDeleteGame.AddMenu(&MenuSaveDG_2);
+	MenuPage_SaveDeleteGame.SetShadows(true, TEXT_SHADOW_COLOR, SHADOW_VECTOR);
+	MenuPage_SaveDeleteGame.ActivatePage();
+
+
+	CVector2D briefsTextScale(X(0.525f), Y(0.7f));
+	CVector2D defaultTextScale1(X(MENU_TEXT_SIZE_X), Y(MENU_TEXT_SIZE_Y));
+
+	/* Briefs */
+
+	MenuBriefs_1.m_numTexts = 0;
+	MenuBriefs_1.SetPosition(X(60.0f), Y(60.0f));
+	MenuBriefs_1.SetTextsColor(TEXT_COLOR);
+	MenuBriefs_1.SetNewOldTextScale(true, briefsTextScale, defaultTextScale1);
+	MenuBriefs_1.SetNewOldShadowWrapX(true, X(600.0f+SHADOW_VECTOR.x), X(600.0f));
+	MenuPage_Briefs.AddMenu(&MenuBriefs_1);
+	MenuPage_Briefs.AddMenu(&MenuBriefs_2);
+	MenuPage_Briefs.SetShadows(true, TEXT_SHADOW_COLOR, SHADOW_VECTOR);
+	MenuPage_Briefs.ActivatePage();
+
+
+	CVector2D defaultTextScale2(X(MENU_TEXT_SIZE_X), Y(MENU_TEXT_SIZE_Y));
+	CVector2D defaultTextScale3(X(MENU_TEXT_SIZE_X), Y(MENU_TEXT_SIZE_Y));
+	CVector2D CONTR_DESCR_NEW_TEXTSCALE_scaled(X(CONTR_DESCR_NEW_TEXTSCALE.x), Y(CONTR_DESCR_NEW_TEXTSCALE.y));
+	CVector2D CONFIGS_NEW_TEXTSCALE_scaled(X(CONFIGS_NEW_TEXTSCALE.x), Y(CONFIGS_NEW_TEXTSCALE.y));
+
+	/* Controls */
+
+	MenuControls_3.m_numTexts = 0;
+	MenuControls_3.m_numSprites = 0;
+	MenuControls_3.SetPosition(X(170.0f), Y(88.0f));
+	MenuControls_3.AddPicture(&m_sprites[FE_CONTROLLER],
+		&m_sprites[FE_CONTROLLERSH],
+		0.0f, 0.0f, X(235.2f), Y(175.2), CRGBA(255, 255, 255, 255));
+	MenuControls_3.AddPicture(&m_sprites[FE_ARROWS1],
+		0.0f, 0.0f, X(235.2f), Y(175.2), CRGBA(255, 255, 255, 255));
+	MenuControls_3.SetNewOldTextScale(true, CONTR_DESCR_NEW_TEXTSCALE_scaled, defaultTextScale2);
+	InitialiseTextsInMenuControllerOnFoot(&MenuControls_3, CMenuManager::m_PrefsControllerConfig);
+	MenuControls_3.SetShadows(true, TEXT_SHADOW_COLOR, SHADOW_VECTOR);
+	MenuControls_3.SetNewOldShadowWrapX(true, X(600.0f+SHADOW_VECTOR.x), X(600.0f));
+	MenuPage_Controls.AddMenu(&MenuControls_3);
+
+	MenuControls_6.m_numTexts = 0;
+	MenuControls_6.m_numSprites = 0;
+	MenuControls_6.SetPosition(X(170.0f), Y(88.0f));
+	MenuControls_6.AddPicture(&m_sprites[FE_CONTROLLER],
+		&m_sprites[FE_CONTROLLERSH],
+		0.0f, 0.0f, X(235.2f), Y(175.2), CRGBA(255, 255, 255, 255));
+	MenuControls_6.AddPicture(&m_sprites[FE_ARROWS3],
+		0.0f, 0.0f, X(235.2f), Y(175.2), CRGBA(255, 255, 255, 255));
+	MenuControls_6.SetNewOldTextScale(true, CONTR_DESCR_NEW_TEXTSCALE_scaled, defaultTextScale2);
+	InitialiseTextsInMenuControllerOnFoot(&MenuControls_6, CMenuManager::CONFIG_2);
+	MenuControls_6.SetShadows(true, TEXT_SHADOW_COLOR, SHADOW_VECTOR);
+	MenuControls_6.SetNewOldShadowWrapX(true, X(600.0f+SHADOW_VECTOR.x), X(600.0f));
+
+	MenuControls_4.m_numTexts = 0;
+	MenuControls_4.m_numSprites = 0;
+	MenuControls_4.SetPosition(X(170.0f), Y(88.0f));
+	MenuControls_4.AddPicture(&m_sprites[FE_CONTROLLER],
+		&m_sprites[FE_CONTROLLERSH],
+		0.0f, 0.0f, X(235.2f), Y(175.2), CRGBA(255, 255, 255, 255));
+	MenuControls_4.AddPicture(&m_sprites[FE_ARROWS2],
+		0.0f, 0.0f, X(235.2f), Y(175.2), CRGBA(255, 255, 255, 255));
+	MenuControls_4.SetNewOldTextScale(true, CONTR_DESCR_NEW_TEXTSCALE_scaled, defaultTextScale2);
+	InitialiseTextsInMenuControllerInCar(&MenuControls_4, CMenuManager::m_PrefsControllerConfig);
+	MenuControls_4.SetShadows(true, TEXT_SHADOW_COLOR, SHADOW_VECTOR);
+	MenuControls_4.SetNewOldShadowWrapX(true, X(600.0f+SHADOW_VECTOR.x), X(600.0f));
+
+	MenuControls_7.m_numTexts = 0;
+	MenuControls_7.m_numSprites = 0;
+	MenuControls_7.SetPosition(X(170.0f), Y(88.0f));
+	MenuControls_7.AddPicture(&m_sprites[FE_CONTROLLER],
+		&m_sprites[FE_CONTROLLERSH],
+		0.0f, 0.0f, X(235.2f), Y(175.2), CRGBA(255, 255, 255, 255));
+	MenuControls_7.AddPicture(&m_sprites[FE_ARROWS4],
+		0.0f, 0.0f, X(235.2f), Y(175.2), CRGBA(255, 255, 255, 255));
+	MenuControls_7.SetNewOldTextScale(true, CONTR_DESCR_NEW_TEXTSCALE_scaled, defaultTextScale2);
+	InitialiseTextsInMenuControllerInCar(&MenuControls_7, CMenuManager::CONFIG_2);
+	MenuControls_7.SetShadows(true, TEXT_SHADOW_COLOR, SHADOW_VECTOR);
+	MenuControls_7.SetNewOldShadowWrapX(true, X(600.0f+SHADOW_VECTOR.x), X(600.0f));
+
+	MenuControls_1.m_numOptions = 0;
+	MenuControls_1.SetPosition(X(284.0f), Y(290.0f));
+	MenuControls_1.SetColors(TITLE_TEXT_COLOR, TEXT_COLOR, SELECTED_TEXT_COLOR);
+	MenuControls_1.SetNewOldTextScale(true, CONFIGS_NEW_TEXTSCALE_scaled, defaultTextScale3, false);
+	MenuControls_1.AddTitle(TheText.Get("FEC_CCF"), 0.0f, 0.0f, true);
+	MenuControls_1.AddOption(TheText.Get("FEC_CF1"), X(15.0f), Y(2.0f), TriggerControls_ContrConfig, false, false);
+	MenuControls_1.AddOption(TheText.Get("FEC_CF2"), X(85.0f), Y(2.0f), TriggerControls_ContrConfig, false, false);
+	MenuControls_1.AddOption(TheText.Get("FEC_CF3"), X(155.0f), Y(2.0f), TriggerControls_ContrConfig, false, false);
+	MenuControls_1.AddOption(TheText.Get("FEC_CF4"), X(225.0f), Y(2.0f), TriggerControls_ContrConfig, false, false);
+	MenuPage_Controls.AddMenu(&MenuControls_1);
+	MenuControls_1.m_alwaysTrigger = (CMenuMultiChoiceTriggered::Trigger)TriggerControls_DrawContrConfig;
+	MenuControls_1.m_alwaysHighlightTrigger = (CMenuMultiChoiceTriggered::Trigger)TriggerControls_DrawHNContrConfig;
+	MenuControls_1.m_alwaysNormalTrigger = (CMenuMultiChoiceTriggered::Trigger)TriggerControls_DrawHNContrConfig;
+
+	MenuControls_2.m_numOptions = 0;
+	MenuControls_2.SetPosition(X(284.0f), Y(310.0f));
+	MenuControls_2.SetColors(TITLE_TEXT_COLOR, TEXT_COLOR, SELECTED_TEXT_COLOR);
+	MenuControls_2.SetNewOldTextScale(true, CONFIGS_NEW_TEXTSCALE_scaled, defaultTextScale3, false);
+	MenuControls_2.AddTitle(TheText.Get("FEC_CDP"), 0.0f, 0.0f, true);
+	MenuControls_2.AddOption(TheText.Get("FEC_ONF"), X(15.0f), Y(2.0f), (CMenuMultiChoiceTriggered::Trigger)TriggerControls_ContrDisplay, false, false);
+	MenuControls_2.AddOption(TheText.Get("FEC_INC"), X(105.0f), Y(2.0f), (CMenuMultiChoiceTriggered::Trigger)TriggerControls_ContrDisplay, false, false);
+	MenuPage_Controls.AddMenu(&MenuControls_2);
+	MenuControls_2.m_bTwoState = true;
+	MenuControls_2.SetMenuSelection(0);
+
+	MenuControls_5.SetPosition(X(284.0f), Y(330.0f));
+	MenuControls_5.SetColors(TITLE_TEXT_COLOR, TEXT_COLOR);
+	MenuControls_5.SetNewOldTextScale(true, CONFIGS_NEW_TEXTSCALE_scaled, defaultTextScale3, false);
+	MenuControls_5.AddTitle(TheText.Get("FEC_VIB"), false, 0.0f, 0.0f, true);
+	MenuControls_5.SetOptionPosition(X(15.0f), Y(2.0f), TriggerControls_Vibrations, false);
+	MenuPage_Controls.AddMenu(&MenuControls_5);
+	MenuPage_Controls.SetShadows(true, TEXT_SHADOW_COLOR, SHADOW_VECTOR);
+	MenuPage_Controls.ActivatePage();
+
+
+	/* Audio */
+
+	CVector2D audioOutputScale(X(0.49f), Y(0.63f));
+	CVector2D defaultTextScale4(X(MENU_TEXT_SIZE_X), Y(MENU_TEXT_SIZE_Y));
+
+	FEC_MOVETAB movetab;
+	MenuAudio_1.SetPosition(X(70.0f), Y(80.0f));
+	MenuAudio_1.SetColors(TEXT_COLOR, TEXT_COLOR, SLIDER_LEFT_COLOR, SLIDER_RIGHT_COLOR);
+	MenuAudio_1.AddTitle(TheText.Get("FEA_MUS"), 0.0f, 0.0f);
+	MenuAudio_1.AddTickBox(X(15.0f), Y(20.0f), X(150.0f), Y(5.0f), Y(45.0f), TriggerAudio_MusicVolume, TriggerAudio_MusicVolumeAlways);
+	movetab.right = 1;
+	movetab.left = 2;
+	movetab.down = 3;
+	movetab.up = 3;
+	MenuPage_Audio.AddMenu(&MenuAudio_1, &movetab);
+
+	MenuAudio_4.m_numOptions = 0;
+	MenuAudio_4.SetPosition(X(280.0f), Y(80.0f));
+	MenuAudio_4.SetColors(TITLE_TEXT_COLOR, TEXT_COLOR, SELECTED_TEXT_COLOR);
+	MenuAudio_4.SetNewOldTextScale(true, audioOutputScale, defaultTextScale4, false);
+	MenuAudio_4.AddTitle(TheText.Get("FEA_OUT"), X(AUDIO_OUTPUT_POS.x), Y(AUDIO_OUTPUT_POS.y), false);
+	MenuAudio_4.AddOption(TheText.Get("FEA_ST"), X(-15.0f), Y(30.0f), TriggerAudio_StereoMono, false, false);
+	MenuAudio_4.AddOption(TheText.Get("FEA_MNO"), X(55.0f), Y(30.0f), TriggerAudio_StereoMono, false, false);
+	movetab.right = 2;
+	movetab.left = 0;
+	movetab.down = 3;
+	movetab.up = 3;
+	MenuPage_Audio.AddMenu(&MenuAudio_4, &movetab);
+	MenuAudio_4.m_bTwoState = true;
+
+	MenuAudio_2.SetPosition(X(410.0f), Y(80.0f));
+	MenuAudio_2.SetColors(TEXT_COLOR, TEXT_COLOR, SLIDER_LEFT_COLOR, SLIDER_RIGHT_COLOR);
+	MenuAudio_2.AddTitle(TheText.Get("FEA_SFX"), 0.0f, 0.0f);
+	MenuAudio_2.AddTickBox(X(5.0f), Y(20.0f), X(150.0f), Y(5.0f), Y(45.0f), TriggerAudio_SfxVolume, TriggerAudio_SfxVolumeAlways);
+	movetab.right = 0;
+	movetab.left = 1;
+	movetab.down = 3;
+	movetab.up = 3;
+	MenuPage_Audio.AddMenu(&MenuAudio_2, &movetab);
+
+	MenuAudio_3.m_numOptions = 0;
+	MenuAudio_3.SetPosition(X(50.0f), Y(170.0f));
+	MenuAudio_3.SetColors(TITLE_TEXT_COLOR, CRGBA(64, 64, 64, 255), CRGBA(250, 250, 250, 255));
+	MenuAudio_3.AddTitle(TheText.Get("FEA_RSS"), X(AUDIO_RSTATION_POS.x), Y(AUDIO_RSTATION_POS.y), false);
+	// first row
+	movetab.right = 1;
+	movetab.left = 4;
+	movetab.down = 5;
+	movetab.up = 5;
+	MenuAudio_3.AddOption(&m_sprites[FE_RADIO1], &movetab, 0.0f, Y(18.0f),
+		CVector2D(X(96.0f), YF(72.0f)), TriggerAudio_RadioStation, false);
+	movetab.right = 2;
+	movetab.left = 0;
+	movetab.down = 6;
+	movetab.up = 6;
+	MenuAudio_3.AddOption(&m_sprites[FE_RADIO2], &movetab, X(106.0f), Y(20.0f),
+		CVector2D(X(79.2f), YF(81.0f)), TriggerAudio_RadioStation, false);
+	movetab.right = 3;
+	movetab.left = 1;
+	movetab.down = 7;
+	movetab.up = 7;
+	MenuAudio_3.AddOption(&m_sprites[FE_RADIO5], &movetab, X(210.0f), Y(20.0f),
+		CVector2D(X(86.4f), YF(72.0f)), TriggerAudio_RadioStation, false);
+	movetab.right = 4;
+	movetab.left = 2;
+	movetab.down = 8;
+	movetab.up = 8;
+	MenuAudio_3.AddOption(&m_sprites[FE_RADIO7], &movetab, X(324.0f), Y(5.0f),
+		CVector2D(X(115.2f), YF(102.0f)), TriggerAudio_RadioStation, false);
+	movetab.right = 0;
+	movetab.left = 3;
+	movetab.down = 8;
+	movetab.up = 8;
+	MenuAudio_3.AddOption(&m_sprites[FE_RADIO8], &movetab, X(446.0f), Y(5.0f),
+		CVector2D(X(102.96f), YF(101.4f)), TriggerAudio_RadioStation, false);
+	// second row
+	movetab.right = 6;
+	movetab.left = 8;
+	movetab.down = 0;
+	movetab.up = 0;
+	MenuAudio_3.AddOption(&m_sprites[FE_RADIO3], &movetab, X(60.0f), Y(96.0f),
+		CVector2D(X(87.36f), YF(85.8f)), TriggerAudio_RadioStation, false);
+	movetab.right = 7;
+	movetab.left = 5;
+	movetab.down = 1;
+	movetab.up = 1;
+	MenuAudio_3.AddOption(&m_sprites[FE_RADIO4], &movetab, X(130.0f), Y(72.0f),
+		CVector2D(X(129.6f), YF(129.0f)), TriggerAudio_RadioStation, false);
+	movetab.right = 8;
+	movetab.left = 6;
+	movetab.down = 2;
+	movetab.up = 2;
+	MenuAudio_3.AddOption(&m_sprites[FE_RADIO6], &movetab, X(284.0f), Y(108.0f),
+		CVector2D(X(60.0f), YF(60.0f)), TriggerAudio_RadioStation, false);
+	movetab.right = 5;
+	movetab.left = 7;
+	movetab.down = 3;
+	movetab.up = 3;
+	MenuAudio_3.AddOption(&m_sprites[FE_RADIO9], &movetab, X(404.0f), Y(85.0f),
+		CVector2D(X(81.12f), YF(101.4f)), TriggerAudio_RadioStation, false);
+	movetab.right = 2;
+	movetab.left = 0;
+	movetab.down = 1;
+	movetab.up = 1;
+	MenuPage_Audio.AddMenu(&MenuAudio_3, &movetab);
+	MenuPage_Audio.SetShadows(true, TEXT_SHADOW_COLOR, SHADOW_VECTOR);
+	MenuPage_Audio.ActivatePage();
+
+
+	/* Display */
+
+	MenuDisplay_1.SetPosition(X(240.0f), Y(140.0f));
+	MenuDisplay_1.SetColors(TEXT_COLOR, TEXT_COLOR, SLIDER_LEFT_COLOR, SLIDER_RIGHT_COLOR);
+	MenuDisplay_1.m_style = 0;	// ticks
+	MenuDisplay_1.AddTitle(TheText.Get("FED_BRI"), X(DISPLAY_BRIGHTNESS_POS.x), Y(DISPLAY_BRIGHTNESS_POS.y));
+	MenuDisplay_1.AddTickBox(X(-30.0f), Y(20.0f), X(200.0f), Y(40.0f), Y(40.0f));
+	MenuPage_Display.AddMenu(&MenuDisplay_1);
+	MenuDisplay_2.SetPosition(X(290.0f), Y(240.0f));
+	MenuDisplay_2.SetColors(TITLE_TEXT_COLOR, TEXT_COLOR);
+	MenuDisplay_2.AddTitle(TheText.Get("FED_TRA"), false, 0.0f, 0.0f, true);
+#ifdef GTA_PC
+	MenuDisplay_2.SetOptionPosition(X(40.0f), 0.0f, TriggerDisplay_Trails, false);
+#else
+	MenuDisplay_2.SetOptionPosition(X(40.0f), 0.0f, false);
+#endif
+	MenuDisplay_2.m_bTwoState = true;
+	MenuPage_Display.AddMenu(&MenuDisplay_2);
+	MenuDisplay_3.SetPosition(X(290.0f), Y(260.0f));
+	MenuDisplay_3.SetColors(TITLE_TEXT_COLOR, TEXT_COLOR);
+	MenuDisplay_3.AddTitle(TheText.Get("FED_SUB"), false, 0.0f, 0.0f, true);
+	MenuDisplay_3.SetOptionPosition(X(40.0f), 0.0f, false);
+	MenuDisplay_3.m_bTwoState = true;
+	MenuPage_Display.AddMenu(&MenuDisplay_3);
+	MenuDisplay_4.SetPosition(X(290.0f), Y(280.0f));
+	MenuDisplay_4.SetColors(TITLE_TEXT_COLOR, TEXT_COLOR);
+	MenuDisplay_4.AddTitle(TheText.Get("FED_WIS"), false, 0.0f, 0.0f, true);
+	MenuDisplay_4.SetOptionPosition(X(40.0f), 0.0f, false);
+	MenuDisplay_4.m_bTwoState = true;
+	MenuPage_Display.AddMenu(&MenuDisplay_4);
+	MenuPage_Display.SetShadows(true, TEXT_SHADOW_COLOR, SHADOW_VECTOR);
+	MenuPage_Display.ActivatePage();
+
+
+	/* Language */
+	MenuLanguage_1.m_numOptions = 0;
+	MenuLanguage_1.SetPosition(X(288.0f), Y(160.0f));
+	MenuLanguage_1.SetColors(TITLE_TEXT_COLOR, TEXT_COLOR, SELECTED_TEXT_COLOR);
+	MenuLanguage_1.AddOption(TheText.Get("FEL_ENG"), 0.0f, 0.0f, TriggerLanguage_Language, false, false);
+	MenuLanguage_1.AddOption(TheText.Get("FEL_FRE"), 0.0f, Y(20.0f), TriggerLanguage_Language, false, false);
+	MenuLanguage_1.AddOption(TheText.Get("FEL_GER"), 0.0f, Y(40.0f), TriggerLanguage_Language, false, false);
+	MenuLanguage_1.AddOption(TheText.Get("FEL_ITA"), 0.0f, Y(60.0f), TriggerLanguage_Language, false, false);
+	MenuLanguage_1.AddOption(TheText.Get("FEL_SPA"), 0.0f, Y(80.0f), TriggerLanguage_Language, false, false);
+	MenuPage_Language.AddMenu(&MenuLanguage_1);
+	MenuPage_Language.SetShadows(true, TEXT_SHADOW_COLOR, SHADOW_VECTOR);
+	MenuPage_Language.ActivatePage();
+
+
+	/*
+	 * Save zone menu
+	 */
+
+	CVector2D saveGameTextScale2(X(0.49f), Y(0.7f));
+	CVector2D defaultTextScale5(X(MENU_TEXT_SIZE_X), Y(MENU_TEXT_SIZE_Y));
+
+	/* Save game */
+
+	MenuSaveZoneSG_1.m_numOptions = 0;
+	MenuSaveZoneSG_1.SetPosition(X(200.0f), Y(100.0f));
+	MenuSaveZoneSG_1.SetColors(TITLE_TEXT_COLOR, TEXT_COLOR, TEXT_COLOR);
+	MenuSaveZoneSG_1.AddOption(TheText.Get("FESZ_SA"), 0.0f, Y(20.0f), TriggerSaveZone_SaveGameSelect, false, false);
+	MenuSaveZoneSG_1.AddOption(TheText.Get("FESZ_CA"), 0.0f, Y(40.0f), TriggerSaveZone_QuitMenu, false, false);
+	MenuSaveZoneSG_1.m_defaultCancel = TriggerSaveZone_QuitMenu;
+	MenuPageSaveZone_SaveGame.AddMenu(&MenuSaveZoneSG_1);
+	MenuSaveZoneSG_1.SetMenuSelection(1);
+	MenuPageSaveZone_SaveGame.SetShadows(true, TEXT_SHADOW_COLOR, SHADOW_VECTOR);
+	MenuPageSaveZone_SaveGame.ActivatePage();
+
+	/* Select slot */
+
+	MenuSaveZoneSSL_1.m_numOptions = 0;
+	MenuSaveZoneSSL_1.SetPosition(X(160.0f), Y(100.0f));
+	MenuSaveZoneSSL_1.SetColors(TITLE_TEXT_COLOR, TEXT_COLOR, TEXT_COLOR);
+	MenuSaveZoneSSL_1.AddOption(TheText.Get("FESZ_CA"), 0.0f, 0.0f, TriggerSaveZone_BackToMainMenuTwoLines, false, false);
+	MenuSaveZoneSSL_1.SetNewOldTextScale(true, saveGameTextScale2, defaultTextScale5, true);
+	MenuPageSaveZone_SaveSlots.AddMenu(&MenuSaveZoneSSL_1);
+	MenuSaveZoneSSL_1.SetMenuSelection(0);
+	MenuPageSaveZone_SaveSlots.SetShadows(true, TEXT_SHADOW_COLOR, SHADOW_VECTOR);
+	MenuPageSaveZone_SaveSlots.ActivatePage();
+
+	/* Save successful */
+
+	MenuSaveZoneSS_1.m_numTexts = 0;
+	MenuSaveZoneSS_1.SetPosition(X(200.0f), Y(100.0f));
+	MenuSaveZoneSS_1.AddText(TheText.Get("FESZ_L1"), X(-40.0f), 0.0f, TITLE_TEXT_COLOR, false);
+	MenuSaveZoneSS_1.AddText(TheText.Get("FESZ_L2"), X(-40.0f), Y(20.0f), TITLE_TEXT_COLOR, false);
+	// twice this line?
+	MenuSaveZoneSS_1.AddText(TheText.Get("FESZ_L2"), X(-40.0f), Y(40.0f), TEXT_COLOR, false);
+	MenuPageSaveZone_SavedSuccessfully.AddMenu(&MenuSaveZoneSS_1);
+	MenuSaveZoneSS_2.m_numOptions = 0;
+	MenuSaveZoneSS_2.SetPosition(X(200.0f), Y(170.0f));
+	MenuSaveZoneSS_2.SetColors(TITLE_TEXT_COLOR, TEXT_COLOR, TEXT_COLOR);
+	MenuSaveZoneSS_2.AddOption(TheText.Get("FESZ_QU"), X(60.0f), 0.0f, TriggerSaveZone_QuitMenu, false, false);
+	MenuPageSaveZone_SavedSuccessfully.AddMenu(&MenuSaveZoneSS_2);
+	MenuPageSaveZone_SavedSuccessfully.SetShadows(true, TEXT_SHADOW_COLOR, SHADOW_VECTOR);
+	MenuPageSaveZone_SavedSuccessfully.ActivatePage();
+
+
+	MenuSaveZoneMSG_1.m_numTexts = 0;
+	MenuSaveZoneMSG_1.SetPosition(X(170.0f), Y(130.0f));
+	MenuSaveZoneMSG_1.AddText(TheText.Get("FESZ_SR"), X(-40.0f), 0.0f, TEXT_COLOR, false);
+	MenuSaveZoneMSG_1.SetTextsColor(TEXT_COLOR);
+	MenuSaveZoneMSG_1.SetNewOldShadowWrapX(true, X(600.0f+SHADOW_VECTOR.x-20.0f), X(580.0f));
+	MenuPageSaveZone_Message.AddMenu(&MenuSaveZoneMSG_1);
+	MenuSaveZoneMSG_2.m_numOptions = 0;
+	MenuSaveZoneMSG_2.SetPosition(X(170.0f), Y(180.0f));
+	MenuSaveZoneMSG_2.SetColors(TITLE_TEXT_COLOR, TEXT_COLOR, TEXT_COLOR);
+	MenuSaveZoneMSG_2.AddOption(TheText.Get("FESZ_OK"), X(40.0f), 0.0f, TriggerSaveZone_QuitMenu, false, false);
+	MenuPageSaveZone_Message.AddMenu(&MenuSaveZoneMSG_2);
+	MenuPageSaveZone_Message.SetShadows(true, TEXT_SHADOW_COLOR, SHADOW_VECTOR);
+	MenuPageSaveZone_Message.ActivatePage();
+
+
+	MenuSaveZoneQYN_1.m_numTexts = 0;
+	MenuSaveZoneQYN_1.SetPosition(X(170.0f), Y(130.0f));
+	MenuSaveZoneQYN_1.AddText(TheText.Get("FESZ_SR"), X(-40.0f), 0.0f, TEXT_COLOR, false);
+	MenuSaveZoneQYN_1.SetTextsColor(TEXT_COLOR);
+	MenuSaveZoneQYN_1.SetNewOldShadowWrapX(true, X(600.0f+SHADOW_VECTOR.x-20.0f), X(580.0f));
+	MenuPageSaveZone_QuestionYesNo.AddMenu(&MenuSaveZoneQYN_1);
+	MenuSaveZoneQYN_2.m_numOptions = 0;
+	MenuSaveZoneQYN_2.SetPosition(X(170.0f), Y(180.0f));
+	MenuSaveZoneQYN_2.SetColors(TITLE_TEXT_COLOR, TEXT_COLOR, TEXT_COLOR);
+	MenuSaveZoneQYN_2.AddOption(TheText.Get("FEM_YES"), X(80.0f), 0.0f, TriggerSaveZone_QuitMenu, false, false);
+	MenuSaveZoneQYN_2.AddOption(TheText.Get("FEM_NO"), X(80.0f), Y(20.0f), TriggerSaveZone_QuitMenu, false, false);
+	MenuPageSaveZone_QuestionYesNo.AddMenu(&MenuSaveZoneQYN_2);
+	MenuPageSaveZone_QuestionYesNo.SetShadows(true, TEXT_SHADOW_COLOR, SHADOW_VECTOR);
+	MenuPageSaveZone_QuestionYesNo.ActivatePage();
+
+	/* Format card */
+
+	MenuSaveZoneFC_1.m_numOptions = 0;
+	MenuSaveZoneFC_1.SetPosition(X(200.0f), Y(100.0f));
+	MenuSaveZoneFC_1.SetColors(TITLE_TEXT_COLOR, TEXT_COLOR, TEXT_COLOR);
+	MenuSaveZoneFC_1.AddTitle(TheText.Get("FESZ_FM"), X(-100.0f), 0.0f, false);
+	MenuSaveZoneFC_1.AddOption(TheText.Get("FEM_NO"), X(40.0f), Y(95.0f), TriggerSaveZone_BackToMainMenu, false, false);
+	MenuSaveZoneFC_1.AddOption(TheText.Get("FEM_YES"), X(40.0f), Y(75.0f), TriggerSaveZone_FormatCardSelect, false, false);
+	MenuSaveZoneFC_1.m_defaultCancel = TriggerSaveZone_FormatCardSelect;
+	MenuPageSaveZone_FormatCard.AddMenu(&MenuSaveZoneFC_1);
+	MenuPageSaveZone_FormatCard.SetShadows(true, TEXT_SHADOW_COLOR, SHADOW_VECTOR);
+	MenuPageSaveZone_FormatCard.ActivatePage();
+
+	/* Format error */
+
+	MenuSaveZoneEF_1.m_numOptions = 0;
+	MenuSaveZoneEF_1.SetPosition(X(200.0f), Y(100.0f));
+	MenuSaveZoneEF_1.SetColors(TITLE_TEXT_COLOR, TEXT_COLOR, TEXT_COLOR);
+	MenuSaveZoneEF_1.AddTitle(TheText.Get("FESZ_FF"), X(-40.0f), 0.0f, false);
+	MenuSaveZoneEF_1.AddOption(TheText.Get("FESZ_OK"), X(70.0f), Y(20.0f), TriggerSaveZone_FormatFailedOK, false, false);
+	MenuPageSaveZone_ErrorFormat.AddMenu(&MenuSaveZoneEF_1);
+	MenuPageSaveZone_ErrorFormat.SetShadows(true, TEXT_SHADOW_COLOR, SHADOW_VECTOR);
+	MenuPageSaveZone_ErrorFormat.ActivatePage();
+
+	pActiveMenuPage = &MenuPage_Stats;
+	pActiveMenuPage->ActivatePage();
+
+	InitialiseMenuContents();
+
+	m_bWantToUpdateContent = false;
+}
+
+void
+CMenuManager::InitialiseChangedLanguageSettings(void)
+{
+	if ( bFrontEnd_ReloadObrTxtGxt )
+	{
+		bFrontEnd_ReloadObrTxtGxt = false;
+
+		CTimer::Stop();
+		TheText.Unload();
+		TheText.Load();
+		CTimer::Update();
+
+		FrontEndMenuManager.AnaliseMenuContents();
+		CGame::frenchGame = false;
+		CGame::germanGame = false;
+		if ( m_PrefsAllowNastyGame )
+			CGame::nastyGame = true;
+
+		for ( int32 i = 0; i < NUM_PAGES; i++ )
+		{
+			BUTTONTAB_TEXT_X_SCALES[i] = 1.0f;
+			PANEL_TEXT_X_SCALES[i] = 1.0f;
+		}
+
+		switch ( m_PrefsLanguage )
+		{
+			case LANGUAGE_AMERICAN:
+			{
+				MENU_TEXT_SIZE_X = 0.644f;
+				MENU_TEXT_SIZE_Y = 0.84f;//0.96f;
+
+				BUTTONTAB_TEXT_SIZE_X = 0.35f;
+				BUTTONTAB_TEXT_SIZE_Y = 0.7f;//0.8f;
+
+				BUTTONTAB_TEXT_X_SCALES[6] = 0.94f;
+
+				CONTR_DESCR_NEW_TEXTSCALE.x = 0.4564f;
+				CONTR_DESCR_NEW_TEXTSCALE.y = 0.63f;//0.72f;
+
+				CONFIGS_NEW_TEXTSCALE.x = 0.49f;
+				CONFIGS_NEW_TEXTSCALE.y = 0.7f;//0.8f;
+
+				AUDIO_OUTPUT_POS.x = 0.0f;
+				AUDIO_OUTPUT_POS.y = 0.0f;
+
+				AUDIO_RSTATION_POS.x = 154.0f;
+				AUDIO_RSTATION_POS.y = 0.0f;
+
+				DISPLAY_BRIGHTNESS_POS.x = 0.0f;
+				DISPLAY_BRIGHTNESS_POS.y = 0.0f;
+
+				MEMCARD_ACCESS_MSG_SIZE_X = 0.84f;
+				MEMCARD_ACCESS_MSG_SIZE_Y = 1.12f;//1.28f;
+
+				break;
+			}
+
+			case LANGUAGE_FRENCH:
+			{
+				CGame::frenchGame = true;
+				if ( m_PrefsAllowNastyGame )
+					CGame::nastyGame = false;
+
+				MENU_TEXT_SIZE_X = 0.504f;
+				MENU_TEXT_SIZE_Y = 0.84f;//0.96f;
+
+				BUTTONTAB_TEXT_SIZE_X = 0.32f;
+				BUTTONTAB_TEXT_SIZE_Y = 0.7f;//0.8f;
+
+				BUTTONTAB_TEXT_X_SCALES[0] = 0.84f;
+				BUTTONTAB_TEXT_X_SCALES[3] = 0.84f;
+				PANEL_TEXT_X_SCALES[1] = 0.8f;
+
+				CONTR_DESCR_NEW_TEXTSCALE.x = 0.385f;
+				CONTR_DESCR_NEW_TEXTSCALE.y = 0.63f;//0.72f;
+
+				CONFIGS_NEW_TEXTSCALE.x = 0.455f;
+				CONFIGS_NEW_TEXTSCALE.y = 0.7f;//0.8f;
+
+				AUDIO_OUTPUT_POS.x = -15.0f;
+				AUDIO_OUTPUT_POS.y = 0.0f;
+
+				AUDIO_RSTATION_POS.x = 184.0f;
+				AUDIO_RSTATION_POS.y = 0.0f;
+
+				DISPLAY_BRIGHTNESS_POS.x = 20.0f;
+				DISPLAY_BRIGHTNESS_POS.y = 0.0f;
+
+				MEMCARD_ACCESS_MSG_SIZE_X = 0.84f;
+				MEMCARD_ACCESS_MSG_SIZE_Y = 1.12f;//1.28f;
+
+				break;
+			}
+
+			case LANGUAGE_GERMAN:
+			{
+				CGame::germanGame = true;
+				if ( m_PrefsAllowNastyGame )
+					CGame::nastyGame = false;
+
+				MENU_TEXT_SIZE_X = 0.546f;
+				MENU_TEXT_SIZE_Y = 0.84f;//0.96f;
+
+				BUTTONTAB_TEXT_SIZE_X = 0.32f;
+				BUTTONTAB_TEXT_SIZE_Y = 0.7f;//0.8f;
+
+				CONTR_DESCR_NEW_TEXTSCALE.x = 0.35f;
+				CONTR_DESCR_NEW_TEXTSCALE.y = 0.63f;//0.72f;
+
+				CONFIGS_NEW_TEXTSCALE.x = 0.434f;
+				CONFIGS_NEW_TEXTSCALE.y = 0.7f;//0.8f;
+
+				AUDIO_OUTPUT_POS.x = -15.0f;
+				AUDIO_OUTPUT_POS.y = 0.0f;
+
+				AUDIO_RSTATION_POS.x = 154.0f;
+				AUDIO_RSTATION_POS.y = 0.0f;
+
+				DISPLAY_BRIGHTNESS_POS.x = 20.0f;
+				DISPLAY_BRIGHTNESS_POS.y = 0.0f;
+
+				MEMCARD_ACCESS_MSG_SIZE_X = 0.7f;
+				MEMCARD_ACCESS_MSG_SIZE_Y = 1.12f;//1.28f;
+
+				break;
+			}
+
+			case LANGUAGE_ITALIAN:
+			{
+				MENU_TEXT_SIZE_X = 0.574f;
+				MENU_TEXT_SIZE_Y = 0.84f;//0.96f;
+
+				BUTTONTAB_TEXT_SIZE_X = 0.32f;
+				BUTTONTAB_TEXT_SIZE_Y = 0.7f;//0.8f;
+
+				BUTTONTAB_TEXT_X_SCALES[0] = 0.86f;
+				PANEL_TEXT_X_SCALES[1] = 0.9f;
+
+				CONTR_DESCR_NEW_TEXTSCALE.x = 0.385f;
+				CONTR_DESCR_NEW_TEXTSCALE.y = 0.63f;//0.72f;
+
+				CONFIGS_NEW_TEXTSCALE.x = 0.42f;
+				CONFIGS_NEW_TEXTSCALE.y = 0.7f;//0.8f;
+
+				AUDIO_OUTPUT_POS.x = 10.0f;
+				AUDIO_OUTPUT_POS.y = 0.0f;
+
+				AUDIO_RSTATION_POS.x = 194.0f;
+				AUDIO_RSTATION_POS.y = 0.0f;
+
+				DISPLAY_BRIGHTNESS_POS.x = 10.0f;
+				DISPLAY_BRIGHTNESS_POS.y = 0.0f;
+
+				MEMCARD_ACCESS_MSG_SIZE_X = 0.84f;
+				MEMCARD_ACCESS_MSG_SIZE_Y = 1.12f;//1.28f;
+
+				break;
+			}
+
+			case LANGUAGE_SPANISH:
+			{
+				MENU_TEXT_SIZE_X = 0.546f;
+				MENU_TEXT_SIZE_Y = 0.84f;//0.96f;
+
+				BUTTONTAB_TEXT_SIZE_X = 0.35f;
+				BUTTONTAB_TEXT_SIZE_Y = 0.7f;//0.8f;
+
+				BUTTONTAB_TEXT_X_SCALES[0] = 0.78f;
+				PANEL_TEXT_X_SCALES[1] = 0.95f;
+
+				CONTR_DESCR_NEW_TEXTSCALE.x = 0.364f;
+				CONTR_DESCR_NEW_TEXTSCALE.y = 0.63f;//0.72f;
+
+				CONFIGS_NEW_TEXTSCALE.x = 0.455f;
+				CONFIGS_NEW_TEXTSCALE.y = 0.7f;//0.8f;
+
+				AUDIO_OUTPUT_POS.x = 10.0f;
+				AUDIO_OUTPUT_POS.y = 0.0f;
+
+				AUDIO_RSTATION_POS.x = 124.0f;
+				AUDIO_RSTATION_POS.y = 0.0f;
+
+				DISPLAY_BRIGHTNESS_POS.x = 30.0f;
+				DISPLAY_BRIGHTNESS_POS.y = 0.0f;
+
+				MEMCARD_ACCESS_MSG_SIZE_X = 0.84f;
+				MEMCARD_ACCESS_MSG_SIZE_Y = 1.12f;//1.28f;
+
+				break;
+			}
+		}
+	}
+}
+
+void
+CMenuManager::InitialiseMenuContents(void)
+{
+	if ( m_bWantToUpdateContent == false )
+	{
+		m_bWantToUpdateContent = true;
+
+		m_pageState = PAGESTATE_NORMAL;
+
+		switch ( CPad::GetPad(0)->GetMode() )
+		{
+			case 3: m_PrefsControllerConfig = CONFIG_4; break;
+			case 2: m_PrefsControllerConfig = CONFIG_3; break;
+			case 1: m_PrefsControllerConfig = CONFIG_2; break;
+			case 0: m_PrefsControllerConfig = CONFIG_1; break;
+		}
+
+		MenuControls_1.SetMenuSelection(m_PrefsControllerConfig);
+		MenuControls_5.SetMenuSelection(m_PrefsUseVibration);
+
+		MenuAudio_1.SetMenuSelection(m_PrefsMusicVolume / 127.0f * 100.0f + 0.5f);
+		MenuAudio_2.SetMenuSelection(m_PrefsSfxVolume   / 127.0f * 100.0f + 0.5f);
+		MenuAudio_3.SetMenuSelection(m_PrefsRadioStation);
+		MenuAudio_4.SetMenuSelection(m_PrefsStereoMono);
+
+		MenuDisplay_1.SetMenuSelection(m_PrefsBrightness / 512.0f * 100.0f + 0.5f);
+#ifdef PS2
+		m_PrefsShowTrails = BlurOn;
+#else
+		m_PrefsShowTrails = CMBlur::BlurOn;
+#endif
+		MenuDisplay_2.SetMenuSelection(m_PrefsShowTrails);
+		MenuDisplay_3.SetMenuSelection(m_PrefsShowSubtitles);
+		MenuDisplay_4.SetMenuSelection(m_PrefsUseWideScreen);
+
+		MenuLanguage_1.SetMenuSelection(m_PrefsLanguage);
+
+		FillMenuWithMemCardFileListing(&MenuSaveLG_2, TriggerSave_BackToMainMenuTwoLines, TriggerSave_LoadGameLoadGameSelect,     nil, 0, 34, 22);
+		FillMenuWithMemCardFileListing(&MenuSaveDG_2, TriggerSave_BackToMainMenuTwoLines, TriggerSave_DeleteGameDeleteGameSelect, nil, 0, 34, 22);
+
+		MenuBriefs_1.m_numTexts = 0;
+		MenuBriefs_1.AddText(TheText.Get("FEB_PMB"), 0.0f, 0.0f, TITLE_TEXT_COLOR, 0); // Previous Mission Briefs:
+
+		static wchar StringsToDisplay[NUMPREVIOUSBRIEFS][256];
+
+		CRGBA newColor;
+		int32 brierY = 36;
+
+		for ( int32 i = NUMPREVIOUSBRIEFS-1; i >= 0; i-- )
+		{
+			tPreviousBrief &brief = CMessages::PreviousBriefs[i];
+			if (brief.m_pText)
+			{
+				CMessages::InsertNumberInString(brief.m_pText,
+					brief.m_nNumber[0], brief.m_nNumber[1],
+					brief.m_nNumber[2], brief.m_nNumber[3],
+					brief.m_nNumber[4], brief.m_nNumber[5], StringsToDisplay[i]);
+				CMessages::InsertStringInString(StringsToDisplay[i], brief.m_pString);
+
+				newColor = TEXT_COLOR;
+				FilterOutColorMarkersFromString(StringsToDisplay[i], newColor);
+
+				if (newColor != TEXT_COLOR)
+				{
+					newColor.r /= 2;
+					newColor.g /= 2;
+					newColor.b /= 2;
+				}
+				MenuBriefs_1.AddText(StringsToDisplay[i], 0.0f, YF((float)brierY), newColor, 0);
+				brierY += 54;
+			}
+		}
+
+		MenuStats_1.m_scrollPosition = 0.0f;
+		MenuStats_1.ResetNumberOfTextLines();
+
+		nStatLinesIndex = 0;
+
+		#define STAT_HEADER(str) do { MenuStats_1.AddTextLine(TheText.Get(str), nil); } while(0)
+		#define STAT_PARAM(str) do { MenuStats_1.AddTextLine(nil, TheText.Get(str)); } while(0)
+		#define STAT_LINE(str, left, isFloat, right) do { MenuStats_1.AddTextLine(TheText.Get(str), PrintStatLine(str, left, isFloat, right)); } while(0)
+
+		int32 nTemp;
+
+		STAT_HEADER("PL_STAT");
+
+		int32 percentCompleted = (CStats::TotalProgressInGame == 0 ? 0 : CStats::ProgressMade * 100.0f / (CGame::nastyGame ? CStats::TotalProgressInGame : CStats::TotalProgressInGame - 1));
+		percentCompleted = Min(percentCompleted, 100);
+
+		STAT_LINE("PER_COM", &percentCompleted,       0, nil);
+
+		STAT_LINE("NMISON",  &CStats::MissionsGiven,  0, nil);
+
+		STAT_LINE("FEST_MP", &CStats::MissionsPassed, 0, &CStats::TotalNumberMissions);
+
+		if ( CGame::nastyGame )
+			STAT_LINE("FEST_RP", &CStats::NumberKillFrenziesPassed, 0, &CStats::TotalNumberKillFrenzies);
+
+		CPlayerInfo &player = CWorld::Players[CWorld::PlayerInFocus];
+		float packagesPercent = 0.0f;
+		if (player.m_nTotalPackages != 0)
+			packagesPercent = player.m_nCollectedPackages * 100.0f / player.m_nTotalPackages;
+		int32 nPackagesPercent = packagesPercent;
+		nTemp = 100;
+
+		STAT_LINE("PERPIC", &nPackagesPercent,       0, &nTemp);
+
+		STAT_LINE("NOUNIF", &CStats::NumberOfUniqueJumpsFound, 0, &CStats::TotalNumberOfUniqueJumps);
+
+		STAT_LINE("DAYSPS", &CStats::DaysPassed, 0, nil);
+
+		if ( CGame::nastyGame )
+		{
+			STAT_LINE("PE_WAST", &CStats::PeopleKilledByPlayer, 0, nil);
+			STAT_LINE("PE_WSOT", &CStats::PeopleKilledByOthers, 0, nil);
+		}
+
+		STAT_LINE("CAR_EXP", &CStats::CarsExploded, 0, nil);
+
+		STAT_LINE("TM_BUST", &CStats::TimesArrested, 0, nil);
+
+		STAT_LINE("TM_DED", &CStats::TimesDied, 0, nil);
+
+		nTemp = CStats::PedsKilledOfThisType[PEDTYPE_GANG9] + CStats::PedsKilledOfThisType[PEDTYPE_GANG8]
+			+ CStats::PedsKilledOfThisType[PEDTYPE_GANG7] + CStats::PedsKilledOfThisType[PEDTYPE_GANG6]
+			+ CStats::PedsKilledOfThisType[PEDTYPE_GANG5] + CStats::PedsKilledOfThisType[PEDTYPE_GANG4]
+			+ CStats::PedsKilledOfThisType[PEDTYPE_GANG3] + CStats::PedsKilledOfThisType[PEDTYPE_GANG2]
+			+ CStats::PedsKilledOfThisType[PEDTYPE_GANG1];
+		STAT_LINE("GNG_WST", &nTemp, 0, nil);
+
+		nTemp = CStats::PedsKilledOfThisType[PEDTYPE_CRIMINAL];
+		STAT_LINE("DED_CRI", &nTemp, 0, nil);
+
+		STAT_LINE("HEL_DST", &CStats::HelisDestroyed, 0, nil);
+
+		STAT_LINE("KGS_EXP", &CStats::KgsOfExplosivesUsed, 0, nil);
+
+		if (CStats::LongestFlightInDodo > 0)
+			STAT_LINE("FEST_LF", &CStats::LongestFlightInDodo, 0, nil);
+
+		STAT_LINE("CAR_CRU", &CStats::CarsCrushed, 0, nil);
+
+		if (CStats::HighestScores[0] > 0)
+		{
+			STAT_HEADER("FEST_BB");
+			STAT_LINE("FEST_H0", &CStats::HighestScores[0], 0, nil);
+		}
+
+		int32 hs = 0;
+		for ( int32 i = 1; i < 5; i++ )
+			hs += CStats::HighestScores[i];
+
+		if (hs > 0)
+			STAT_HEADER("FEST_GC");
+
+		if (CStats::HighestScores[1] > 0)
+			STAT_LINE("FEST_H1", &CStats::HighestScores[1], 0, nil);
+
+		if (CStats::HighestScores[2] > 0)
+			STAT_LINE("FEST_H2", &CStats::HighestScores[2], 0, nil);
+
+		if (CStats::HighestScores[3] > 0)
+			STAT_LINE("FEST_H3", &CStats::HighestScores[3], 0, nil);
+
+		if (CStats::HighestScores[4] > 0)
+			STAT_LINE("FEST_H4", &CStats::HighestScores[4], 0, nil);
+
+		STAT_LINE("FESTDFM", &CStats::DistanceTravelledOnFoot, 0, nil);
+		STAT_LINE("FESTDCM", &CStats::DistanceTravelledByCar, 0, nil);
+		STAT_LINE("DISTBIM", &CStats::DistanceTravelledByBike, 0, nil);
+		STAT_LINE("DISTBOM", &CStats::DistanceTravelledByBoat, 0, nil);
+		STAT_LINE("DISTGOM", &CStats::DistanceTravelledByGolfCart, 0, nil);
+		STAT_LINE("DISTHEM", &CStats::DistanceTravelledByHelicoptor, 0, nil);
+		STAT_LINE("MMRAIN", &CStats::mmRain, 0, nil);
+		nTemp = (int32)CStats::MaximumJumpDistance;
+		STAT_LINE("MXCARDM", &nTemp, 0, nil);
+		nTemp = (int32)CStats::MaximumJumpHeight;
+		STAT_LINE("MXCARJM", &nTemp, 0, nil);
+
+		STAT_LINE("MXFLIP", &CStats::MaximumJumpFlips, 0, nil);
+		STAT_LINE("MXJUMP", &CStats::MaximumJumpSpins, 0, nil);
+
+		STAT_HEADER("BSTSTU");
+
+		switch (CStats::BestStuntJump)
+		{
+			case 1:  STAT_PARAM("INSTUN"); break;
+			case 2:  STAT_PARAM("PRINST"); break;
+			case 3:  STAT_PARAM("DBINST"); break;
+			case 4:  STAT_PARAM("DBPINS"); break;
+			case 5:  STAT_PARAM("TRINST"); break;
+			case 6:  STAT_PARAM("PRTRST"); break;
+			case 7:  STAT_PARAM("QUINST"); break;
+			case 8:  STAT_PARAM("PQUINS"); break;
+			default: STAT_PARAM("NOSTUC"); break;
+		}
+
+		STAT_LINE("PASDRO", &CStats::PassengersDroppedOffWithTaxi, 0, nil);
+		STAT_LINE("MONTAX", &CStats::MoneyMadeWithTaxi, 0, nil);
+		STAT_LINE("FEST_LS", &CStats::LivesSavedWithAmbulance, 0, nil);
+		STAT_LINE("FEST_HA", &CStats::HighestLevelAmbulanceMission, 0, nil);
+		STAT_LINE("FEST_CC", &CStats::CriminalsCaught, 0, nil);
+		STAT_LINE("FEST_FE", &CStats::FiresExtinguished, 0, nil);
+		int32 rnd = ((CGeneral::GetRandomNumber() & 255) + 100) * 2384;
+		STAT_LINE("DAYPLC", &rnd, 0, nil);
+
+		#undef STAT_LINE
+
+		MenuStats_2.m_numTexts = 0;
+		MenuStats_2.AddText(TheText.Get("CRIMRA"), 0.0f, 0.0f, CRIM_RATING_TEXT_COLOR, 0);
+
+		char rating[16];
+		wchar urating[16];
+		sprintf(rating, "  %d", CStats::FindCriminalRatingNumber());
+		AsciiToUnicode(rating, urating);
+
+		wchar *pStatLine = aStatLines[nStatLinesIndex++];
+		UnicodeStrcpy(pStatLine, CStats::FindCriminalRatingString());
+		UnicodeStrcat(pStatLine, urating);
+
+		MenuStats_2.AddText(pStatLine, X(MenuStats_1.m_width), 0.0f, CRIM_RATING_TEXT_COLOR, 1);
+
+		MenuSaveZoneSG_1.SetMenuSelection(1);
+		MenuSaveZoneFC_1.SetMenuSelection(1);
+	}
+}
+
+
+void
+CMenuManager::AnaliseMenuContents(void)
+{
+	if ( m_bWantToUpdateContent )
+	{
+		m_bWantToUpdateContent = false;
+
+		m_PrefsControllerConfig = (CONTRCONFIG)MenuControls_1.GetMenuSelection();
+		switch ( m_PrefsControllerConfig )
+		{
+			case CONFIG_4: CPad::GetPad(0)->SetMode(3); break;
+			case CONFIG_3: CPad::GetPad(0)->SetMode(2); break;
+			case CONFIG_2: CPad::GetPad(0)->SetMode(1); break;
+			case CONFIG_1: CPad::GetPad(0)->SetMode(0); break;
+		}
+
+		m_PrefsUseVibration = MenuControls_5.m_title.m_bSelected;
+
+		m_PrefsMusicVolume   = float(MenuAudio_1.GetMenuSelection())/100.0f*127.0f+0.5f;
+		m_PrefsSfxVolume     = float(MenuAudio_2.GetMenuSelection())/100.0f*127.0f+0.5f;
+		m_PrefsRadioStation  = MenuAudio_3.GetMenuSelection();
+		m_PrefsStereoMono    = MenuAudio_4.GetMenuSelection();
+		m_PrefsBrightness    = float(MenuDisplay_1.GetMenuSelection()) / 100.0f*512.0f + 0.5f;
+		m_PrefsShowTrails    = MenuDisplay_2.GetMenuSelection();
+		m_PrefsShowSubtitles = MenuDisplay_3.GetMenuSelection();
+		m_PrefsUseWideScreen = MenuDisplay_4.GetMenuSelection();
+#ifdef PS2
+		BlurOn               = m_PrefsShowTrails;
+#else
+		CMBlur::BlurOn       = m_PrefsShowTrails;
+#endif
+
+		if ( m_PrefsLanguage != MenuLanguage_1.GetMenuSelection() )
+		{
+			m_PrefsLanguage = MenuLanguage_1.GetMenuSelection();
+			m_bInitialised = false;
+			bFrontEnd_ReloadObrTxtGxt = true;
+		}
+	}
+}
+
+void
+CMenuManager::InitialiseMenuContentsAfterLoadingGame(void)
+{
+	if ( MenuLanguage_1.GetMenuSelection() != m_PrefsLanguage )
+	{
+		m_bInitialised = false;
+		bFrontEnd_ReloadObrTxtGxt = true;
+	}
+}
+
+void
+CMenuManager::DrawFrontEnd(void)
+{
+	CFont::SetAlphaFade(255.0f);
+	if(m_bInSaveZone)
+		DrawFrontEndSaveZone();
+	else
+		DrawFrontEndNormal();
+
+	if ( MemCardAccessTriggerCaller.CanCall() )
+		MemCardAccessTriggerCaller.CallTrigger();
+
+	DisplayWarningControllerMsg();
+}
+
+void
+CMenuManager::DrawFrontEndNormal(void)
+{
+	CSprite2d::InitPerFrame();
+	CFont::InitPerFrame();
+
+	if ( bMemoryCardSpecialZone )
+	{
+		static uint8 counter = 0;
+
+		counter++;
+
+		if ( (counter & 63 ) == 0 )
+		{
+			FillMenuWithMemCardFileListing(&MenuSaveLG_2, TriggerSave_BackToMainMenuTwoLines, TriggerSave_LoadGameLoadGameSelect, nil, 0, 34, 22);
+			FillMenuWithMemCardFileListing(&MenuSaveDG_2, TriggerSave_BackToMainMenuTwoLines, TriggerSave_DeleteGameDeleteGameSelect, nil, 0, 34, 22);
+		}
+	}
+
+	m_fade = 255;
+	if ( m_nChangePageTimer != 0 && m_nChangePageTimer >= CTimer::GetTimeInMillisecondsPauseMode() )
+		m_fade = uint32(float(m_nChangePageTimer - CTimer::GetTimeInMillisecondsPauseMode()) / 250.0f * 255.0f);
+
+	m_someAlpha = 255;
+
+	m_position.x = 0.0f;
+	m_position.y = 0.0f;
+
+	if ( m_nStartPauseTimer != 0 && m_nStartPauseTimer >= CTimer::GetTimeInMillisecondsPauseMode() )
+	{
+		float slide = float(m_nStartPauseTimer - CTimer::GetTimeInMillisecondsPauseMode()) / 800.0f;
+		float alpha = 1.0f;
+
+		if ((m_nStartPauseTimer - CTimer::GetTimeInMillisecondsPauseMode()) <= 1600)
+			alpha = float(m_nStartPauseTimer - CTimer::GetTimeInMillisecondsPauseMode()) / 400.0f;
+
+		m_someAlpha = 255 - clamp(alpha, 0.0f, 1.0f) * 255.0f;
+
+		switch ( m_nSlidingDir )
+		{
+			case SLIDE_TO_RIGHT:  m_position.x =   slide * X(700.0f);  break;
+			case SLIDE_TO_TOP:    m_position.y = -(slide * Y(500.0f)); break;
+			case SLIDE_TO_LEFT:   m_position.x = -(slide * X(700.0f)); break;
+			case SLIDE_TO_BOTTOM: m_position.y =   slide * Y(500.0f);  break;
+			default:              m_position.y =   slide * Y(500.0f);  break;
+		}
+	}
+
+	if ( m_nEndPauseTimer != 0 && m_nEndPauseTimer >= CTimer::GetTimeInMillisecondsPauseMode() )
+	{
+		float slide = float(m_nEndPauseTimer - CTimer::GetTimeInMillisecondsPauseMode()) / 800.0f;
+		float alpha = float((int32)(m_nEndPauseTimer - CTimer::GetTimeInMillisecondsPauseMode()) + -266) / 533.0f;
+
+		m_someAlpha = clamp(alpha, 0.0f, 1.0f) * 255.0f;
+
+		switch ( m_nSlidingDir )
+		{
+			case SLIDE_TO_TOP:    m_position.y =   (1.0f - slide) * Y(500.0f);  break;
+			case SLIDE_TO_RIGHT:  m_position.x =   (1.0f - slide) * X(700.0f);  break;
+			case SLIDE_TO_LEFT:   m_position.x =   (1.0f - slide) * X(700.0f);  break;
+			case SLIDE_TO_BOTTOM: m_position.y = -((1.0f - slide) * Y(500.0f)); break;
+			default:              m_position.y = -((1.0f - slide) * Y(500.0f)); break;
+		}
+	}
+
+	if ( m_someAlpha < 255 )
+		m_fade = m_someAlpha;
+
+	float posX, posY;
+
+	/* Draw splash */
+	RwRenderStateSet(rwRENDERSTATETEXTUREFILTER, (void*)rwFILTERLINEAR);
+	CSprite2d *splash = LoadSplash(nil);
+	if(splash)
+		splash->Draw(CRect(0.0f, 0.0f, SCRW, SCRH), BACKGROUND_SPLASH_COLOR);
+	else
+		// doesn't exist!!
+		CHud::Sprites[19].Draw(CRect(0.0f, 0.0f, SCRW, SCRH), BACKGROUND_SPLASH_COLOR);
+	RwRenderStateSet(rwRENDERSTATETEXTUREFILTER, (void*)rwFILTERMIPNEAREST);
+
+	/* Draw main panel */
+	RwRenderStateSet(rwRENDERSTATETEXTUREADDRESS, (void*)rwTEXTUREADDRESSCLAMP);
+	CRGBA panelColor(255, 255, 255, m_someAlpha);
+	m_sprites[FE2_MAINPANEL_UL].Draw(
+		CRect(m_position.x, m_position.y, m_position.x+SCRW/2.0f, m_position.y+SCRH/2.0f),
+		panelColor);
+	m_sprites[FE2_MAINPANEL_UR].Draw(
+		CRect(m_position.x+SCRW/2.0f, m_position.y, m_position.x+SCRW, m_position.y+SCRH/2.0f),
+		panelColor);
+	m_sprites[FE2_MAINPANEL_DL].Draw(
+		CRect(m_position.x, m_position.y+SCRH/2.0f, m_position.x+SCRW/2.0f, m_position.y+SCRH),
+		panelColor);
+	m_sprites[FE2_MAINPANEL_DR].Draw(
+		CRect(m_position.x+SCRW/2.0f, m_position.y+SCRH/2.0f, m_position.x+SCRW, m_position.y+SCRH),
+		panelColor);
+
+	/* Draw icon backdrop */
+	CRGBA iconColor(255, 255, 255, m_fade*0.75f);
+	float iconX = 48.0f;
+	float iconY = 54.0f;
+	float iconWidth = 540.0f;
+	float iconHeight = 296.0f;
+	int32 sprite = FE_ICONBRIEF;
+
+#ifdef PS2_MENU_USEALLPAGEICONS
+	switch(m_currentPage)
+	{
+	case PAGE_STATS:
+		sprite = FE_ICONSTATS;
+		break;
+	case PAGE_LOAD:
+		sprite = FE_ICONSAVE;
+		break;
+	case PAGE_CONTROLS:
+		sprite = FE_ICONCONTROLS;
+		break;
+	case PAGE_BRIEFS:
+		sprite = FE_ICONBRIEF;
+		break;
+	case PAGE_AUDIO:
+		sprite = FE_ICONAUDIO;
+		break;
+	case PAGE_DISPLAY:
+		sprite = FE_ICONDISPLAY;
+		break;
+	case PAGE_LANGUAGE:
+		sprite = FE_ICONLANGUAGE;
+		break;
+	}
+#else
+	switch(m_currentPage)
+	{
+	case PAGE_STATS:
+	case PAGE_LOAD:
+	case PAGE_CONTROLS:
+		sprite = FE_ICONSTATS;	// PS2 has the same texture for stats and brief
+		//sprite = FE_ICONBRIEF;
+		break;
+	case PAGE_BRIEFS:
+		sprite = FE_ICONBRIEF;
+		break;
+	case PAGE_AUDIO:
+		sprite = FE_ICONAUDIO;
+		break;
+	case PAGE_DISPLAY:
+		sprite = FE_ICONDISPLAY;
+		break;
+	case PAGE_LANGUAGE:
+		sprite = FE_ICONLANGUAGE;
+		break;
+	}
+#endif
+	m_sprites[sprite].Draw(
+		CRect_SZ(m_position.x+X(iconX), m_position.y+Y(iconY), X(iconWidth), Y(iconHeight)),
+		iconColor);
+
+	/* Overwrite tab buttons if entered page */
+	bool bOverwriteTab = false;
+
+	switch ( m_pageState )
+	{
+		case PAGESTATE_NORMAL:
+		case PAGESTATE_HIGHLIGHTED:
+			break;
+
+		case PAGESTATE_SELECTED:
+			bOverwriteTab = true;
+			break;
+	}
+
+	if( bOverwriteTab )
+	{
+		CRGBA shadow(41, 101, 102, m_someAlpha);
+		CRGBA green(40, 48, 57, m_someAlpha);
+		CSprite2d::DrawRect(
+			CRect_SZ(m_position.x+X(82.0f), m_position.y+Y(408.0f), X(476.0f), Y(18.0f)),
+			shadow);
+		CSprite2d::DrawRect(
+			CRect_SZ(m_position.x+X(82.0f), m_position.y+Y(408.0f), X(476.0f), Y(5.0f)),
+			green);
+	}
+// stats, load, briefs, controls, audio, display, language
+
+	/* Shadow of panel on top of tab buttons */
+	CRGBA panelShadow(96, 96, 96, m_someAlpha*0.375f);
+	CSprite2d::DrawRect(CRect_SZ(m_position.x+X(87.0f), m_position.y+Y(408.0f), X(464.0f), Y(3.0f)), panelShadow);
+	/* Draw second shadow - seems unused */
+	if ( m_nChangePageTimer != 0 && CTimer::GetTimeInMillisecondsPauseMode() < m_nChangePageTimer )
+	{
+		posX = 0.0f;
+		switch(field_18)
+		{
+		case PAGE_STATS: posX = 88.0f; break;
+		case PAGE_LOAD: posX = 286.0f; break;	// actually controls
+		case PAGE_BRIEFS: posX = 154.0f; break;	// actually load
+		case PAGE_CONTROLS: posX = 220.0f; break;	// actually briefs
+		case PAGE_AUDIO: posX = 352.0f; break;
+		case PAGE_DISPLAY: posX = 418.0f; break;
+		case PAGE_LANGUAGE: posX = 484.0f; break;
+		}
+		CSprite2d::DrawRect(CRect_SZ(m_position.x+X(posX), m_position.y+Y(411.0f), X(65.0f), Y(3.0f)), panelShadow);
+	}
+
+	/* Active tab */
+	posX = 0.0f;
+	switch(m_currentPage)
+	{
+	case PAGE_STATS: posX = 88.0f; break;
+	case PAGE_LOAD: posX = 154.0f; break;
+	case PAGE_BRIEFS: posX = 220.0f; break;
+	case PAGE_CONTROLS: posX = 286.0f; break;
+	case PAGE_AUDIO: posX = 352.0f; break;
+	case PAGE_DISPLAY: posX = 418.0f; break;
+	case PAGE_LANGUAGE: posX = 484.0f; break;
+	}
+	// PAL has 465 for 407 here - and actually 406 seems right
+	m_sprites[FE2_TABACTIVE].Draw(CRect_SZ(m_position.x+X(posX), m_position.y+YF(465.0f), X(128.0f), Y(32.0f)), CRGBA(255, 255, 255, m_someAlpha));
+
+	/* Draw page title */
+	posX = m_position.x + X(592.0f);
+	posY = m_position.y + Y(376.0f);
+	CRGBA fontCol1(255, 193, 71, m_someAlpha);
+	CRGBA fontCol2(0, 0, 0, m_someAlpha);
+	CFont::SetFontStyle(FONT_HEADING);
+	CFont::SetBackgroundOff();
+	CFont::SetScale(X(PANEL_TEXT_SIZE_X), Y(PANEL_TEXT_SIZE_Y));
+	CFont::SetPropOn();
+	CFont::SetCentreOff();
+	CFont::SetJustifyOn();
+	CFont::SetRightJustifyWrap(0.0f);
+	CFont::SetRightJustifyOn();
+	CFont::SetBackGroundOnlyTextOn();
+	CFont::SetWrapx(SCRW-X(40.0f)); // 600.0f
+	const char *key = nil;
+	switch(m_currentPage)
+	{
+	case PAGE_STATS:    key = "FEP_STA"; break;
+	case PAGE_LOAD:     key = "FEP_SAV"; break;
+	case PAGE_BRIEFS:   key = "FEP_BRI"; break;
+	case PAGE_CONTROLS: key = "FEP_CON"; break;
+	case PAGE_AUDIO:    key = "FEP_AUD"; break;
+	case PAGE_DISPLAY:  key = "FEP_DIS"; break;
+	case PAGE_LANGUAGE: key = "FEP_LAN"; break;
+	}
+	CFont::SetScale(X(PANEL_TEXT_SIZE_X*PANEL_TEXT_X_SCALES[m_currentPage]), Y(PANEL_TEXT_SIZE_Y));
+	CFont::SetColor(fontCol1);
+	CFont::PrintString(posX, posY, TheText.Get(key));
+	CFont::SetColor(fontCol2);
+	CFont::PrintString(posX-X(1.0f), posY-Y(1.0f), TheText.Get(key));
+	CFont::DrawFonts();
+
+	/* Draw controller buttons */
+	CFont::SetFontStyle(FONT_BANK);
+	CFont::SetBackgroundOff();
+	CFont::SetScale(X(0.35f), Y(0.64f));
+	CFont::SetPropOn();
+	CFont::SetCentreOff();
+	CFont::SetJustifyOn();
+	CFont::SetRightJustifyOff();
+	CFont::SetBackGroundOnlyTextOn();
+	CFont::SetWrapx(SCRW-X(40.0f)); // 600.0f
+	CFont::SetColor(CRGBA(16, 16, 16, m_someAlpha));
+	switch(m_currentPage)
+	{
+		case PAGE_STATS:
+			CFont::PrintString(m_position.x+X(52.0f), m_position.y+Y(360.0f), TheText.Get("FEDS_ST"));
+			CFont::PrintString(m_position.x+X(52.0f), m_position.y+Y(372.0f), TheText.Get("FEDS_AM"));
+			CFont::PrintString(m_position.x+X(242.0f), m_position.y+Y(360.0f), TheText.Get("FEDSSC1"));
+			CFont::PrintString(m_position.x+X(242.0f), m_position.y+Y(372.0f), TheText.Get("FEDSSC2"));
+			break;
+
+		case PAGE_BRIEFS:
+			CFont::PrintString(m_position.x+X(52.0f), m_position.y+Y(360.0f), TheText.Get("FEDS_ST"));
+			CFont::PrintString(m_position.x+X(52.0f), m_position.y+Y(372.0f), TheText.Get("FEDS_AM"));
+			break;
+
+		case PAGE_LOAD:
+		case PAGE_CONTROLS:
+		case PAGE_AUDIO:
+		case PAGE_DISPLAY:
+		case PAGE_LANGUAGE:
+		{
+			CFont::PrintString(m_position.x+X(52.0f), m_position.y+Y(360.0f), TheText.Get("FEDS_SE"));
+			CFont::PrintString(m_position.x+X(52.0f), m_position.y+Y(372.0f), TheText.Get("FEDS_BA"));
+			CFont::PrintString(m_position.x+X(52.0f), m_position.y+Y(384.0f), TheText.Get("FEDS_ST"));
+
+			switch ( m_pageState )
+			{
+				case PAGESTATE_NORMAL:
+					CFont::PrintString(m_position.x+X(242.0f), m_position.y+Y(372.0f), TheText.Get("FEDS_AM")); // <>-CHANGE MENU
+					break;
+
+				case PAGESTATE_HIGHLIGHTED:
+				case PAGESTATE_SELECTED:
+				{
+					CFont::PrintString(m_position.x+X(242.0f), m_position.y+Y(360.0f+3.5f), TheText.Get("FEA_UP")); // ;
+					CFont::PrintString(m_position.x+X(242.0f), m_position.y+Y(384.0f-3.5f), TheText.Get("FEA_DO")); // =
+					CFont::PrintString(m_position.x+X(242.0f-10.0f), m_position.y+Y(372.0f), TheText.Get("FEA_LE")); // <
+					CFont::PrintString(m_position.x+X(242.0f+11.0f), m_position.y+Y(372.0f), TheText.Get("FEA_RI")); // >
+					CFont::PrintString(m_position.x+X(242.0f+20.0f), m_position.y+Y(372.0f), TheText.Get("FEDSAS3")); // - CHANGE SELECTION
+
+					break;
+				}
+			}
+
+			break;
+		}
+	}
+
+	CFont::DrawFonts();
+
+	/* Draw tab button texts */
+	CFont::SetFontStyle(FONT_BANK);
+	CFont::SetBackgroundOff();
+	CFont::SetScale(X(BUTTONTAB_TEXT_SIZE_X), Y(BUTTONTAB_TEXT_SIZE_Y));
+	CFont::SetPropOn();
+	CFont::SetCentreOn();
+	CFont::SetRightJustifyOff();
+	CFont::SetBackGroundOnlyTextOn();
+	CFont::SetWrapx(SCRW-X(40.0f)); // 600.0f
+
+	switch ( m_pageState )
+	{
+		case PAGESTATE_NORMAL:
+		{
+			CFont::SetColor(CRGBA(16, 16, 16, m_someAlpha));
+			CFont::SetScale(X(BUTTONTAB_TEXT_SIZE_X*BUTTONTAB_TEXT_X_SCALES[PAGE_STATS]), Y(BUTTONTAB_TEXT_SIZE_Y));
+			CFont::PrintString(m_position.x+X(92.0f), m_position.y+Y(408.0f), TheText.Get("FEB_STA"));
+			CFont::SetScale(X(BUTTONTAB_TEXT_SIZE_X*BUTTONTAB_TEXT_X_SCALES[PAGE_LOAD]), Y(BUTTONTAB_TEXT_SIZE_Y));
+			CFont::PrintString(m_position.x+X(158.0f), m_position.y+Y(408.0f), TheText.Get("FEB_SAV"));
+			CFont::SetScale(X(BUTTONTAB_TEXT_SIZE_X*BUTTONTAB_TEXT_X_SCALES[PAGE_BRIEFS]), Y(BUTTONTAB_TEXT_SIZE_Y));
+			CFont::PrintString(m_position.x+X(224.0f), m_position.y+Y(408.0f), TheText.Get("FEB_BRI"));
+			CFont::SetScale(X(BUTTONTAB_TEXT_SIZE_X*BUTTONTAB_TEXT_X_SCALES[PAGE_CONTROLS]), Y(BUTTONTAB_TEXT_SIZE_Y));
+			CFont::PrintString(m_position.x+X(290.0f), m_position.y+Y(408.0f), TheText.Get("FEB_CON"));
+			CFont::SetScale(X(BUTTONTAB_TEXT_SIZE_X*BUTTONTAB_TEXT_X_SCALES[PAGE_AUDIO]), Y(BUTTONTAB_TEXT_SIZE_Y));
+			CFont::PrintString(m_position.x+X(356.0f), m_position.y+Y(408.0f), TheText.Get("FEB_AUD"));
+			CFont::SetScale(X(BUTTONTAB_TEXT_SIZE_X*BUTTONTAB_TEXT_X_SCALES[PAGE_DISPLAY]), Y(BUTTONTAB_TEXT_SIZE_Y));
+			CFont::PrintString(m_position.x+X(422.0f), m_position.y+Y(408.0f), TheText.Get("FEB_DIS"));
+			CFont::SetScale(X(BUTTONTAB_TEXT_SIZE_X*BUTTONTAB_TEXT_X_SCALES[PAGE_LANGUAGE]), Y(BUTTONTAB_TEXT_SIZE_Y));
+			CFont::PrintString(m_position.x+X(488.0f), m_position.y+Y(408.0f), TheText.Get("FEB_LAN"));
+
+			break;
+		}
+
+		case PAGESTATE_HIGHLIGHTED:
+		case PAGESTATE_SELECTED:
+		{
+			CFont::SetColor(CRGBA(16, 16, 16, m_someAlpha));
+			switch(m_currentPage)
+			{
+			// PAL has 466 for 408...probably rounded?
+			case PAGE_STATS:
+				CFont::SetScale(X(BUTTONTAB_TEXT_SIZE_X*BUTTONTAB_TEXT_X_SCALES[PAGE_STATS]), Y(BUTTONTAB_TEXT_SIZE_Y));
+				CFont::PrintString(m_position.x+X(92.0f), m_position.y+Y(408.0f), TheText.Get("FEB_STA"));
+				break;
+			case PAGE_LOAD:
+				CFont::SetScale(X(BUTTONTAB_TEXT_SIZE_X*BUTTONTAB_TEXT_X_SCALES[PAGE_LOAD]), Y(BUTTONTAB_TEXT_SIZE_Y));
+				CFont::PrintString(m_position.x+X(158.0f), m_position.y+Y(408.0f), TheText.Get("FEB_SAV"));
+				break;
+			case PAGE_BRIEFS:
+				CFont::SetScale(X(BUTTONTAB_TEXT_SIZE_X*BUTTONTAB_TEXT_X_SCALES[PAGE_BRIEFS]), Y(BUTTONTAB_TEXT_SIZE_Y));
+				CFont::PrintString(m_position.x+X(224.0f), m_position.y+Y(408.0f), TheText.Get("FEB_BRI"));
+				break;
+			case PAGE_CONTROLS:
+				CFont::SetScale(X(BUTTONTAB_TEXT_SIZE_X*BUTTONTAB_TEXT_X_SCALES[PAGE_CONTROLS]), Y(BUTTONTAB_TEXT_SIZE_Y));
+				CFont::PrintString(m_position.x+X(290.0f), m_position.y+Y(408.0f), TheText.Get("FEB_CON"));
+				break;
+			case PAGE_AUDIO:
+				CFont::SetScale(X(BUTTONTAB_TEXT_SIZE_X*BUTTONTAB_TEXT_X_SCALES[PAGE_AUDIO]), Y(BUTTONTAB_TEXT_SIZE_Y));
+				CFont::PrintString(m_position.x+X(356.0f), m_position.y+Y(408.0f), TheText.Get("FEB_AUD"));
+				break;
+			case PAGE_DISPLAY:
+				CFont::SetScale(X(BUTTONTAB_TEXT_SIZE_X*BUTTONTAB_TEXT_X_SCALES[PAGE_DISPLAY]), Y(BUTTONTAB_TEXT_SIZE_Y));
+				CFont::PrintString(m_position.x+X(422.0f), m_position.y+Y(408.0f), TheText.Get("FEB_DIS"));
+				break;
+			case PAGE_LANGUAGE:
+				CFont::SetScale(X(BUTTONTAB_TEXT_SIZE_X*BUTTONTAB_TEXT_X_SCALES[PAGE_LANGUAGE]), Y(BUTTONTAB_TEXT_SIZE_Y));
+				CFont::PrintString(m_position.x+X(488.0f), m_position.y+Y(408.0f), TheText.Get("FEB_LAN"));
+				break;
+			}
+
+			break;
+		}
+	}
+
+	CFont::DrawFonts();
+
+	pActiveMenuPage = nil;
+	switch(m_currentPage)
+	{
+		case PAGE_STATS:	pActiveMenuPage = &MenuPage_Stats; break;
+		case PAGE_LOAD:	    pActiveMenuPage = pMenuSave; break;
+		case PAGE_BRIEFS:	pActiveMenuPage = &MenuPage_Briefs; break;
+		case PAGE_CONTROLS:	pActiveMenuPage = &MenuPage_Controls; break;
+		case PAGE_AUDIO:	pActiveMenuPage = &MenuPage_Audio; break;
+		case PAGE_DISPLAY:	pActiveMenuPage = &MenuPage_Display; break;
+		case PAGE_LANGUAGE:	pActiveMenuPage = &MenuPage_Language; break;
+	}
+
+	CFont::SetFontStyle(FONT_BANK);
+	CFont::SetBackgroundOff();
+	CFont::SetScale(X(MENU_TEXT_SIZE_X), Y(MENU_TEXT_SIZE_Y));
+	CFont::SetPropOn();
+	CFont::SetCentreOff();
+	CFont::SetJustifyOn();
+	CFont::SetRightJustifyOff();
+	CFont::SetBackGroundOnlyTextOn();
+	CFont::SetWrapx(SCRW-X(40.0f)); // 600.0f
+	CFont::SetRightJustifyWrap(X(38.0f));
+
+	if(m_currentPage == PAGE_LANGUAGE)
+	{
+		CFont::SetCentreOn();
+		CFont::SetCentreSize(SCRW-X(40.0f)); // 600.0f
+	}
+
+	if ( m_nEndPauseTimer != 0 )
+	{
+		switch ( m_currentPage )
+		{
+			case PAGE_LOAD:
+			case PAGE_BRIEFS:
+			case PAGE_CONTROLS:
+				break;
+
+			default:
+				CFont::SetWrapx(X(1200.0f));
+				break;
+		}
+	}
+
+	if(pActiveMenuPage)
+	{
+		pActiveMenuPage->SetAlpha(m_fade);
+
+		switch ( m_pageState )
+		{
+			case PAGESTATE_NORMAL:
+				pActiveMenuPage->DrawNormal(m_position.x, m_position.y);
+				break;
+
+			case PAGESTATE_HIGHLIGHTED:
+				pActiveMenuPage->DrawHighlighted(CRGBA(rgbaATC.r, rgbaATC.g, rgbaATC.b, m_fade), m_position.x, m_position.y);
+				break;
+
+			case PAGESTATE_SELECTED:
+				pActiveMenuPage->Draw(CRGBA(rgbaATC.r, rgbaATC.g, rgbaATC.b, m_fade), CRGBA(MENU_SELECTED_COLOR.r, MENU_SELECTED_COLOR.g, MENU_SELECTED_COLOR.b, m_fade), m_position.x, m_position.y);
+				break;
+		}
+	}
+
+	CFont::DrawFonts();
+	CFont::DrawFonts();
+	RwRenderStateSet(rwRENDERSTATETEXTUREFILTER, (void*)rwFILTERLINEAR);
+	RwRenderStateSet(rwRENDERSTATETEXTUREADDRESS, (void*)rwTEXTUREADDRESSWRAP);
+}
+
+void
+CMenuManager::DrawFrontEndSaveZone(void)
+{
+	if ( bMemoryCardSpecialZone )
+	{
+		static uint8 counter = 0;
+		counter++;
+		if ( counter & 63 )
+		{
+			FillMenuWithMemCardFileListing(&MenuSaveZoneSSL_1, TriggerSaveZone_BackToMainMenuTwoLines, TriggerSaveZone_SaveSlots, nil, 0, 34, 22);
+
+			if ( TheMemoryCard.GetError() == CMemoryCard::ERR_NOFORMAT )
+			{
+				pActiveMenuPage = &MenuPageSaveZone_FormatCard;
+				pActiveMenuPage->ActivatePage();
+				bMemoryCardSpecialZone = false;
+			}
+		}
+	}
+
+	CSprite2d::InitPerFrame();
+	CFont::InitPerFrame();
+
+	RwRenderStateSet(rwRENDERSTATETEXTUREFILTER, (void*)rwFILTERNEAREST);
+
+	m_fade = 255;
+
+	CSprite2d::DrawRect(CRect(X(50.0f), Y(50.0f), X(590.0f), Y(398.0f)), CRGBA(0, 0, 0, 175)); //CRect(50.0f, 57.142f, 590.0f, 454.857147f)
+
+	CFont::SetFontStyle(FONT_BANK);
+	CFont::SetBackgroundOff();
+	CFont::SetScale(X(MENU_TEXT_SIZE_X), Y(MENU_TEXT_SIZE_Y));
+	CFont::SetPropOn();
+	CFont::SetCentreOff();
+	CFont::SetJustifyOn();
+	CFont::SetRightJustifyOff();
+	CFont::SetBackGroundOnlyTextOn();
+	CFont::SetRightJustifyWrap(X(70.0f));
+	CFont::SetWrapx(SCRW-X(70.0f)); // 570.0f
+
+	if ( pActiveMenuPage )
+	{
+		pActiveMenuPage->SetAlpha(m_fade);
+		pActiveMenuPage->Draw(CRGBA(rgbaATC.r, rgbaATC.g, rgbaATC.b, m_fade), TITLE_TEXT_COLOR, 0.0f, 0.0f);
+	}
+
+
+	CFont::DrawFonts();
+	CFont::SetFontStyle(FONT_BANK);
+	CFont::SetBackgroundOff();
+	CFont::SetScale(X(0.44f), Y(0.68f)); // 0.44f, 0.777143f
+	CFont::SetPropOn();
+	CFont::SetCentreOff();
+	CFont::SetJustifyOn();
+	CFont::SetRightJustifyOff();
+	CFont::SetBackGroundOnlyTextOn();
+	CFont::SetWrapx(SCRW-X(40.0f)); //600.0f
+	CFont::SetColor(TEXT_COLOR);
+
+	wchar *text;
+	if ( pActiveMenuPage == &MenuPageSaveZone_FormatCard
+		|| pActiveMenuPage == &MenuPageSaveZone_SaveSlots
+		|| pActiveMenuPage == &MenuPageSaveZone_SaveGame )
+	{
+		text = TheText.Get("FEDS_SB"); // / button - SELECT " button - BACK
+	}
+	else
+	{
+		text = TheText.Get("FEDS_SE"); // / button - SELECT
+	}
+
+	CFont::PrintString(X(180.0f), Y(376.0f), text); // 180.0f, 429.714294f
+	CFont::DrawFonts();
+
+	RwRenderStateSet(rwRENDERSTATETEXTUREFILTER, (void*)rwFILTERLINEAR);
+}
+
+void
+CMenuManager::DrawMemoryCardStartUpMenus()
+{
+	CFont::SetAlphaFade(255.0f);
+	bMemoryCardStartUpMenus_ExitNow = false;
+
+	CMenuPage page; // + 0x40 data
+	CMenuMultiChoiceTriggered MCMenu;
+	MCMenu.SetPosition(X(320.0f), Y(150.0f)); //171.428574f
+
+	switch ( TheMemoryCard.CheckCardStateAtGameStartUp(CARD_ONE) )
+	{
+		case CMemoryCard::MCSTATE_NEED_200KB: // 200KB
+		{
+			// There is insufficient space on the Memory Card (PS2) in MEMORY CARD slot 1. At least 200KB is needed to save this application data. Do you wish to start? (YES or NO)
+			MCMenu.AddTitle(TheText.Get("MCGNSP"), 0.0f, 0.0f, 0);
+			break;
+		}
+
+		case CMemoryCard::MCSTATE_NEED_500KB: // 500KB
+		{
+			// There is insufficient space on the Memory Card (PS2) in MEMORY CARD slot 1. At least 500KB is needed to save this application data. Do you wish to start? (YES or NO)
+			MCMenu.AddTitle(TheText.Get("MCDNSP"), 0.0f, 0.0f, 0);
+			break;
+		}
+
+		case CMemoryCard::MCSTATE_OK:
+		case CMemoryCard::MCSTATE_NOCARD:
+		{
+			return;
+			break;
+		}
+	}
+
+	MCMenu.AddOption(TheText.Get("FEM_NO"),  X(30.0f),  Y(110.0f), nil, 0, 0);// 125.714294f
+	MCMenu.AddOption(TheText.Get("FEM_YES"), X(-30.0f), Y(110.0f), TriggerMCSUM_Yes, 0, 0);// 125.714294f
+	MCMenu.SetColors(TITLE_TEXT_COLOR, TEXT_COLOR, TEXT_COLOR);
+	page.AddMenu(&MCMenu);
+
+	MCMenu.GoFirst();
+
+	page.SetShadows(true, TEXT_SHADOW_COLOR, SHADOW_VECTOR);
+
+	CTimer::Initialise();
+	CTimer::StartUserPause();
+
+	while ( !bMemoryCardStartUpMenus_ExitNow )
+	{
+#ifdef GTA_PC
+		HandleExit();
+
+		if(RsGlobal.quit)
+			return;
+#endif
+
+#ifdef GTA_PC
+		if ( CPad::GetPad(0)->GetDPadLeftJustDown() )
+			page.GoLeft();
+		if ( CPad::GetPad(0)->GetDPadRightJustDown() )
+			page.GoRight();
+		if ( CPad::GetPad(0)->GetDPadUpJustDown() )
+			page.GoDown();
+		if ( CPad::GetPad(0)->GetDPadDownJustDown() )
+			page.GoUp();
+		if ( CPad::GetPad(0)->GetCrossJustDown() || CPad::GetPad(0)->GetEnterJustDown() || CPad::GetPad(0)->GetRightMouseJustDown() )
+			page.SelectCurrentOptionUnderCursor();
+
+		if ( CPad::GetPad(0)->GetCircleJustDown() || CPad::GetPad(0)->GetEscapeJustDown() )
+			;
+#else
+		if ( CPad::GetPad(0)->GetDPadLeftJustDown() )
+			page.GoLeft();
+		if ( CPad::GetPad(0)->GetDPadRightJustDown() )
+			page.GoRight();
+		if ( CPad::GetPad(0)->GetDPadUpJustDown() )
+			page.GoDown();
+		if ( CPad::GetPad(0)->GetDPadDownJustDown() )
+			page.GoUp();
+		if ( CPad::GetPad(0)->GetCrossJustDown() )
+			page.SelectCurrentOptionUnderCursor();
+		if ( CPad::GetPad(0)->GetCircleJustDown() )
+			;
+#endif
+
+		static int32 MemCardStatusWaiter = 0;
+
+		MemCardStatusWaiter++;
+
+		if ( MemCardStatusWaiter > 120 )
+		{
+			MemCardStatusWaiter = 0;
+
+			switch ( TheMemoryCard.CheckCardStateAtGameStartUp(CARD_ONE) )
+			{
+				case CMemoryCard::MCSTATE_NEED_200KB:
+				{
+					// There is insufficient space on the Memory Card (PS2) in MEMORY CARD slot 1. At least 200KB is needed to save this application data. Do you wish to start? (YES or NO)
+					MCMenu.AddTitle(TheText.Get("MCGNSP"), 0.0f, 0.0f, 0);
+					break;
+				}
+
+				case CMemoryCard::MCSTATE_NEED_500KB:
+				{
+					// There is insufficient space on the Memory Card (PS2) in MEMORY CARD slot 1. At least 500KB is needed to save this application data. Do you wish to start? (YES or NO)
+					MCMenu.AddTitle(TheText.Get("MCDNSP"), 0.0f, 0.0f, 0);
+					break;
+				}
+
+				case CMemoryCard::MCSTATE_NOCARD:
+				{
+					// There is no Memory Card (PS2) in MEMORY CARD slot 1. Do you wish to start? (YES or NO)
+					MCMenu.AddTitle(TheText.Get("MCSTNS"), 0.0f, 0.0f, 0);
+					break;
+				}
+
+				case CMemoryCard::MCSTATE_OK:
+				{
+					bMemoryCardStartUpMenus_ExitNow = true;
+					break;
+				}
+			}
+		}
+
+		DoRWStuffStartOfFrame(0, 0, 0, 0, 0, 0, 255);
+		CFont::InitPerFrame();
+
+		RwRenderStateSet(rwRENDERSTATETEXTUREFILTER, (void*)rwFILTERLINEAR);
+		CSprite2d *splash = LoadSplash("splash1");
+		splash->Draw(CRect(0.0f, 0.0f, SCRW, SCRH), BACKGROUND_SPLASH_COLOR);
+		RwRenderStateSet(rwRENDERSTATETEXTUREFILTER, (void*)rwFILTERNEAREST);
+
+		SetRandomActiveTextlineColor(1);
+
+		CRGBA col(rgbaATC.r, rgbaATC.g, rgbaATC.b, 255);
+		CFont::SetFontStyle(FONT_BANK);
+		CFont::SetBackgroundOff();
+		CFont::SetScale(X(MENU_TEXT_SIZE_X), Y(MENU_TEXT_SIZE_Y));
+		CFont::SetPropOn();
+		CFont::SetJustifyOn();
+		CFont::SetRightJustifyOff();
+		CFont::SetBackGroundOnlyTextOn();
+		CFont::SetWrapx(SCRW-X(60.0f)); // 580.0f
+		CFont::SetCentreOn();
+		CFont::SetCentreSize(SCRW-X(120.0f)); // 520.0f
+
+		MCMenu.Draw(col, TITLE_TEXT_COLOR, 0.0f, 0.0f);
+		CFont::DrawFonts();
+
+		CFont::SetFontStyle(FONT_BANK);
+		CFont::SetScale(X(0.4f), Y(0.64f)); // 0.731429
+		CFont::SetPropOn();
+		CFont::SetCentreOff();
+		CFont::SetJustifyOn();
+		CFont::SetRightJustifyOff();
+		CFont::SetBackGroundOnlyTextOn();
+		CFont::SetWrapx(SCRW-X(60.0f)); // 580.0f
+		CFont::SetColor(TEXT_COLOR);
+
+
+		CPlaceableShText text;
+		text.SetPosition(X(240.0f), Y(378.0f), false); // 432.000000
+		text.SetColor(TEXT_COLOR);
+		text.m_text = TheText.Get("FEDS_SE"); // / button - SELECT
+		text.SetShadows(true, TEXT_SHADOW_COLOR, SHADOW_VECTOR);
+		text.Draw(0.0f, 0.0f);
+
+		CFont::DrawFonts();
+		DisplayWarningControllerMsg();
+		DoRWStuffEndOfFrame();
+		CPad::UpdatePads();
+		CTimer::Update();
+	}
+
+	CTimer::EndUserPause();
+	CTimer::Stop();
+
+	for ( int32 i = 0; i < 100; i++ )
+	{
+#ifdef GTA_PC
+		HandleExit();
+#endif
+		DoRWStuffStartOfFrame(0, 0, 0, 0, 0, 0, 255);
+
+		RwRenderStateSet(rwRENDERSTATETEXTUREFILTER, (void*)rwFILTERLINEAR);
+		CSprite2d *splash = LoadSplash("splash1");
+		splash->Draw(CRect(0.0f, 0.0f, SCRW, SCRH), BACKGROUND_SPLASH_COLOR);
+		RwRenderStateSet(rwRENDERSTATETEXTUREFILTER, (void*)rwFILTERNEAREST);
+
+		DoRWStuffEndOfFrame();
+	}
+}
+
+void
+CMenuManager::Process(void)
+{
+	if ( m_bSaveMenuActive || m_bInSaveZone || TheCamera.GetScreenFadeStatus() == FADE_0 )
+	{
+		InitialiseMenusOnce();
+		m_bWantToRestart = false;
+		WorkOutMenuState(false);
+
+		if ( m_bMenuActive )
+		{
+			if ( !m_bInSaveZone )
+				LoadAllTextures();
+			InitialiseMenuContents();
+			SetRandomActiveTextlineColor(0);
+			ProcessControllerInput();
+		}
+		else
+		{
+			AnaliseMenuContents();
+			pMenuSave = &MenuPage_SaveBasic;
+			m_pageState = PAGESTATE_NORMAL;
+			bMemoryCardSpecialZone = false;
+			bIgnoreTriangleButton = false;
+			UnloadTextures();
+			m_bInSaveZone = false;
+			m_bRenderGameInMenu = false;
+			gErrorSampleTriggered = true;
+		}
+	}
+}
+
+void
+CMenuManager::WorkOutMenuState(uint8 bExit)
+{
+#ifdef GTA_PC
+	bool bIsStartPressed = CPad::GetPad(0)->GetStartJustDown() || (m_pageState == PAGESTATE_NORMAL && CPad::GetPad(0)->GetEscapeJustDown());
+#else
+	bool bIsStartPressed = CPad::GetPad(0)->GetStartJustDown();
+#endif
+	bool bIsCreditsOrDraw      = CCredits::AreCreditsDone() || m_bMenuActive;
+	bool bIsDemoOrDraw         = m_bMenuActive || CGame::bDemoMode;
+
+	if ( (bIsStartPressed && bIsCreditsOrDraw) || bExit || (!bIsDemoOrDraw && CPad::IsNoOrObsolete()) )
+	{
+		if ( m_nStartPauseTimer == 0 && m_nEndPauseTimer == 0 )
+		{
+			m_bMenuActive = !m_bMenuActive;
+
+			if ( !m_bMenuActive )
+			{
+				DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_STARTING, 0);
+				DMAudio.ChangeMusicMode(MUSICMODE_GAME);
+				gMusicPlaying = false;
+				bMemoryCardSpecialZone = false;
+				bIgnoreTriangleButton = false;
+
+				m_bMenuActive = true;
+
+				m_nEndPauseTimer = CTimer::GetTimeInMillisecondsPauseMode() + 800;
+
+				if ( m_currentPage == PAGE_CONTROLS || m_currentPage == PAGE_BRIEFS || m_currentPage == PAGE_LOAD )
+				{
+					m_nSlidingDir = CGeneral::GetRandomNumber() & (SLIDE_MAX-1);
+
+					switch ( m_nSlidingDir ) //m_nSlidingDir &= ~1;
+					{
+						case SLIDE_TO_LEFT:  m_nSlidingDir = SLIDE_TO_TOP;    break;
+						case SLIDE_TO_RIGHT: m_nSlidingDir = SLIDE_TO_BOTTOM; break;
+					}
+
+					m_position.y = Y(500.0f); // 571.428589f;
+				}
+			}
+			else
+			{
+				DMAudio.ChangeMusicMode(MUSICMODE_FRONTEND);
+
+				if ( DMAudio.GetRadioInCar() < 9 )
+					m_PrefsRadioStation = DMAudio.GetRadioInCar();
+				else
+					m_PrefsRadioStation = CGeneral::GetRandomNumber() % 9;
+
+				CTimer::StartUserPause();
+				CPad::StopPadsShaking();
+				m_nStartPauseTimer = CTimer::GetTimeInMillisecondsPauseMode() + 800;
+				m_nSlidingDir = CGeneral::GetRandomNumber() & (SLIDE_MAX-1);
+
+				switch ( m_nSlidingDir )
+				{
+					case SLIDE_TO_RIGHT:  m_position.y = Y(612.5f); break;
+					case SLIDE_TO_LEFT:   m_position.y = Y(612.5f); break;
+					case SLIDE_TO_BOTTOM: m_position.y = Y(500.0f); break;
+					case SLIDE_TO_TOP:    m_position.y = Y(500.0f); break;
+					default:              m_position.y = Y(500.0f); break;
+				}
+
+				if ( m_currentPage == PAGE_CONTROLS || m_currentPage == PAGE_BRIEFS )
+				{
+					m_nSlidingDir = CGeneral::GetRandomNumber() & (SLIDE_MAX-1);
+
+					switch ( m_nSlidingDir ) //m_nSlidingDir &= ~1;
+					{
+						case SLIDE_TO_LEFT:  m_nSlidingDir = SLIDE_TO_TOP;    break;
+						case SLIDE_TO_RIGHT: m_nSlidingDir = SLIDE_TO_BOTTOM; break;
+					}
+
+					m_position.y = Y(500.0f); //571.428589f
+				}
+			}
+		}
+	}
+
+	if ( m_bSaveMenuActive && !m_bInSaveZone && !TheMemoryCard._bunk2)
+	{
+		m_bSaveMenuActive = false;
+		m_bInSaveZone = true;
+		m_bRenderGameInMenu = true;
+		m_bMenuActive = true;
+		CTimer::StartUserPause();
+		pActiveMenuPage = &MenuPageSaveZone_SaveGame;
+	}
+
+	if ( m_pageState == PAGESTATE_NORMAL && gMusicPlaying )
+	{
+		DMAudio.StopFrontEndTrack();
+		gMusicPlaying = false;
+	}
+
+	if ( m_nChangePageTimer != 0 && CTimer::GetTimeInMillisecondsPauseMode() >= m_nChangePageTimer )
+	{
+		m_nChangePageTimer = 0;
+		pMenuSave = &MenuPage_SaveBasic;
+		m_currentPage = m_newPage;
+	}
+
+	if ( m_nPageLeftTimer != 0 && CTimer::GetTimeInMillisecondsPauseMode() >= m_nPageLeftTimer )
+		m_nPageLeftTimer = 0;
+
+	if ( m_nPageRightTimer != 0 && CTimer::GetTimeInMillisecondsPauseMode() >= m_nPageRightTimer )
+		m_nPageRightTimer = 0;
+
+	if ( m_nStartPauseTimer != 0 && CTimer::GetTimeInMillisecondsPauseMode() >= m_nStartPauseTimer )
+		m_nStartPauseTimer = 0;
+
+	if ( m_nEndPauseTimer != 0 && CTimer::GetTimeInMillisecondsPauseMode() >= m_nEndPauseTimer )
+	{
+		m_nEndPauseTimer = 0;
+		m_bMenuActive = false;
+		m_bMenuActive = false;
+		m_bInSaveZone = false;
+		CTimer::EndUserPause();
+	}
+}
+
+void
+CMenuManager::ProcessControllerInput(void)
+{
+	if ( TimeToStopPadShaking != 0 && TimeToStopPadShaking < CTimer::GetTimeInMillisecondsPauseMode() )
+	{
+		CPad::StopPadsShaking();
+		TimeToStopPadShaking = 0;
+	}
+
+#ifdef GTA_PC
+	if ( CPad::GetPad(0)->GetDPadLeft() || CPad::GetPad(0)->GetLeft() )
+#else
+	if ( CPad::GetPad(0)->GetDPadLeft() )
+#endif
+	{
+		switch ( m_pageState )
+		{
+			case PAGESTATE_NORMAL:
+			case PAGESTATE_HIGHLIGHTED:
+				break;
+
+			case PAGESTATE_SELECTED:
+			{
+				if ( pActiveMenuPage )
+					pActiveMenuPage->GoLeftStill();
+				break;
+			}
+		}
+	}
+
+#ifdef GTA_PC
+	if ( CPad::GetPad(0)->GetDPadRight() || CPad::GetPad(0)->GetRight() )
+#else
+	if ( CPad::GetPad(0)->GetDPadRight() )
+#endif
+	{
+		switch ( m_pageState )
+		{
+			case PAGESTATE_NORMAL:
+			case PAGESTATE_HIGHLIGHTED:
+				break;
+
+			case PAGESTATE_SELECTED:
+			{
+				if ( pActiveMenuPage )
+					pActiveMenuPage->GoRightStill();
+				break;
+			}
+		}
+	}
+
+#ifdef GTA_PC
+	if ( CPad::GetPad(0)->GetDPadLeftJustDown() || CPad::GetPad(0)->GetLeftJustDown() )
+#else
+	if ( CPad::GetPad(0)->GetDPadLeftJustDown() )
+#endif
+		ProcessDPadLeftJustDown();
+
+#ifdef GTA_PC
+	if ( CPad::GetPad(0)->GetDPadRightJustDown() || CPad::GetPad(0)->GetRightJustDown() )
+#else
+	if ( CPad::GetPad(0)->GetDPadRightJustDown() )
+#endif
+		ProcessDPadRightJustDown();
+
+#ifdef GTA_PC
+	if ( CPad::GetPad(0)->GetDPadUp() || CPad::GetPad(0)->GetUp() )
+#else
+	if ( CPad::GetPad(0)->GetDPadUp() )
+#endif
+	{
+		switch ( m_pageState )
+		{
+			case PAGESTATE_NORMAL:
+			{
+				if ( m_currentPage == PAGE_STATS )
+				{
+					if ( pActiveMenuPage )
+						pActiveMenuPage->GoUpStill();
+				}
+				break;
+			}
+
+			case PAGESTATE_HIGHLIGHTED:
+				break;
+
+			case PAGESTATE_SELECTED:
+			{
+				if ( pActiveMenuPage )
+					pActiveMenuPage->GoUpStill();
+				break;
+			}
+		}
+	}
+
+#ifdef GTA_PC
+	if ( CPad::GetPad(0)->GetDPadDown() || CPad::GetPad(0)->GetDown() )
+#else
+	if ( CPad::GetPad(0)->GetDPadDown() )
+#endif
+	{
+		switch ( m_pageState )
+		{
+			case PAGESTATE_NORMAL:
+			{
+				if ( m_currentPage == PAGE_STATS )
+				{
+					if ( pActiveMenuPage )
+						pActiveMenuPage->GoDownStill();
+				}
+
+				break;
+			}
+			case PAGESTATE_HIGHLIGHTED:
+				break;
+
+			case PAGESTATE_SELECTED:
+			{
+				if ( pActiveMenuPage )
+					pActiveMenuPage->GoDownStill();
+				break;
+			}
+		}
+	}
+
+#ifdef GTA_PC
+	if ( CPad::GetPad(0)->GetDPadUpJustDown() || CPad::GetPad(0)->GetUpJustDown() )
+#else
+	if ( CPad::GetPad(0)->GetDPadUpJustDown() )
+#endif
+		ProcessDPadUpJustDown();
+
+#ifdef GTA_PC
+	if ( CPad::GetPad(0)->GetDPadDownJustDown() || CPad::GetPad(0)->GetDownJustDown() )
+#else
+	if ( CPad::GetPad(0)->GetDPadDownJustDown() )
+#endif
+		ProcessDPadDownJustDown();
+
+	if ( CPad::GetPad(0)->GetLeftShoulder1JustDown() )
+	{
+		switch ( m_pageState )
+		{
+			case PAGESTATE_NORMAL:
+				ProcessDPadLeftJustDown();
+				break;
+
+			case PAGESTATE_HIGHLIGHTED:
+			case PAGESTATE_SELECTED:
+				break;
+		}
+	}
+
+	if ( CPad::GetPad(0)->GetRightShoulder1JustDown() )
+	{
+		switch ( m_pageState )
+		{
+			case PAGESTATE_NORMAL:
+				ProcessDPadRightJustDown();
+				break;
+
+			case PAGESTATE_HIGHLIGHTED:
+			case PAGESTATE_SELECTED:
+				break;
+		}
+	}
+
+#ifdef GTA_PC
+	if ( CPad::GetPad(0)->GetCrossJustDown() || CPad::GetPad(0)->GetEnterJustDown() || CPad::GetPad(0)->GetRightMouseJustDown() )
+#else
+	if ( CPad::GetPad(0)->GetCrossJustDown() )
+#endif
+		ProcessDPadCrossJustDown();
+
+#ifdef GTA_PC
+	if ( CPad::GetPad(0)->GetTriangleJustDown() || CPad::GetPad(0)->GetBackspaceJustDown() || (m_pageState != PAGESTATE_NORMAL && CPad::GetPad(0)->GetEscapeJustDown()) )
+#else
+	if ( CPad::GetPad(0)->GetTriangleJustDown() )
+#endif
+		ProcessDPadTriangleJustDown();
+}
+
+
+void
+CMenuManager::ProcessDPadLeftJustDown(void)
+{
+	if ( m_bInSaveZone )
+	{
+		if ( pActiveMenuPage )
+		{
+			pActiveMenuPage->GoLeft();
+
+			if ( pActiveMenuPage->m_pCurrentControl == &MenuSaveZoneSSL_1 )
+			{
+				if ( MenuSaveZoneSSL_1.m_numOptions < 2 )
+					;
+				else
+					DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_NAVIGATION, 0);
+			}
+			else
+				DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_NAVIGATION, 0);
+		}
+	}
+	else
+	{
+		switch ( m_pageState )
+		{
+			case PAGESTATE_NORMAL:
+			{
+				if ( !bMemoryCardSpecialZone && !m_bInSaveZone )
+				{
+					if ( m_nChangePageTimer == 0 )
+					{
+						if ( --m_newPage < PAGE_FIRST ) m_newPage = PAGE_LAST;
+
+						m_nPageLeftTimer   = CTimer::GetTimeInMillisecondsPauseMode() + 300;
+						m_nPageRightTimer  = 0;
+						m_nChangePageTimer = CTimer::GetTimeInMillisecondsPauseMode() + 250;
+						field_18 = m_newPage;
+						DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_NEW_PAGE, 0);
+					}
+				}
+
+				break;
+			}
+
+			case PAGESTATE_HIGHLIGHTED:
+			{
+				if ( pActiveMenuPage )
+					pActiveMenuPage->GoLeftMenuOnPage();
+
+				DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_NAVIGATION, 0);
+
+				break;
+			}
+
+			case PAGESTATE_SELECTED:
+			{
+				if ( pActiveMenuPage )
+				{
+					pActiveMenuPage->GoLeft();
+
+					if ( m_currentPage == PAGE_AUDIO)
+					{
+						if ( pActiveMenuPage->m_pCurrentControl == &MenuAudio_1 )
+							;
+						else if ( pActiveMenuPage->m_pCurrentControl == &MenuAudio_2 )
+							;
+						else
+							DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_NAVIGATION, 0);
+					}
+					else if ( m_currentPage == PAGE_DISPLAY)
+					{
+						if ( pActiveMenuPage->m_pCurrentControl == &MenuDisplay_1 )
+							;
+						else
+							DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_NAVIGATION, 0);
+					}
+					else
+					{
+						if ( pActiveMenuPage->m_pCurrentControl == &MenuSaveDG_2 )
+						{
+							if ( MenuSaveDG_2.m_numOptions < 2 )
+								;
+							else
+								DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_NAVIGATION, 0);
+						}
+						else if ( pActiveMenuPage->m_pCurrentControl == &MenuSaveLG_2 )
+						{
+							if ( MenuSaveLG_2.m_numOptions < 2 )
+								;
+							else
+								DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_NAVIGATION, 0);
+						}
+						else
+							DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_NAVIGATION, 0);
+					}
+				}
+
+				break;
+			}
+		}
+	}
+}
+
+void
+CMenuManager::ProcessDPadRightJustDown(void)
+{
+	if ( m_bInSaveZone )
+	{
+		if ( pActiveMenuPage )
+		{
+			pActiveMenuPage->GoRight();
+
+			if ( pActiveMenuPage->m_pCurrentControl == &MenuSaveZoneSSL_1 )
+			{
+				if ( MenuSaveZoneSSL_1.m_numOptions < 2 )
+					;
+				else
+					DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_NAVIGATION, 0);
+			}
+			else
+				DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_NAVIGATION, 0);
+		}
+	}
+	else
+	{
+		switch ( m_pageState )
+		{
+			case PAGESTATE_NORMAL:
+			{
+				if ( !bMemoryCardSpecialZone && !m_bInSaveZone )
+				{
+					if ( m_nChangePageTimer == 0 )
+					{
+						if ( ++m_newPage > PAGE_LAST ) m_newPage = PAGE_FIRST;
+
+						m_nPageLeftTimer   = 0;
+						m_nPageRightTimer  = CTimer::GetTimeInMillisecondsPauseMode() + 300;
+						m_nChangePageTimer = CTimer::GetTimeInMillisecondsPauseMode() + 250;
+						field_18 = m_newPage;
+						DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_NEW_PAGE, 0);
+					}
+				}
+
+				break;
+			}
+
+			case PAGESTATE_HIGHLIGHTED:
+			{
+				if ( pActiveMenuPage )
+					pActiveMenuPage->GoRightMenuOnPage();
+
+				DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_NAVIGATION, 0);
+
+				break;
+			}
+
+			case PAGESTATE_SELECTED:
+			{
+				if ( pActiveMenuPage )
+				{
+					pActiveMenuPage->GoRight();
+
+					if ( m_currentPage == PAGE_AUDIO)
+					{
+						if ( pActiveMenuPage->m_pCurrentControl == &MenuAudio_1 )
+							;
+						else if ( pActiveMenuPage->m_pCurrentControl == &MenuAudio_2 )
+							;
+						else
+							DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_NAVIGATION, 0);
+					}
+					else if ( m_currentPage == PAGE_DISPLAY)
+					{
+						if ( pActiveMenuPage->m_pCurrentControl == &MenuDisplay_1 )
+							;
+						else
+							DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_NAVIGATION, 0);
+					}
+					else
+					{
+						if ( pActiveMenuPage->m_pCurrentControl == &MenuSaveDG_2 )
+						{
+							if ( MenuSaveDG_2.m_numOptions < 2 )
+								;
+							else
+								DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_NAVIGATION, 0);
+						}
+						else if ( pActiveMenuPage->m_pCurrentControl == &MenuSaveLG_2 )
+						{
+							if ( MenuSaveLG_2.m_numOptions < 2 )
+								;
+							else
+								DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_NAVIGATION, 0);
+						}
+						else
+							DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_NAVIGATION, 0);
+					}
+				}
+
+				break;
+			}
+		}
+	}
+}
+
+void
+CMenuManager::ProcessDPadUpJustDown(void)
+{
+	if ( m_bInSaveZone )
+	{
+		if ( pActiveMenuPage )
+		{
+			pActiveMenuPage->GoUp();
+
+			if ( pActiveMenuPage->m_pCurrentControl == &MenuSaveZoneSSL_1 )
+			{
+				if ( MenuSaveZoneSSL_1.m_numOptions < 2 )
+					;
+				else
+					DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_NAVIGATION, 0);
+			}
+			else
+				DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_NAVIGATION, 0);
+		}
+	}
+	else
+	{
+		switch ( m_pageState )
+		{
+			case PAGESTATE_NORMAL:
+				break;
+
+			case PAGESTATE_HIGHLIGHTED:
+			{
+				if ( pActiveMenuPage )
+					pActiveMenuPage->GoUpMenuOnPage();
+
+				DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_NAVIGATION, 0);
+				break;
+			}
+
+			case PAGESTATE_SELECTED:
+			{
+				if ( pActiveMenuPage )
+				{
+					pActiveMenuPage->GoUp();
+
+					if ( pActiveMenuPage->m_pCurrentControl == &MenuSaveDG_2 )
+					{
+						if ( MenuSaveDG_2.m_numOptions < 2 )
+							;
+						else
+							DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_NAVIGATION, 0);
+					}
+					else if ( pActiveMenuPage->m_pCurrentControl == &MenuSaveLG_2 )
+					{
+						if ( MenuSaveLG_2.m_numOptions < 2 )
+							;
+						else
+							DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_NAVIGATION, 0);
+					}
+					else
+						DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_NAVIGATION, 0);
+				}
+
+				break;
+			}
+		}
+	}
+}
+
+void
+CMenuManager::ProcessDPadDownJustDown(void)
+{
+	if ( m_bInSaveZone )
+	{
+		if ( pActiveMenuPage )
+		{
+			pActiveMenuPage->GoDown();
+
+			if ( pActiveMenuPage->m_pCurrentControl == &MenuSaveZoneSSL_1 )
+			{
+				if ( MenuSaveZoneSSL_1.m_numOptions < 2 )
+					;
+				else
+					DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_NAVIGATION, 0);
+			}
+			else
+				DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_NAVIGATION, 0);
+		}
+	}
+	else
+	{
+		switch ( m_pageState )
+		{
+			case PAGESTATE_NORMAL:
+				break;
+
+			case PAGESTATE_HIGHLIGHTED:
+			{
+				if ( pActiveMenuPage )
+					pActiveMenuPage->GoDownMenuOnPage();
+
+				DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_NAVIGATION, 0);
+
+				break;
+			}
+
+			case PAGESTATE_SELECTED:
+			{
+				if ( pActiveMenuPage )
+				{
+					pActiveMenuPage->GoDown();
+
+					if ( pActiveMenuPage->m_pCurrentControl == &MenuSaveDG_2 )
+					{
+						if ( MenuSaveDG_2.m_numOptions < 2 )
+							;
+						else
+							DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_NAVIGATION, 0);
+					}
+					else if ( pActiveMenuPage->m_pCurrentControl == &MenuSaveLG_2 )
+					{
+						if ( MenuSaveLG_2.m_numOptions < 2 )
+							;
+						else
+							DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_NAVIGATION, 0);
+					}
+					else
+						DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_NAVIGATION, 0);
+				}
+				break;
+			}
+		}
+	}
+}
+
+void
+CMenuManager::ProcessDPadTriangleJustDown(void)
+{
+	if ( pActiveMenuPage )
+	{
+		pActiveMenuPage->SelectDefaultCancelAction();
+
+		if ( m_bMenuActive || m_bInSaveZone )
+		{
+			if ( bIgnoreTriangleButton )
+			{
+				if ( m_bInSaveZone )
+					DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_BACK, 0);
+				else if ( pActiveMenuPage->m_pCurrentControl == &MenuSaveDG_2 || pActiveMenuPage->m_pCurrentControl == &MenuSaveLG_2 )
+					DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_BACK, 0);
+			}
+			else if ( !bIgnoreTriangleButton )
+			{
+				switch ( m_pageState )
+				{
+					case PAGESTATE_NORMAL:
+						WorkOutMenuState(true);
+						break;
+
+					case PAGESTATE_HIGHLIGHTED:
+						m_pageState = PAGESTATE_NORMAL;
+						DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_NEW_PAGE, 0);
+						break;
+
+					case PAGESTATE_SELECTED:
+					{
+						m_pageState = PAGESTATE_HIGHLIGHTED;
+						if ( pActiveMenuPage )
+						{
+							if ( pActiveMenuPage->m_numControls == 1 )
+							{
+								m_pageState = PAGESTATE_NORMAL;
+								DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_NEW_PAGE, 0);
+							}
+							else
+								DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_BACK, 0);
+						}
+						break;
+					}
+				}
+			}
+		}
+	}
+	else
+	{
+		if ( !bIgnoreTriangleButton )
+		{
+			switch ( m_pageState )
+			{
+				case PAGESTATE_NORMAL:
+					WorkOutMenuState(false);
+					break;
+
+				case PAGESTATE_HIGHLIGHTED:
+					m_pageState = PAGESTATE_NORMAL;
+					DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_NEW_PAGE, 0);
+					break;
+
+				case PAGESTATE_SELECTED:
+				{
+					m_pageState = PAGESTATE_HIGHLIGHTED;
+					if ( pActiveMenuPage )
+					{
+						if ( pActiveMenuPage->m_numControls == 1 )
+						{
+							m_pageState = PAGESTATE_NORMAL;
+							DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_NEW_PAGE, 0);
+						}
+						else
+							DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_BACK, 0);
+					}
+					break;
+				}
+			}
+		}
+	}
+}
+
+void
+CMenuManager::ProcessDPadCrossJustDown(void)
+{
+	if ( m_bInSaveZone )
+	{
+		if ( pActiveMenuPage )
+			pActiveMenuPage->SelectCurrentOptionUnderCursor();
+
+		DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_SETTING_CHANGE, 0);
+	}
+	else
+	{
+		if ( m_currentPage != PAGE_STATS && m_currentPage != PAGE_BRIEFS)
+		{
+			switch ( m_pageState )
+			{
+				case PAGESTATE_NORMAL:
+				{
+					m_pageState = PAGESTATE_HIGHLIGHTED;
+					if ( pActiveMenuPage )
+					{
+						if ( pActiveMenuPage->m_numControls == 1 )
+							m_pageState = PAGESTATE_SELECTED;
+					}
+
+					switch ( m_currentPage )
+					{
+						case PAGE_AUDIO:
+						{
+							if (   pActiveMenuPage->m_pCurrentControl == &MenuAudio_1
+								|| pActiveMenuPage->m_pCurrentControl == &MenuAudio_2
+								|| pActiveMenuPage->m_pCurrentControl == &MenuAudio_3
+								|| pActiveMenuPage->m_pCurrentControl == &MenuAudio_4 )
+							{
+								if ( !gMusicPlaying )
+								{
+									DMAudio.PlayFrontEndTrack(m_PrefsRadioStation, 1);
+									gMusicPlaying = true;
+								}
+							}
+							else
+							{
+								DMAudio.StopFrontEndTrack();
+								gMusicPlaying = false;
+							}
+							break;
+						}
+					}
+
+					DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_SETTING_CHANGE, 0);
+					break;
+				}
+
+				case PAGESTATE_HIGHLIGHTED:
+				{
+					m_pageState = PAGESTATE_SELECTED;
+					DoHackingMenusAtPageBrowse();
+					if ( pActiveMenuPage )
+					{
+						if ( pActiveMenuPage->IsActiveMenuTwoState())
+						{
+							m_pageState = PAGESTATE_HIGHLIGHTED;
+							pActiveMenuPage->ActiveMenuTwoState_SelectNextPosition();
+						}
+					}
+
+					switch ( m_currentPage )
+					{
+						case PAGE_AUDIO:
+						{
+							if ( pActiveMenuPage->m_pCurrentControl != &MenuAudio_4 )
+								DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_SETTING_CHANGE, 0);
+
+							break;
+						}
+
+						default:
+						{
+							DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_SETTING_CHANGE, 0);
+							DMAudio.StopFrontEndTrack();
+							gMusicPlaying = false;
+							break;
+						}
+					}
+					break;
+				}
+
+				case PAGESTATE_SELECTED:
+				{
+					if ( pActiveMenuPage )
+					{
+						pActiveMenuPage->SelectCurrentOptionUnderCursor();
+
+						switch ( m_currentPage )
+						{
+							case PAGE_AUDIO:
+							{
+								if ( pActiveMenuPage->m_pCurrentControl != &MenuAudio_3 )
+									m_pageState = PAGESTATE_HIGHLIGHTED;
+								break;
+							}
+
+							case PAGE_LOAD:
+							case PAGE_LANGUAGE:
+								break;
+
+							default:
+								m_pageState = PAGESTATE_HIGHLIGHTED;
+								break;
+						}
+					}
+
+					DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_SETTING_CHANGE, 0);
+					break;
+				}
+			}
+		}
+	}
+}
+
+void
+CMenuManager::DoHackingMenusAtPageBrowse(void)
+{
+	if ( pActiveMenuPage )
+	{
+		switch ( m_currentPage )
+		{
+			case PAGE_CONTROLS:
+			{
+				if ( pActiveMenuPage->m_pCurrentControl == &MenuControls_1  )
+				{
+					int32 sel = MenuControls_1.GetMenuSelection();
+					MenuControls_1.GoFirst();
+
+					for ( int32 i = 0; i < sel; i++ )
+						MenuControls_1.GoNext();
+				}
+				break;
+			}
+
+			case PAGE_AUDIO:
+			{
+				if ( pActiveMenuPage->m_pCurrentControl == &MenuAudio_3  )
+				{
+					int32 sel = MenuAudio_3.GetMenuSelection();
+					MenuAudio_3.GoFirst();
+
+					for ( int32 i = 0; i < sel; i++ )
+						MenuAudio_3.GoNext();
+				}
+				break;
+			}
+		}
+	}
+}
+
+void
+CMenuManager::SetSoundLevelsForMusicMenu(void)
+{
+	DMAudio.SetMusicMasterVolume(m_PrefsMusicVolume);
+	DMAudio.SetEffectsMasterVolume(m_PrefsSfxVolume);
+}
+
+void
+CMenuManager::FilterOutColorMarkersFromString(wchar *string, CRGBA &color)
+{
+	wchar buf[300];
+	UnicodeStrcpy(buf, string);
+
+	wchar *src = buf;
+	wchar *dst = string;
+	while ( *src != '\0' )
+	{
+		if ( *src == '~' )
+		{
+			src++;
+
+			if ( *src == 'l' )      color = CRGBA(0, 0, 0, 255);
+			else if ( *src == 'p' ) color = CRGBA(255, 0, 255, 255);
+			else if ( *src == 'y' ) color = CRGBA(255, 255, 0, 255);
+			else if ( *src == 'w' ) color = CRGBA(255, 255, 255, 255);
+			else if ( *src == 'b' ) color = CRGBA(40, 40, 255, 255);
+			else if ( *src == 'g' ) color = CRGBA(40, 235, 40, 255);
+			else if ( *src == 'r' ) color = CRGBA(255, 0, 0, 255);
+
+			while ( *src++ != '~' )
+				;
+		}
+		else
+			*dst++ = *src++;
+	}
+
+	*dst = '\0';
+}
+
+#endif
diff --git a/src/core/Frontend_PS2.h b/src/core/Frontend_PS2.h
new file mode 100644
index 0000000..6311d82
--- /dev/null
+++ b/src/core/Frontend_PS2.h
@@ -0,0 +1,247 @@
+#pragma once
+#include "Sprite2d.h"
+
+enum
+{
+	PAGE_STATS,
+	PAGE_LOAD,
+	PAGE_BRIEFS,
+	PAGE_CONTROLS,
+	PAGE_AUDIO,
+	PAGE_DISPLAY,
+	PAGE_LANGUAGE,
+
+	NUM_PAGES,
+	PAGE_FIRST = PAGE_STATS,
+	PAGE_LAST = PAGE_LANGUAGE,
+};
+
+enum 
+{
+	PAGESTATE_NORMAL = 0,
+	PAGESTATE_HIGHLIGHTED,
+	PAGESTATE_SELECTED
+};
+
+
+enum eFrontendSprites
+{
+	FE2_MAINPANEL_UL,
+	FE2_MAINPANEL_UR,
+	FE2_MAINPANEL_DL,
+	FE2_MAINPANEL_DR,
+	FE2_MAINPANEL_DR2,
+	FE2_TABACTIVE,
+	FE_ICONBRIEF,
+	FE_ICONSTATS,
+	FE_ICONCONTROLS,
+	FE_ICONSAVE,
+	FE_ICONAUDIO,
+	FE_ICONDISPLAY,
+	FE_ICONLANGUAGE,
+	FE_CONTROLLER,
+	FE_CONTROLLERSH,
+	FE_ARROWS1,
+	FE_ARROWS2,
+	FE_ARROWS3,
+	FE_ARROWS4,
+	FE_RADIO1,
+	FE_RADIO2,
+	FE_RADIO3,
+	FE_RADIO4,
+	FE_RADIO5,
+	FE_RADIO6,
+	FE_RADIO7,
+	FE_RADIO8,
+	FE_RADIO9,
+
+	NUM_FE_SPRITES
+};
+
+
+class CSprite2d;
+class CVector2D;
+
+#ifdef GTA_PC
+enum eControlMethod
+{
+	CONTROL_STANDARD = 0,
+	CONTROL_CLASSIC,
+};
+#endif
+
+class CMenuManager
+{
+public:
+	enum LANGUAGE
+	{
+		LANGUAGE_AMERICAN,
+		LANGUAGE_FRENCH,
+		LANGUAGE_GERMAN,
+		LANGUAGE_ITALIAN,
+		LANGUAGE_SPANISH,
+#ifdef MORE_LANGUAGES
+		LANGUAGE_POLISH,
+		LANGUAGE_RUSSIAN,
+		LANGUAGE_JAPANESE,
+#endif
+	};
+	
+	enum CONTRCONFIG
+	{
+		CONFIG_1 = 0,
+		CONFIG_2,
+		CONFIG_3,
+		CONFIG_4,
+	};
+
+	enum
+	{
+		NUM_SPRIRES = 28,
+	};
+	
+	enum
+	{
+		PAGESTATE_NORMAL = 0,
+		PAGESTATE_HIGHLIGHTED = 1,
+		PAGESTATE_SELELECTED = 2,
+	};
+	
+	enum
+	{
+		SLIDE_TO_BOTTOM = 0,
+		SLIDE_TO_RIGHT,
+		SLIDE_TO_TOP,
+		SLIDE_TO_LEFT,
+		SLIDE_MAX
+	};
+	
+	int32 m_currentPage;
+	int32 m_newPage;
+	int32 m_pageState;
+	uint32 m_nPageLeftTimer;
+	uint32 m_nPageRightTimer;
+	uint32 m_nChangePageTimer;
+	int field_18;
+	uint8 m_fade;
+	uint8 m_someAlpha;
+	//char field_1E; // unused ?
+	//char field_1F; // unused ?
+	uint32 m_nStartPauseTimer;
+	uint32 m_nEndPauseTimer;
+	CVector2D m_position;
+	uint8 m_nSlidingDir;
+	//char field_31; // unused ?
+	//char field_32; // unused ?
+	//char field_33; // unused ?
+	bool m_bInitialised;
+	bool m_bWantToUpdateContent;
+	bool m_bMenuActive;
+	bool m_bWantToRestart;
+	//char field_38; //unused ?
+	bool m_bRenderGameInMenu;
+	bool m_bSaveMenuActive;
+	bool m_bInSaveZone;
+	char field_3C;
+	bool m_bTexturesLoaded;
+	//char field_3E; //unused ?
+	//char field_3F; //unused ?
+	CSprite2d m_sprites[NUM_SPRIRES];
+	
+	static int32 m_PrefsSfxVolume;
+	static int32 m_PrefsMusicVolume;
+	static int32 m_PrefsBrightness;
+	static bool m_PrefsShowTrails;
+	static bool m_PrefsShowSubtitles;
+	static bool m_PrefsAllowNastyGame;
+	static int32 m_PrefsRadioStation;
+	static int32 m_PrefsStereoMono;
+	static int8 m_PrefsUseWideScreen;
+	static int32 m_PrefsLanguage;
+	static CONTRCONFIG m_PrefsControllerConfig;
+	static bool m_PrefsUseVibration;
+
+#ifdef CUTSCENE_BORDERS_SWITCH
+	static bool m_PrefsCutsceneBorders;
+#endif
+
+#ifdef GTA_PC
+	bool m_bQuitGameNoCD;
+	
+	int32 m_nMouseTempPosX;
+	int32 m_nMouseTempPosY;
+	int32 m_nPrefsVideoMode;
+	int32 m_nDisplayVideoMode;
+	int8 m_nPrefsAudio3DProviderIndex;
+	
+	static int32 OS_Language;
+	static int8 m_PrefsVsync;
+	static int8 m_PrefsVsyncDisp;
+	static int8 m_PrefsFrameLimiter;
+	static int8 m_PrefsSpeakers;
+	static int32 m_ControlMethod;
+	static int8 m_PrefsDMA;
+	static float m_PrefsLOD;
+	static char m_PrefsSkinFile[256];
+
+#ifndef MASTER
+	static bool m_PrefsMarketing;
+	static bool m_PrefsDisableTutorials;
+#endif // !MASTER
+
+#ifdef MENU_MAP
+	static bool bMenuMapActive;
+	static float fMapSize;
+	static float fMapCenterY;
+	static float fMapCenterX;
+#endif
+
+#ifdef IMPROVED_VIDEOMODE	
+	int32 m_nPrefsWidth = 640;
+	int32 m_nPrefsHeight = 480;
+	int32 m_nPrefsDepth = 32;
+	int32 m_nPrefsWindowed = 1;
+	int32 m_nPrefsSubsystem;
+	int32 m_nSelectedScreenMode;
+#endif
+
+	void WaitForUserCD() { }
+#endif
+
+	bool GetIsMenuActive() {return !!m_bMenuActive;}
+
+	CMenuManager(void);
+#ifdef FIX_BUGS
+	~CMenuManager(void)
+	{
+		UnloadTextures();
+	}
+#endif
+	
+	void LoadAllTextures(void);
+	void UnloadTextures(void);
+	
+	void InitialiseMenusOnce(void);
+	void InitialiseChangedLanguageSettings(void);
+	void InitialiseMenuContents(void);
+	void AnaliseMenuContents(void);
+	void InitialiseMenuContentsAfterLoadingGame(void);
+	void DrawFrontEnd(void);
+	void DrawFrontEndNormal(void);
+	void DrawFrontEndSaveZone(void);
+	void DrawMemoryCardStartUpMenus(void);
+	void Process(void);
+	void WorkOutMenuState(uint8 bExit);
+	void ProcessControllerInput(void);
+	void ProcessDPadLeftJustDown(void);
+	void ProcessDPadRightJustDown(void);
+	void ProcessDPadUpJustDown(void);
+	void ProcessDPadDownJustDown(void);
+	void ProcessDPadTriangleJustDown(void);
+	void ProcessDPadCrossJustDown(void);
+	void DoHackingMenusAtPageBrowse(void);
+	void SetSoundLevelsForMusicMenu(void);
+	void FilterOutColorMarkersFromString(wchar *string, CRGBA &color);
+};
+
+extern CMenuManager FrontEndMenuManager;
\ No newline at end of file
diff --git a/src/core/Game.cpp b/src/core/Game.cpp
new file mode 100644
index 0000000..43bd3d1
--- /dev/null
+++ b/src/core/Game.cpp
@@ -0,0 +1,1334 @@
+#include "common.h"
+#include "platform.h"
+
+#include "Game.h"
+#include "main.h"
+#include "RwHelper.h"
+#include "Accident.h"
+#include "Antennas.h"
+#include "Bridge.h"
+#include "CarCtrl.h"
+#include "CarGen.h"
+#include "CdStream.h"
+#include "Clock.h"
+#include "Clouds.h"
+#include "Collision.h"
+#include "Console.h"
+#include "Coronas.h"
+#include "Cranes.h"
+#include "Credits.h"
+#include "CutsceneMgr.h"
+#include "DMAudio.h"
+#include "Darkel.h"
+#include "Debug.h"
+#include "EventList.h"
+#include "FileLoader.h"
+#include "FileMgr.h"
+#include "Fire.h"
+#include "Fluff.h"
+#include "Font.h"
+#include "Frontend.h"
+#include "frontendoption.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 "MemoryCard.h"
+#include "MemoryHeap.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 "Restart.h"
+#include "RoadBlocks.h"
+#include "Rubbish.h"
+#include "SceneEdit.h"
+#include "Script.h"
+#include "Shadows.h"
+#include "Skidmarks.h"
+#include "SetPieces.h"
+#include "SpecialFX.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"
+#include "WeaponEffects.h"
+#include "Weather.h"
+#include "World.h"
+#include "ZoneCull.h"
+#include "Zones.h"
+#include "Occlusion.h"
+#include "debugmenu.h"
+#include "Ropes.h"
+#include "WindModifiers.h"
+#include "WaterCreatures.h"
+#include "postfx.h"
+#include "custompipes.h"
+#include "screendroplets.h"
+#include "VarConsole.h"
+#ifdef USE_TEXTURE_POOL
+#include "TexturePools.h"
+#endif
+
+eLevelName CGame::currLevel;
+int32 CGame::currArea;
+bool CGame::bDemoMode = true;
+bool CGame::nastyGame = true;
+bool CGame::frenchGame;
+bool CGame::germanGame;
+bool CGame::noProstitutes;
+bool CGame::playingIntro;
+char CGame::aDatFile[32];
+#ifdef MORE_LANGUAGES
+bool CGame::russianGame = false;
+bool CGame::japaneseGame = false;
+#endif
+#ifndef MASTER
+CVector CGame::PlayerCoords;
+bool8 CGame::VarUpdatePlayerCoords;
+#endif
+
+int gameTxdSlot;
+
+#ifdef SECUROM
+uint8 gameProcessPirateCheck = 0;
+#endif
+
+bool DoRWStuffStartOfFrame(int16 TopRed, int16 TopGreen, int16 TopBlue, int16 BottomRed, int16 BottomGreen, int16 BottomBlue, int16 Alpha);
+void DoRWStuffEndOfFrame(void);
+#ifdef PS2_MENU
+void MessageScreen(char *msg)
+{
+	//TODO: stretch_screen
+	
+	CRect rect(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT);
+	CRGBA color(255, 255, 255, 255);
+
+	DoRWStuffStartOfFrame(50, 50, 50, 0, 0, 0, 255);
+	
+	CSprite2d::InitPerFrame();
+	CFont::InitPerFrame();
+	DefinedState();
+
+	CSprite2d *splash = LoadSplash(NULL);
+	splash->Draw(rect, color, color, color, color);
+	splash->DrawRect(CRect(SCREEN_SCALE_X(20.0f), SCREEN_SCALE_Y(110.0f), SCREEN_SCALE_X(620.0f), SCREEN_SCALE_Y(300.0f)), CRGBA(50, 50, 50, 192));
+	
+	CFont::SetFontStyle(FONT_BANK);
+	CFont::SetBackgroundOff();
+	CFont::SetWrapx(SCREEN_SCALE_FROM_RIGHT(190.0f)); // 450.0f
+	CFont::SetScale(SCREEN_SCALE_X(1.0f), SCREEN_SCALE_Y(1.0f));
+	CFont::SetCentreOn();
+	CFont::SetCentreSize(SCREEN_SCALE_X(450.0f));
+	CFont::SetJustifyOff();
+	CFont::SetColor(CRGBA(255, 255, 255, 255));
+	CFont::SetDropColor(CRGBA(32, 32, 32, 255));
+	CFont::SetDropShadowPosition(3);
+	CFont::SetPropOn();
+	CFont::PrintString(SCREEN_SCALE_X(320.0f), SCREEN_SCALE_Y(130.0f), TheText.Get(msg));
+	CFont::DrawFonts();
+	
+	DoRWStuffEndOfFrame();
+}
+#endif
+
+bool
+CGame::InitialiseOnceBeforeRW(void)
+{
+	CFileMgr::Initialise();
+	CdStreamInit(MAX_CDCHANNELS);
+	debug("size of matrix %d\n", sizeof(CMatrix));
+	debug("size of placeable %d\n", sizeof(CPlaceable));
+	debug("size of entity %d\n", sizeof(CEntity));
+	debug("size of building %d\n", sizeof(CBuilding));
+	debug("size of dummy %d\n", sizeof(CDummy));
+#ifdef EXTENDED_COLOURFILTER
+	CPostFX::InitOnce();
+#endif
+#ifdef CUSTOM_FRONTEND_OPTIONS
+	// Not needed here but may be needed in future
+	// if (numCustomFrontendOptions == 0 && numCustomFrontendScreens == 0)
+	CustomFrontendOptionsPopulate();
+#endif
+	return true;
+}
+
+#ifndef LIBRW
+#ifdef PS2_MATFX
+void ReplaceMatFxCallback();
+#endif // PS2_MATFX
+#ifdef PS2_ALPHA_TEST
+void ReplaceAtomicPipeCallback();
+#endif // PS2_ALPHA_TEST
+#endif // !LIBRW
+
+bool
+CGame::InitialiseRenderWare(void)
+{
+	ValidateVersion();
+#ifdef USE_TEXTURE_POOL
+	_TexturePoolsInitialise();
+#endif
+
+	CTxdStore::Initialise();
+	CVisibilityPlugins::Initialise();
+
+#ifdef GTA_PS2
+	RpSkySelectTrueTSClipper(TRUE);
+	RpSkySelectTrueTLClipper(TRUE);
+
+	// PS2ManagerApplyDirectionalLightingCB() uploads the GTA lights
+	// directly without going through RpWorld and all that
+	SetupPS2ManagerDefaultLightingCallback();
+	PreAllocateRwObjects();
+#endif
+
+	/* Create camera */
+	Scene.camera = CameraCreate(SCREEN_WIDTH, SCREEN_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();
+
+#ifdef LIBRW
+#ifdef PS2_MATFX
+	rw::MatFX::modulateEnvMap = true;
+#else
+	rw::MatFX::modulateEnvMap = false;
+#endif
+#else
+#ifdef PS2_MATFX
+	ReplaceMatFxCallback();
+#endif // PS2_MATFX
+#ifdef PS2_ALPHA_TEST
+	ReplaceAtomicPipeCallback();
+#endif // PS2_ALPHA_TEST
+#endif // LIBRW
+
+	PUSH_MEMID(MEMID_TEXTURES);
+	CFont::Initialise();
+	CHud::Initialise();
+	CPlayerSkin::Initialise();
+	POP_MEMID();
+
+#ifdef EXTENDED_PIPELINES
+	CustomPipes::CustomPipeInit();	// need Scene.world for this
+#endif
+#ifdef SCREEN_DROPLETS
+	ScreenDroplets::InitDraw();
+#endif
+
+	return (true);
+}
+
+void CGame::ShutdownRenderWare(void)
+{
+#ifdef SCREEN_DROPLETS
+	ScreenDroplets::Shutdown();
+#endif
+#ifdef EXTENDED_PIPELINES
+	CustomPipes::CustomPipeShutdown();
+#endif
+
+	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();
+	
+#ifdef USE_TEXTURE_POOL
+	_TexturePoolsShutdown();
+#endif
+}
+
+bool CGame::InitialiseOnceAfterRW(void)
+{
+	TheText.Load();
+	CTimer::Initialise();
+	CTempColModels::Initialise();
+	mod_HandlingManager.Initialise();
+	CSurfaceTable::Initialise("DATA\\SURFACE.DAT");
+	CPedStats::Initialise();
+	CTimeCycle::Initialise();
+#ifdef GTA_PS2
+	LoadingScreen("Loading the Game", "Initialising audio", GetRandomSplashScreen());
+#endif
+	DMAudio.Initialise();
+
+#ifndef GTA_PS2
+	if ( DMAudio.GetNum3DProvidersAvailable() == 0 )
+		FrontEndMenuManager.m_nPrefsAudio3DProviderIndex = NO_AUDIO_PROVIDER;
+
+	if ( FrontEndMenuManager.m_nPrefsAudio3DProviderIndex == AUDIO_PROVIDER_NOT_DETERMINED || FrontEndMenuManager.m_nPrefsAudio3DProviderIndex == -2 )
+	{
+		FrontEndMenuManager.m_PrefsSpeakers = 0;
+		FrontEndMenuManager.m_nPrefsAudio3DProviderIndex = DMAudio.AutoDetect3DProviders();
+	}
+
+	DMAudio.SetCurrent3DProvider(FrontEndMenuManager.m_nPrefsAudio3DProviderIndex);
+	DMAudio.SetSpeakerConfig(FrontEndMenuManager.m_PrefsSpeakers);
+	DMAudio.SetDynamicAcousticModelingStatus(FrontEndMenuManager.m_PrefsDMA);
+	DMAudio.SetMusicMasterVolume(FrontEndMenuManager.m_PrefsMusicVolume);
+	DMAudio.SetEffectsMasterVolume(FrontEndMenuManager.m_PrefsSfxVolume);
+	DMAudio.SetEffectsFadeVol(127);
+	DMAudio.SetMusicFadeVol(127);
+#endif
+	return true;
+}
+
+void
+CGame::FinalShutdown(void)
+{	
+	CTxdStore::Shutdown();
+	CPedStats::Shutdown();
+	CdStreamShutdown();
+}
+
+bool CGame::Initialise(const char* datFile)
+{
+	ResetLoadingScreenBar();
+	strcpy(aDatFile, datFile);
+
+#ifdef GTA_PS2
+	// TODO: upload VU0 collision code here
+#endif
+
+	CPools::Initialise();
+
+#ifndef GTA_PS2
+	CIniFile::LoadIniFile();
+#endif
+#ifdef USE_TEXTURE_POOL
+	_TexturePoolsUnknown(false);
+#endif
+	currLevel = LEVEL_BEACH;
+	currArea = AREA_MAIN_MAP;
+
+	PUSH_MEMID(MEMID_TEXTURES);
+	LoadingScreen("Loading the Game", "Loading generic textures", GetRandomSplashScreen());
+	gameTxdSlot = CTxdStore::AddTxdSlot("generic");
+	CTxdStore::Create(gameTxdSlot);
+	CTxdStore::AddRef(gameTxdSlot);
+
+#ifdef EXTENDED_PIPELINES
+	// for generic fallback
+	CustomPipes::SetTxdFindCallback();
+#endif
+
+	LoadingScreen("Loading the Game", "Loading particles", nil);
+	int particleTxdSlot = CTxdStore::AddTxdSlot("particle");
+	CTxdStore::LoadTxd(particleTxdSlot, "MODELS/PARTICLE.TXD");
+	CTxdStore::AddRef(particleTxdSlot);
+	CTxdStore::SetCurrentTxd(gameTxdSlot);
+	LoadingScreen("Loading the Game", "Setup game variables", nil);
+	POP_MEMID();
+
+#ifdef GTA_PS2
+	CDma::SyncChannel(0, true);
+#endif
+
+	CGameLogic::InitAtStartOfGame();
+	CReferences::Init();
+	TheCamera.Init();
+	TheCamera.SetRwCamera(Scene.camera);
+	CDebug::DebugInitTextBuffer();
+	ThePaths.Init();
+	ThePaths.AllocatePathFindInfoMem(4500);
+	CScriptPaths::Init();
+	CWeather::Init();
+	CCullZones::Init();
+	COcclusion::Init();
+	CCollision::Init();
+	CSetPieces::Init();
+	CTheZones::Init();
+	CUserDisplay::Init();
+	CMessages::Init();
+	CMessages::ClearAllMessagesDisplayedByGame();
+	CRecordDataForGame::Init();
+	CRestart::Initialise();
+
+	PUSH_MEMID(MEMID_WORLD);
+	CWorld::Initialise();
+	POP_MEMID();
+
+	PUSH_MEMID(MEMID_TEXTURES);
+	CParticle::Initialise();
+	POP_MEMID();
+
+	PUSH_MEMID(MEMID_ANIMATION);
+	CAnimManager::Initialise();
+	CCutsceneMgr::Initialise();
+	POP_MEMID();
+
+	PUSH_MEMID(MEMID_CARS);
+	CCarCtrl::Init();
+	POP_MEMID();
+
+	PUSH_MEMID(MEMID_DEF_MODELS);
+	InitModelIndices();
+	CModelInfo::Initialise();
+	CPickups::Init();
+	CTheCarGenerators::Init();
+
+	CdStreamAddImage("MODELS\\GTA3.IMG");
+
+	CFileLoader::LoadLevel("DATA\\DEFAULT.DAT");
+	CFileLoader::LoadLevel(datFile);
+
+	LoadingScreen("Loading the Game", "Add Particles", nil);
+	CWorld::AddParticles();
+	CVehicleModelInfo::LoadVehicleColours();
+	CVehicleModelInfo::LoadEnvironmentMaps();
+	CTheZones::PostZoneCreation();
+	POP_MEMID();
+
+	LoadingScreen("Loading the Game", "Setup paths", nil);
+	ThePaths.PreparePathData();
+	for (int i = 0; i < NUMPLAYERS; i++)
+		CWorld::Players[i].Clear();
+	CWorld::Players[0].LoadPlayerSkin();
+	TestModelIndices();
+
+	LoadingScreen("Loading the Game", "Setup water", nil);
+	CWaterLevel::Initialise("DATA\\WATER.DAT");
+	TheConsole.Init();
+	CDraw::SetFOV(120.0f);
+	CDraw::ms_fLODDistance = 500.0f;
+
+	LoadingScreen("Loading the Game", "Setup streaming", nil);
+	CStreaming::LoadInitialVehicles();
+	CStreaming::LoadInitialPeds();
+	CStreaming::RequestBigBuildings(LEVEL_GENERIC);
+	CStreaming::LoadAllRequestedModels(false);
+	CStreaming::RemoveIslandsNotUsed(currLevel);
+	printf("Streaming uses %zuK of its memory", CStreaming::ms_memoryUsed / 1024); // original modifier was %d
+
+	LoadingScreen("Loading the Game", "Load animations", GetRandomSplashScreen());
+	PUSH_MEMID(MEMID_ANIMATION);
+	CAnimManager::LoadAnimFiles();
+	POP_MEMID();
+
+	CStreaming::LoadInitialWeapons();
+	CStreaming::LoadAllRequestedModels(0);
+	CPed::Initialise();
+	CRouteNode::Initialise();
+	CEventList::Initialise();
+#ifdef SCREEN_DROPLETS
+	ScreenDroplets::Initialise();
+#endif
+	LoadingScreen("Loading the Game", "Find big buildings", nil);
+	CRenderer::Init();
+
+	LoadingScreen("Loading the Game", "Setup game variables", nil);
+	CRadar::Initialise();
+	CRadar::LoadTextures();
+	CWeapon::InitialiseWeapons();
+
+	LoadingScreen("Loading the Game", "Setup traffic lights", nil);
+	CTrafficLights::ScanForLightsOnMap();
+	CRoadBlocks::Init();
+
+	LoadingScreen("Loading the Game", "Setup game variables", nil);
+	CPopulation::Initialise();
+	CWorld::PlayerInFocus = 0;
+	CCoronas::Init();
+	CShadows::Init();
+	CWeaponEffects::Init();
+	CSkidmarks::Init();
+	CAntennas::Init();
+	CGlass::Init();
+	gPhoneInfo.Initialise();
+#ifdef GTA_SCENE_EDIT
+	CSceneEdit::Initialise();
+#endif
+
+	LoadingScreen("Loading the Game", "Load scripts", nil);
+	PUSH_MEMID(MEMID_SCRIPT);
+	CTheScripts::Init();
+	CGangs::Initialise();
+	POP_MEMID();
+
+	LoadingScreen("Loading the Game", "Setup game variables", nil);
+	CClock::Initialise(1000);
+	CHeli::InitHelis();
+	CCranes::InitCranes();
+	CMovingThings::Init();
+	CDarkel::Init();
+	CStats::Init();
+	CPacManPickups::Init();
+	CRubbish::Init();
+	CClouds::Init();
+	CSpecialFX::Init();
+	CRopes::Init();
+	CWaterCannons::Init();
+	CBridge::Init();
+	CGarages::Init();
+
+	LoadingScreen("Loading the Game", "Position dynamic objects", nil);
+	LoadingScreen("Loading the Game", "Initialise vehicle paths", nil);
+
+	CTrain::InitTrains();
+	CPlane::InitPlanes();
+	CCredits::Init();
+	CRecordDataForChase::Init();
+	CReplay::Init();
+
+	LoadingScreen("Loading the Game", "Start script", nil);
+#ifdef PS2_MENU
+	if ( !TheMemoryCard.m_bWantToLoad )
+#endif
+	{
+		CTheScripts::StartTestScript();
+		CTheScripts::Process();
+		TheCamera.Process();
+	}
+
+	LoadingScreen("Loading the Game", "Load scene", nil);
+	CCollision::ms_collisionInMemory = currLevel;
+	for (int i = 0; i < MAX_PADS; i++)
+		CPad::GetPad(i)->Clear(true);
+#ifdef USE_TEXTURE_POOL
+	_TexturePoolsUnknown(true);
+#endif
+
+#ifndef MASTER
+	PlayerCoords = FindPlayerCoors();
+	VarConsole.Add("X PLAYER COORD", &PlayerCoords.x, 10.0f, -10000.0f, 10000.0f, true);
+	VarConsole.Add("Y PLAYER COORD", &PlayerCoords.y, 10.0f, -10000.0f, 10000.0f, true);
+	VarConsole.Add("Z PLAYER COORD", &PlayerCoords.z, 10.0f, -10000.0f, 10000.0f, true);
+	VarConsole.Add("UPDATE PLAYER COORD", &VarUpdatePlayerCoords, true);
+#endif
+
+
+	DMAudio.SetStartingTrackPositions(true);
+	DMAudio.ChangeMusicMode(MUSICMODE_GAME);
+	return true;
+}
+
+bool CGame::ShutDown(void)
+{
+#ifdef USE_TEXTURE_POOL
+	_TexturePoolsUnknown(false);
+#endif
+	CReplay::FinishPlayback();
+	CReplay::EmptyReplayBuffer();
+	CPlane::Shutdown();
+	CTrain::Shutdown();
+	CScriptPaths::Shutdown();
+	CWaterCreatures::RemoveAll();
+	CSpecialFX::Shutdown();
+	CGarages::Shutdown();
+	CMovingThings::Shutdown();
+	gPhoneInfo.Shutdown();
+	CWeapon::ShutdownWeapons();
+	CPedType::Shutdown();
+	
+	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();
+	CHud::ReInitialise();
+	CTxdStore::RemoveTxdSlot(gameTxdSlot);
+	CMBlur::MotionBlurClose();
+	CdStreamRemoveImages();
+#ifdef USE_TEXTURE_POOL
+	_TexturePoolsFinalShutdown();
+#endif
+	return true;
+}
+
+void CGame::ReInitGameObjectVariables(void)
+{
+	CGameLogic::InitAtStartOfGame();
+#ifdef PS2_MENU
+	if ( !TheMemoryCard.m_bWantToLoad )
+#endif
+	{
+		TheCamera.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_GENERIC);
+	CStreaming::RemoveIslandsNotUsed(LEVEL_BEACH);
+	CStreaming::RemoveIslandsNotUsed(LEVEL_MAINLAND);
+	CStreaming::LoadAllRequestedModels(false);
+	currArea = AREA_MAIN_MAP;
+	CPed::Initialise();
+	CEventList::Initialise();
+#ifdef SCREEN_DROPLETS
+	ScreenDroplets::Initialise();
+#endif
+	CWeapon::InitialiseWeapons();
+	CPopulation::Initialise();
+	
+	for (int i = 0; i < NUMPLAYERS; i++)
+		CWorld::Players[i].Clear();
+	
+	CWorld::PlayerInFocus = 0;
+	CAntennas::Init();
+	CGlass::Init();
+	gPhoneInfo.Initialise();
+
+	PUSH_MEMID(MEMID_SCRIPT);
+	CTheScripts::Init();
+	CGangs::Initialise();
+	POP_MEMID();
+
+	CTimer::Initialise();
+	CClock::Initialise(1000);
+	CTheCarGenerators::Init();
+	CHeli::InitHelis();
+	CMovingThings::Init();
+	CDarkel::Init();
+	CStats::Init();
+	CPickups::Init();
+	CPacManPickups::Init();
+	CGarages::Init();
+	CSpecialFX::Init();
+	CRopes::Init();
+	CWaterCannons::Init();
+	CScriptPaths::Init();
+	CParticle::ReloadConfig();
+
+#ifdef PS2_MENU
+	if ( !TheMemoryCard.m_bWantToLoad )
+#else
+	if ( !FrontEndMenuManager.m_bWantToLoad )
+#endif
+	{
+		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)
+{
+	// Empty and unused
+}
+
+void CGame::ShutDownForRestart(void)
+{
+#ifdef USE_TEXTURE_POOL
+	_TexturePoolsUnknown(false);
+#endif
+	CReplay::FinishPlayback();
+	CReplay::EmptyReplayBuffer();
+	DMAudio.DestroyAllGameCreatedEntities();
+	CMovingThings::Shutdown();
+	
+	for (int i = 0; i < NUMPLAYERS; i++)
+		CWorld::Players[i].Clear();
+
+	CGarages::SetAllDoorsBackToOriginalHeight();
+	CTheScripts::UndoBuildingSwaps();
+	CTheScripts::UndoEntityInvisibilitySettings();
+	CWorld::ClearForRestart();
+	CGameLogic::ClearShortCut();
+	CTimer::Shutdown();
+	CStreaming::ReInit();
+	CRadar::RemoveRadarSections();
+	FrontEndMenuManager.UnloadTextures();
+	CParticleObject::RemoveAllExpireableParticleObjects();
+	CWaterCreatures::RemoveAll(); 
+	CSetPieces::Init();
+	CPedType::Shutdown();
+	CSpecialFX::Shutdown();
+}
+
+void CGame::InitialiseWhenRestarting(void)
+{
+	CRect rect(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT);
+	CRGBA color(255, 255, 255, 255);
+	
+	CTimer::Initialise();
+	CSprite2d::SetRecipNearClip();
+
+	if (b_FoundRecentSavedGameWantToLoad || FrontEndMenuManager.m_bWantToLoad)
+	{
+		LoadSplash("splash1");
+#ifndef XBOX_MESSAGE_SCREEN
+		if (FrontEndMenuManager.m_bWantToLoad)
+			FrontEndMenuManager.MessageScreen("FELD_WR", true);
+#endif
+	}
+
+	b_FoundRecentSavedGameWantToLoad = false;
+	
+	TheCamera.Init();
+	
+	if ( FrontEndMenuManager.m_bWantToLoad == true )
+	{
+#ifdef XBOX_MESSAGE_SCREEN
+		FrontEndMenuManager.SetDialogTimer(1000);
+		DoRWStuffStartOfFrame(0, 0, 0, 0, 0, 0, 0);
+		CSprite2d::InitPerFrame();
+		CFont::InitPerFrame();
+		FrontEndMenuManager.DrawOverlays();
+		DoRWStuffEndOfFrame();
+#endif
+		RestoreForStartLoad();
+	}
+	
+	ReInitGameObjectVariables();
+	
+	if ( FrontEndMenuManager.m_bWantToLoad == true )
+	{
+		FrontEndMenuManager.m_bWantToLoad = false;
+		InitRadioStationPositionList();
+		if ( GenericLoad() == true )
+		{
+			DMAudio.ResetTimers(CTimer::GetTimeInMilliseconds());
+			CTrain::InitTrains();
+			CPlane::InitPlanes();
+		}
+		else
+		{
+			for ( int32 i = 0; i < 50; i++ )
+			{
+				HandleExit();
+				FrontEndMenuManager.MessageScreen("FED_LFL", true); // Loading save game has failed. The game will restart now. 
+			}
+			
+			TheCamera.SetFadeColour(0, 0, 0);
+			ShutDownForRestart();
+			CTimer::Stop();
+			CTimer::Initialise();
+			FrontEndMenuManager.m_bWantToLoad = false;
+			ReInitGameObjectVariables();
+			currLevel = LEVEL_GENERIC;
+			CCollision::SortOutCollisionAfterLoad();
+		}
+#ifdef XBOX_MESSAGE_SCREEN
+		FrontEndMenuManager.ProcessDialogTimer();
+#endif
+	}
+	
+	CTimer::Update();
+	
+	DMAudio.ChangeMusicMode(MUSICMODE_GAME);
+#ifdef USE_TEXTURE_POOL
+	_TexturePoolsUnknown(true);
+#endif
+}
+
+void CGame::Process(void) 
+{
+	CPad::UpdatePads();
+#ifdef USE_CUSTOM_ALLOCATOR
+	ProcessTidyUpMemory();
+#endif
+#ifdef DEBUGMENU
+	DebugMenuProcess();
+#endif
+	CCutsceneMgr::Update();
+
+	if (!CCutsceneMgr::IsCutsceneProcessing() && !CTimer::GetIsCodePaused())
+		FrontEndMenuManager.Process();
+
+	CTheZones::Update();
+#ifdef SECUROM
+	if (CTimer::GetTimeInMilliseconds() >= (35 * 60 * 1000) && gameProcessPirateCheck == 0){
+		// if game not pirated
+		// gameProcessPirateCheck = 1;
+		// else
+		gameProcessPirateCheck = 2;
+	}
+#endif
+	uint32 startTime = CTimer::GetCurrentTimeInCycles() / CTimer::GetCyclesPerMillisecond();
+	CStreaming::Update();
+	uint32 processTime = CTimer::GetCurrentTimeInCycles() / CTimer::GetCyclesPerMillisecond() - startTime;
+	CWindModifiers::Number = 0;
+	if (!CTimer::GetIsPaused())
+	{
+#ifndef MASTER
+		if (VarUpdatePlayerCoords) {
+			FindPlayerPed()->Teleport(PlayerCoords);
+			VarUpdatePlayerCoords = false;
+		}
+#endif
+		CSprite2d::SetRecipNearClip();
+		CSprite2d::InitPerFrame();
+		CFont::InitPerFrame();
+		CRecordDataForGame::SaveOrRetrieveDataForThisFrame();
+		CRecordDataForChase::SaveOrRetrieveDataForThisFrame();
+		CPad::DoCheats();
+		CClock::Update();
+		CWeather::Update();
+
+		PUSH_MEMID(MEMID_SCRIPT);
+		CTheScripts::Process();
+		POP_MEMID();
+
+		CCollision::Update();
+		CScriptPaths::Update();
+		CTrain::UpdateTrains();
+		CPlane::UpdatePlanes();
+		CHeli::UpdateHelis();
+		CDarkel::Update();
+		CSkidmarks::Update();
+		CAntennas::Update();
+		CGlass::Update();
+#ifdef GTA_SCENE_EDIT
+		CSceneEdit::Update();
+#endif
+		CSetPieces::Update();
+		CEventList::Update();
+		CParticle::Update();
+		gFireManager.Update();
+		if (processTime >= 2) {
+			CPopulation::Update(false);
+		} else {
+			uint32 startTime = CTimer::GetCurrentTimeInCycles() / CTimer::GetCyclesPerMillisecond();
+			CPopulation::Update(true);
+			processTime = CTimer::GetCurrentTimeInCycles() / CTimer::GetCyclesPerMillisecond() - startTime;
+		}
+		CWeapon::UpdateWeapons();
+		if (!CCutsceneMgr::IsRunning())
+			CTheCarGenerators::Process();
+		if (!CReplay::IsPlayingBack())
+			CCranes::UpdateCranes();
+		CClouds::Update();
+		CMovingThings::Update();
+		CWaterCannons::Update();
+		CUserDisplay::Process();
+		CReplay::Update();
+
+		PUSH_MEMID(MEMID_WORLD);
+		CWorld::Process();
+		POP_MEMID();
+
+		gAccidentManager.Update();
+		CPacManPickups::Update();
+		CPickups::Update();
+		CGarages::Update();
+		CRubbish::Update();
+		CSpecialFX::Update();
+		CRopes::Update();
+		CTimeCycle::Update();
+		if (CReplay::ShouldStandardCameraBeProcessed())
+			TheCamera.Process();
+		CCullZones::Update();
+		if (!CReplay::IsPlayingBack())
+			CGameLogic::Update();
+		CBridge::Update();
+		CCoronas::DoSunAndMoon();
+		CCoronas::Update();
+		CShadows::UpdateStaticShadows();
+		CShadows::UpdatePermanentShadows();
+		gPhoneInfo.Update();
+		if (!CReplay::IsPlayingBack())
+		{
+			PUSH_MEMID(MEMID_CARS);
+			if (processTime < 2)
+				CCarCtrl::GenerateRandomCars();
+			CRoadBlocks::GenerateRoadBlocks();
+			CCarCtrl::RemoveDistantCars();
+			CCarCtrl::RemoveCarsIfThePoolGetsFull();
+			POP_MEMID();
+		}
+	}
+#ifdef GTA_PS2
+	CMemCheck::DoTest();
+#endif
+}
+
+#ifdef USE_CUSTOM_ALLOCATOR
+
+// TODO(MIAMI)
+
+int32 gNumMemMoved;
+
+bool
+MoveMem(void** ptr)
+{
+	if (*ptr) {
+		gNumMemMoved++;
+		void* newPtr = gMainHeap.MoveMemory(*ptr);
+		if (*ptr != newPtr) {
+			*ptr = newPtr;
+			return true;
+		}
+	}
+	return false;
+}
+
+// Some convenience structs
+struct SkyDataPrefix
+{
+	uint32 pktSize1;
+	uint32 data;	// pointer to data as read from TXD
+	uint32 pktSize2;
+	uint32 unused;
+};
+
+struct DMAGIFUpload
+{
+	uint32 tag1_qwc, tag1_addr;	// dmaref
+	uint32 nop1, vif_direct1;
+
+	uint32 giftag[4];
+	uint32 gs_bitbltbuf[4];
+
+	uint32 tag2_qwc, tag2_addr;	// dmaref
+	uint32 nop2, vif_direct2;
+};
+
+// This is very scary. it depends on the exact memory layout of the DMA chains and whatnot
+RwTexture*
+MoveTextureMemoryCB(RwTexture* texture, void* pData)
+{
+#ifdef GTA_PS2
+	bool* pRet = (bool*)pData;
+	RwRaster* raster = RwTextureGetRaster(texture);
+	_SkyRasterExt* rasterExt = RASTEREXTFROMRASTER(raster);
+	if (raster->originalPixels == nil ||	// the raw data
+		raster->cpPixels == raster->originalPixels ||	// old format, can't handle it
+		rasterExt->dmaRefCount != 0 && rasterExt->dmaClrCount != 0)
+		return texture;
+
+	// this is the allocated pointer we will move
+	SkyDataPrefix* prefix = (SkyDataPrefix*)raster->originalPixels;
+	DMAGIFUpload* uploads = (DMAGIFUpload*)(prefix + 1);
+
+	// We have 4qw for each upload,
+	// i.e. for each buffer width of mip levels,
+	// and the palette if there is one.
+	// NB: this code does NOT support mipmaps!
+	// so we assume two uploads (pixels and palette)
+	//
+	// each upload looks like this:
+	//    (DMAcnt; NOP; VIF DIRECT(2))
+	//     giftag (1, A+D)
+	//      GS_BITBLTBUF
+	//    (DMAref->pixel data; NOP; VIF DIRECT(5))
+	// the DMArefs are what we have to adjust
+	uintptr dataDiff, upload1Diff, upload2Diff, pixelDiff, paletteDiff;
+	dataDiff = prefix->data - (uintptr)raster->originalPixels;
+	upload1Diff = uploads[0].tag2_addr - (uintptr)raster->originalPixels;
+	if (raster->palette)
+		upload2Diff = uploads[1].tag2_addr - (uintptr)raster->originalPixels;
+	pixelDiff = (uintptr)raster->cpPixels - (uintptr)raster->originalPixels;
+	if (raster->palette)
+		paletteDiff = (uintptr)raster->palette - (uintptr)raster->originalPixels;
+	uint8* newptr = (uint8*)gMainHeap.MoveMemory(raster->originalPixels);
+	if (newptr != raster->originalPixels) {
+		// adjust everything
+		prefix->data = (uintptr)newptr + dataDiff;
+		uploads[0].tag2_addr = (uintptr)newptr + upload1Diff;
+		if (raster->palette)
+			uploads[1].tag2_addr = (uintptr)newptr + upload2Diff;
+		raster->originalPixels = newptr;
+		raster->cpPixels = newptr + pixelDiff;
+		if (raster->palette)
+			raster->palette = newptr + paletteDiff;
+
+		if (pRet) {
+			*pRet = true;
+			return nil;
+		}
+	}
+#else
+	// nothing to do here really, everything should be in videomemory
+#endif
+	return texture;
+}
+
+bool
+MoveAtomicMemory(RpAtomic* atomic, bool onlyOne)
+{
+	RpGeometry* geo = RpAtomicGetGeometry(atomic);
+
+#if THIS_IS_COMPATIBLE_WITH_GTA3_RW31
+	if (MoveMem((void**)&geo->triangles) && onlyOne)
+		return true;
+	if (MoveMem((void**)&geo->matList.materials) && onlyOne)
+		return true;
+	if (MoveMem((void**)&geo->preLitLum) && onlyOne)
+		return true;
+	if (MoveMem((void**)&geo->texCoords[0]) && onlyOne)
+		return true;
+	if (MoveMem((void**)&geo->texCoords[1]) && onlyOne)
+		return true;
+
+	// verts and normals of morph target are allocated together
+	int vertDiff;
+	if (geo->morphTarget->normals)
+		vertDiff = geo->morphTarget->normals - geo->morphTarget->verts;
+	if (MoveMem((void**)&geo->morphTarget->verts)) {
+		if (geo->morphTarget->normals)
+			geo->morphTarget->normals = geo->morphTarget->verts + vertDiff;
+		if (onlyOne)
+			return true;
+	}
+
+	RpMeshHeader* oldmesh = geo->mesh;
+	if (MoveMem((void**)&geo->mesh)) {
+		// index pointers are allocated together with meshes,
+		// have to relocate those too
+		RpMesh* mesh = (RpMesh*)(geo->mesh + 1);
+		uintptr reloc = (uintptr)geo->mesh - (uintptr)oldmesh;
+		for (int i = 0; i < geo->mesh->numMeshes; i++)
+			mesh[i].indices = (RxVertexIndex*)((uintptr)mesh[i].indices + reloc);
+		if (onlyOne)
+			return true;
+	}
+#else
+	// we could do something in librw here
+#endif
+	return false;
+}
+
+bool
+MoveColModelMemory(CColModel& colModel, bool onlyOne)
+{
+#if GTA_VERSION >= GTA3_PS2_160
+	// hm...should probably only do this if ownsCollisionVolumes
+	// but it doesn't exist on PS2...
+	if (!colModel.ownsCollisionVolumes)
+		return false;
+#endif
+
+	if (MoveMem((void**)&colModel.spheres) && onlyOne)
+		return true;
+	if (MoveMem((void**)&colModel.lines) && onlyOne)
+		return true;
+	if (MoveMem((void**)&colModel.boxes) && onlyOne)
+		return true;
+	if (MoveMem((void**)&colModel.vertices) && onlyOne)
+		return true;
+	if (MoveMem((void**)&colModel.triangles) && onlyOne)
+		return true;
+	if (MoveMem((void**)&colModel.trianglePlanes) && onlyOne)
+		return true;
+	return false;
+}
+
+RpAtomic*
+MoveAtomicMemoryCB(RpAtomic* atomic, void* pData)
+{
+	bool* pRet = (bool*)pData;
+	if (pRet == nil)
+		MoveAtomicMemory(atomic, false);
+	else if (MoveAtomicMemory(atomic, true)) {
+		*pRet = true;
+		return nil;
+	}
+	return atomic;
+}
+
+bool
+TidyUpModelInfo(CBaseModelInfo* modelInfo, bool onlyone)
+{
+	if (modelInfo->GetColModel() && modelInfo->DoesOwnColModel())
+		if (MoveColModelMemory(*modelInfo->GetColModel(), onlyone))
+			return true;
+
+	RwObject* rwobj = modelInfo->GetRwObject();
+	if (RwObjectGetType(rwobj) == rpATOMIC)
+		if (MoveAtomicMemory((RpAtomic*)rwobj, onlyone))
+			return true;
+	if (RwObjectGetType(rwobj) == rpCLUMP) {
+		bool ret = false;
+		if (onlyone)
+			RpClumpForAllAtomics((RpClump*)rwobj, MoveAtomicMemoryCB, &ret);
+		else
+			RpClumpForAllAtomics((RpClump*)rwobj, MoveAtomicMemoryCB, nil);
+		if (ret)
+			return true;
+	}
+
+	if (modelInfo->GetModelType() == MITYPE_PED && ((CPedModelInfo*)modelInfo)->m_hitColModel)
+		if (MoveColModelMemory(*((CPedModelInfo*)modelInfo)->m_hitColModel, onlyone))
+			return true;
+
+	return false;
+}
+#endif
+
+
+void CGame::DrasticTidyUpMemory(bool flushDraw)
+{
+#ifdef USE_CUSTOM_ALLOCATOR
+	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 moveTextures, bool flushDraw)
+{
+#ifdef USE_CUSTOM_ALLOCATOR
+	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
+	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
+}
+
+void
+CGame::InitAfterFocusLoss()
+{
+	FrontEndMenuManager.m_nPrefsAudio3DProviderIndex = FrontEndMenuManager.m_lastWorking3DAudioProvider;
+	DMAudio.SetCurrent3DProvider(FrontEndMenuManager.m_lastWorking3DAudioProvider);
+
+	if (!FrontEndMenuManager.m_bGameNotLoaded && !FrontEndMenuManager.m_bMenuActive)
+		FrontEndMenuManager.m_bStartUpFrontEndRequested = true;
+}
+
+bool
+CGame::CanSeeWaterFromCurrArea(void)
+{
+	return currArea == AREA_MAIN_MAP || currArea == AREA_MANSION
+		|| currArea == AREA_HOTEL;
+}
+
+bool
+CGame::CanSeeOutSideFromCurrArea(void)
+{
+	return currArea == AREA_MAIN_MAP || currArea == AREA_MALL ||
+		currArea == AREA_MANSION || currArea == AREA_HOTEL;
+}
diff --git a/src/core/Game.h b/src/core/Game.h
new file mode 100644
index 0000000..4052eb0
--- /dev/null
+++ b/src/core/Game.h
@@ -0,0 +1,81 @@
+#pragma once
+
+enum eLevelName {
+	LEVEL_IGNORE = -1, // beware, this is only used in CPhysical's m_nZoneLevel
+	LEVEL_GENERIC = 0,
+	LEVEL_BEACH,
+	LEVEL_MAINLAND,
+
+	NUM_LEVELS
+};
+
+enum eAreaName {
+	AREA_MAIN_MAP,
+	AREA_HOTEL,
+	AREA_MANSION,
+	AREA_BANK,
+	AREA_MALL,
+	AREA_STRIP_CLUB,
+	AREA_LAWYERS,
+	AREA_COFFEE_SHOP,
+	AREA_CONCERT_HALL,
+	AREA_STUDIO,
+	AREA_RIFLE_RANGE,
+	AREA_BIKER_BAR,
+	AREA_POLICE_STATION,
+	AREA_EVERYWHERE,
+	AREA_DIRT,
+	AREA_BLOOD,
+	AREA_OVALRING,
+	AREA_MALIBU_CLUB,
+	AREA_PRINT_WORKS
+};
+
+class CGame
+{
+public:
+	static eLevelName currLevel;
+	static int32 currArea;
+	static bool bDemoMode;
+	static bool nastyGame;
+	static bool frenchGame;
+	static bool germanGame;
+#ifdef MORE_LANGUAGES
+	static bool russianGame;
+	static bool japaneseGame;
+#endif
+	static bool noProstitutes;
+	static bool playingIntro;
+	static char aDatFile[32];
+
+#ifndef MASTER
+	static CVector PlayerCoords;
+	static bool8 VarUpdatePlayerCoords;
+#endif
+
+	static bool InitialiseOnceBeforeRW(void);
+	static bool InitialiseRenderWare(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 InitAfterFocusLoss(void);
+
+	static bool IsInInterior(void) { return currArea != AREA_MAIN_MAP; }
+	static bool CanSeeWaterFromCurrArea(void);
+	static bool CanSeeOutSideFromCurrArea(void);
+	
+	// NB: these do something on PS2
+	static void TidyUpMemory(bool, bool);
+	static void DrasticTidyUpMemory(bool);
+	static void ProcessTidyUpMemory(void);
+};
+
+inline bool IsAreaVisible(int area) { return area == CGame::currArea || area == AREA_EVERYWHERE; }
diff --git a/src/core/General.h b/src/core/General.h
new file mode 100644
index 0000000..2f205c3
--- /dev/null
+++ b/src/core/General.h
@@ -0,0 +1,171 @@
+#pragma once
+
+#include <ctype.h>
+
+class CGeneral
+{
+public:
+	static float GetATanOfXY(float x, float y){
+		if(x == 0.0f && y == 0.0f)
+			return 0.0f;
+		float xabs = Abs(x);
+		float yabs = Abs(y);
+
+		if(xabs < yabs){
+			if(y > 0.0f){
+				if(x > 0.0f)
+					return 0.5f*PI - Atan2(x / y, 1.0f);
+				else
+					return 0.5f*PI + Atan2(-x / y, 1.0f);
+			}else{
+				if(x > 0.0f)
+					return 1.5f*PI + Atan2(x / -y, 1.0f);
+				else
+					return 1.5f*PI - Atan2(-x / -y, 1.0f);
+			}
+		}else{
+			if(y > 0.0f){
+				if(x > 0.0f)
+					return Atan2(y / x, 1.0f);
+				else
+					return PI - Atan2(y / -x, 1.0f);
+			}else{
+				if(x > 0.0f)
+					return 2.0f*PI - Atan2(-y / x, 1.0f);
+				else
+					return PI + Atan2(-y / -x, 1.0f);
+			}
+		}
+	}
+
+	static float LimitAngle(float angle)
+	{
+		float result = angle;
+
+		while (result >= 180.0f) {
+			result -= 2 * 180.0f;
+		}
+
+		while (result < -180.0f) {
+			result += 2 * 180.0f;
+		}
+
+		return result;
+	}
+
+
+	static float LimitRadianAngle(float angle)
+	{
+		float result = clamp(angle, -25.0f, 25.0f);
+
+		while (result >= PI) {
+			result -= 2 * PI;
+		}
+
+		while (result < -PI) {
+			result += 2 * PI;
+		}
+	
+		return result;
+	}
+
+	// Returns an angle such that x2/y2 looks at x1/y1 with its forward vector if rotated by that angle
+	static float GetRadianAngleBetweenPoints(float x1, float y1, float x2, float y2)
+	{
+		float x = x2 - x1;
+		float y = y2 - y1;
+
+		if (y == 0.0f)
+			y = 0.0001f;
+
+		if (x > 0.0f) {
+			if (y > 0.0f)
+				return PI - Atan2(x / y, 1.0f);
+			else
+				return -Atan2(x / y, 1.0f);
+		} else {
+			if (y > 0.0f)
+				return -(PI + Atan2(x / y, 1.0f));
+			else
+				return -Atan2(x / y, 1.0f);
+		}
+	}
+	
+	static float GetAngleBetweenPoints(float x1, float y1, float x2, float y2)
+	{
+		return RADTODEG(GetRadianAngleBetweenPoints(x1, y1, x2, y2));
+	}
+
+	// should return direction in 0-8 range. fits perfectly to peds' path directions.
+	static int GetNodeHeadingFromVector(float x, float y)
+	{
+		float angle = CGeneral::GetRadianAngleBetweenPoints(x, y, 0.0f, 0.0f);
+		if (angle < 0.0f)
+			angle += TWOPI;
+
+		angle = DEGTORAD(22.5f) + TWOPI - angle;
+
+		if (angle >= TWOPI)
+			angle -= TWOPI;
+
+		return (int)Floor(angle / DEGTORAD(45.0f));
+	}
+
+	// Unlike usual string comparison functions, these don't care about greater or lesser
+	static bool faststrcmp(const char *str1, const char *str2)
+	{
+		for (; *str1; str1++, str2++) {
+			if (*str1 != *str2)
+				return true;
+		}
+		return *str2 != '\0';
+	}
+
+	static bool faststrncmp(const char *str1, const char *str2, uint32 count)
+	{
+		for(uint32 i = 0; *str1 && i < count; str1++, str2++, i++) {
+			if (*str1 != *str2)
+				return true;
+		}
+		return false;
+	}
+
+	static bool faststricmp(const char *str1, const char *str2)
+	{
+		for (; *str1; str1++, str2++) {
+#ifndef ASCII_STRCMP
+			if (toupper(*str1) != toupper(*str2))
+#else
+			if (__ascii_toupper(*str1) != __ascii_toupper(*str2))
+#endif
+				return true;
+		}
+		return *str2 != '\0';
+	}
+
+	static bool SolveQuadratic(float a, float b, float c, float &root1, float &root2)
+	{
+		float discriminant = b * b - 4.f * a * c;
+		if (discriminant < 0.f)
+			return false;
+
+		float discriminantSqrt = Sqrt(discriminant);
+		root2 = (-b + discriminantSqrt) / (2.f * a);
+		root1 = (-b - discriminantSqrt) / (2.f * a);
+		return true;
+	}
+
+	// not too sure about all these...
+	static uint16 GetRandomNumber(void)
+		{ return myrand() & MYRAND_MAX; }
+	static bool GetRandomTrueFalse(void)
+		{ return GetRandomNumber() < MYRAND_MAX / 2; }
+	// Probably don't want to ever reach high
+	static float GetRandomNumberInRange(float low, float high)
+		{ return low + (high - low)*(GetRandomNumber()/float(MYRAND_MAX + 1)); }
+		
+	static int32 GetRandomNumberInRange(int32 low, int32 high)
+		{ return low + (high - low)*(GetRandomNumber()/float(MYRAND_MAX + 1)); }
+	static void SetRandomSeed(int32 seed)
+		{ mysrand(seed); }
+};
diff --git a/src/core/IniFile.cpp b/src/core/IniFile.cpp
new file mode 100644
index 0000000..b903353
--- /dev/null
+++ b/src/core/IniFile.cpp
@@ -0,0 +1,29 @@
+#include "common.h"
+
+#include "IniFile.h"
+
+#include "CarCtrl.h"
+#include "FileMgr.h"
+#include "main.h"
+#include "Population.h"
+
+float CIniFile::PedNumberMultiplier = 0.6f;
+float CIniFile::CarNumberMultiplier = 0.6f;
+
+void CIniFile::LoadIniFile()
+{
+	CFileMgr::SetDir("");
+	int f = CFileMgr::OpenFile("gta3.ini", "r");
+	if (f){
+		CFileMgr::ReadLine(f, gString, 200);
+		sscanf(gString, "%f", &PedNumberMultiplier);
+		PedNumberMultiplier = Min(3.0f, Max(0.5f, PedNumberMultiplier));
+		CFileMgr::ReadLine(f, gString, 200);
+		sscanf(gString, "%f", &CarNumberMultiplier);
+		CarNumberMultiplier = Min(3.0f, Max(0.5f, CarNumberMultiplier));
+		CFileMgr::CloseFile(f);
+	}
+	CPopulation::MaxNumberOfPedsInUse = 25.0f * PedNumberMultiplier;
+	CPopulation::MaxNumberOfPedsInUseInterior = 40.0f * PedNumberMultiplier;
+	CCarCtrl::MaxNumberOfCarsInUse = 12.0f * CarNumberMultiplier;
+}
\ No newline at end of file
diff --git a/src/core/IniFile.h b/src/core/IniFile.h
new file mode 100644
index 0000000..1e30c4d
--- /dev/null
+++ b/src/core/IniFile.h
@@ -0,0 +1,10 @@
+#pragma once
+
+class CIniFile
+{
+public:
+	static void LoadIniFile();
+
+	static float PedNumberMultiplier;
+	static float CarNumberMultiplier;
+};
diff --git a/src/core/Lists.cpp b/src/core/Lists.cpp
new file mode 100644
index 0000000..448a0ff
--- /dev/null
+++ b/src/core/Lists.cpp
@@ -0,0 +1,26 @@
+#include "common.h"
+#include "Pools.h"
+#include "Lists.h"
+
+void*
+CPtrNode::operator new(size_t){
+	CPtrNode *node = CPools::GetPtrNodePool()->New();
+	assert(node);
+	return node;
+}
+
+void
+CPtrNode::operator delete(void *p, size_t){
+	CPools::GetPtrNodePool()->Delete((CPtrNode*)p);
+}
+
+void*
+CEntryInfoNode::operator new(size_t){
+	CEntryInfoNode *node = CPools::GetEntryInfoNodePool()->New();
+	assert(node);
+	return node;
+}
+void
+CEntryInfoNode::operator delete(void *p, size_t){
+	CPools::GetEntryInfoNodePool()->Delete((CEntryInfoNode*)p);
+}
diff --git a/src/core/Lists.h b/src/core/Lists.h
new file mode 100644
index 0000000..7572e88
--- /dev/null
+++ b/src/core/Lists.h
@@ -0,0 +1,130 @@
+#pragma once
+
+class CPtrNode
+{
+public:
+	void *item;
+	CPtrNode *prev;
+	CPtrNode *next;
+
+	void *operator new(size_t);
+	void operator delete(void *p, size_t);
+};
+
+class CPtrList
+{
+public:
+	CPtrNode *first;
+
+	CPtrList(void) { first = nil; }
+	~CPtrList(void) { Flush(); }
+	CPtrNode *FindItem(void *item){
+		CPtrNode *node;
+		for(node = first; node; node = node->next)
+			if(node->item == item)
+				return node;
+		return nil;
+	}
+	CPtrNode *InsertNode(CPtrNode *node){
+		node->prev = nil;
+		node->next = first;
+		if(first)
+			first->prev = node;
+		first = node;
+		return node;
+	}
+	CPtrNode *InsertItem(void *item){
+		CPtrNode *node = new CPtrNode;
+		node->item = item;
+		InsertNode(node);
+		return node;
+	}
+	void RemoveNode(CPtrNode *node){
+		if(node == first)
+			first = node->next;
+		if(node->prev)
+			node->prev->next = node->next;
+		if(node->next)
+			node->next->prev = node->prev;
+	}
+	void DeleteNode(CPtrNode *node){
+		RemoveNode(node);
+		delete node;
+	}
+	void RemoveItem(void *item){
+		CPtrNode *node, *next;
+		for(node = first; node; node = next){
+			next = node->next;
+			if(node->item == item)
+				DeleteNode(node);
+		}
+	}
+	void Flush(void){
+		CPtrNode *node, *next;
+		for(node = first; node; node = next){
+			next = node->next;
+			DeleteNode(node);
+		}
+	}
+};
+
+class CSector;
+
+// This records in which sector list a Physical is
+class CEntryInfoNode
+{
+public:
+	CPtrList *list;		// list in sector
+	CPtrNode *listnode;	// node in list
+	CSector *sector;
+
+	CEntryInfoNode *prev;
+	CEntryInfoNode *next;
+
+	void *operator new(size_t);
+	void operator delete(void *p, size_t);
+};
+
+class CEntryInfoList
+{
+public:
+	CEntryInfoNode *first;
+
+	CEntryInfoList(void) { first = nil; }
+	~CEntryInfoList(void) { Flush(); }
+	CEntryInfoNode *InsertNode(CEntryInfoNode *node){
+		node->prev = nil;
+		node->next = first;
+		if(first)
+			first->prev = node;
+		first = node;
+		return node;
+	}
+	CEntryInfoNode *InsertItem(CPtrList *list, CPtrNode *listnode, CSector *sect){
+		CEntryInfoNode *node = new CEntryInfoNode;
+		node->list = list;
+		node->listnode = listnode;
+		node->sector = sect;
+		InsertNode(node);
+		return node;
+	}
+	void RemoveNode(CEntryInfoNode *node){
+		if(node == first)
+			first = node->next;
+		if(node->prev)
+			node->prev->next = node->next;
+		if(node->next)
+			node->next->prev = node->prev;
+	}
+	void DeleteNode(CEntryInfoNode *node){
+		RemoveNode(node);
+		delete node;
+	}
+	void Flush(void){
+		CEntryInfoNode *node, *next;
+		for(node = first; node; node = next){
+			next = node->next;
+			DeleteNode(node);
+		}
+	}
+};
diff --git a/src/core/MenuScreens.cpp b/src/core/MenuScreens.cpp
new file mode 100644
index 0000000..2048438
--- /dev/null
+++ b/src/core/MenuScreens.cpp
@@ -0,0 +1,337 @@
+#include "common.h"
+#include "Frontend.h"
+#ifdef PC_MENU
+
+// Please don't touch this file, except for bug fixing or ports.
+// Check MenuScreensCustom.cpp
+
+#ifndef CUSTOM_FRONTEND_OPTIONS
+CMenuScreen aScreens[] = {
+	// MENUPAGE_STATS = 0
+	{ "FEH_STA", MENUPAGE_NONE, 3,
+		MENUACTION_GOBACK, "FEDS_TB", SAVESLOT_NONE, MENUPAGE_NONE, 190, 320, MENUALIGN_RIGHT,
+	},
+
+	// MENUPAGE_NEW_GAME = 1
+	{ "FEP_STG", MENUPAGE_NONE, 1,
+		MENUACTION_CHANGEMENU, "FES_NGA", SAVESLOT_NONE, MENUPAGE_NEW_GAME_RELOAD, 320, 155, MENUALIGN_CENTER,
+		MENUACTION_CHANGEMENU, "FES_LOA",  SAVESLOT_NONE, MENUPAGE_CHOOSE_LOAD_SLOT, 0, 0, MENUALIGN_CENTER,
+		MENUACTION_CHANGEMENU, "FES_DEL", SAVESLOT_NONE, MENUPAGE_CHOOSE_DELETE_SLOT, 0, 0, MENUALIGN_CENTER,
+		MENUACTION_GOBACK, "FEDS_TB", SAVESLOT_NONE, 0, 0, 0, MENUALIGN_CENTER,
+	},
+
+	// MENUPAGE_BRIEFS = 2
+	{ "FEH_BRI", MENUPAGE_NONE, 4,
+		MENUACTION_GOBACK, "FEDS_TB", SAVESLOT_NONE, MENUPAGE_NONE, 190, 320, MENUALIGN_RIGHT,
+	},
+
+	// MENUPAGE_SOUND_SETTINGS = 3
+	{ "FEH_AUD", MENUPAGE_OPTIONS, 1,
+		MENUACTION_MUSICVOLUME,		"FEA_MUS", SAVESLOT_NONE, MENUPAGE_SOUND_SETTINGS, 40, 76, MENUALIGN_LEFT,
+		MENUACTION_SFXVOLUME,		"FEA_SFX", SAVESLOT_NONE, MENUPAGE_SOUND_SETTINGS, 0, 0, MENUALIGN_LEFT,
+		MENUACTION_MP3VOLUMEBOOST,	"FEA_MPB", SAVESLOT_NONE, MENUPAGE_SOUND_SETTINGS, 0, 0, MENUALIGN_LEFT,
+		MENUACTION_AUDIOHW,			"FEA_3DH", SAVESLOT_NONE, MENUPAGE_SOUND_SETTINGS, 0, 0, MENUALIGN_LEFT,
+		MENUACTION_SPEAKERCONF,		"FEA_SPK", SAVESLOT_NONE, MENUPAGE_SOUND_SETTINGS, 0, 0, MENUALIGN_LEFT,
+		MENUACTION_DYNAMICACOUSTIC,	"FET_DAM", SAVESLOT_NONE, MENUPAGE_SOUND_SETTINGS, 0, 0, MENUALIGN_LEFT,
+		MENUACTION_RADIO,			"FEA_RSS", SAVESLOT_NONE, MENUPAGE_SOUND_SETTINGS, 0, 0, MENUALIGN_LEFT,
+		MENUACTION_RESTOREDEF,		"FET_DEF", SAVESLOT_NONE, MENUPAGE_SOUND_SETTINGS, 320, 367, MENUALIGN_CENTER,
+		MENUACTION_GOBACK,			"FEDS_TB", SAVESLOT_NONE, MENUPAGE_NONE, 0, 0, MENUALIGN_CENTER,
+	},
+
+	// MENUPAGE_DISPLAY_SETTINGS = 4
+#ifdef LEGACY_MENU_OPTIONS
+	#define Y_OFFSET 50
+#else
+	#define Y_OFFSET 0
+#endif
+
+	{ "FEH_DIS", MENUPAGE_OPTIONS, 2,
+		MENUACTION_BRIGHTNESS,	"FED_BRI", SAVESLOT_NONE, MENUPAGE_DISPLAY_SETTINGS, 40, 78, MENUALIGN_LEFT,
+		MENUACTION_DRAWDIST,	"FEM_LOD", SAVESLOT_NONE, MENUPAGE_DISPLAY_SETTINGS, 40, 103, MENUALIGN_LEFT,
+#ifdef LEGACY_MENU_OPTIONS
+		MENUACTION_FRAMESYNC,	"FEM_VSC", SAVESLOT_NONE, MENUPAGE_DISPLAY_SETTINGS, 40, 128, MENUALIGN_LEFT,
+#endif
+		MENUACTION_FRAMELIMIT,	"FEM_FRM", SAVESLOT_NONE, MENUPAGE_DISPLAY_SETTINGS, 40, 128 + Y_OFFSET/2, MENUALIGN_LEFT,
+#ifdef LEGACY_MENU_OPTIONS
+		MENUACTION_TRAILS,		"FED_TRA", SAVESLOT_NONE, MENUPAGE_DISPLAY_SETTINGS, 40, 178, MENUALIGN_LEFT,
+#endif
+		MENUACTION_SUBTITLES,	"FED_SUB", SAVESLOT_NONE, MENUPAGE_DISPLAY_SETTINGS, 40, 153 + Y_OFFSET, MENUALIGN_LEFT,
+		MENUACTION_WIDESCREEN,	"FED_WIS", SAVESLOT_NONE, MENUPAGE_DISPLAY_SETTINGS, 40, 178 + Y_OFFSET, MENUALIGN_LEFT,
+		MENUACTION_LEGENDS,		"MAP_LEG", SAVESLOT_NONE, MENUPAGE_DISPLAY_SETTINGS, 40, 202 + Y_OFFSET, MENUALIGN_LEFT,
+		MENUACTION_RADARMODE,	"FED_RDR", SAVESLOT_NONE, MENUPAGE_DISPLAY_SETTINGS, 40, 228 + Y_OFFSET, MENUALIGN_LEFT,
+		MENUACTION_HUD,			"FED_HUD", SAVESLOT_NONE, MENUPAGE_DISPLAY_SETTINGS, 40, 253 + Y_OFFSET, MENUALIGN_LEFT,
+		MENUACTION_SCREENRES,	"FED_RES", SAVESLOT_NONE, MENUPAGE_DISPLAY_SETTINGS, 40, 278 + Y_OFFSET, MENUALIGN_LEFT,
+		MENUACTION_RESTOREDEF,	"FET_DEF", SAVESLOT_NONE, MENUPAGE_DISPLAY_SETTINGS, 320, 303 + Y_OFFSET, MENUALIGN_CENTER,
+		MENUACTION_GOBACK,		"FEDS_TB", SAVESLOT_NONE, MENUPAGE_NONE, 320, 328 + Y_OFFSET, MENUALIGN_CENTER,
+	},
+
+#undef Y_OFFSET
+
+	// MENUPAGE_LANGUAGE_SETTINGS = 5
+	{ "FEH_LAN", MENUPAGE_OPTIONS, 3,
+		MENUACTION_LANG_ENG,	"FEL_ENG", SAVESLOT_NONE, MENUPAGE_LANGUAGE_SETTINGS, 320, 132, MENUALIGN_CENTER,
+		MENUACTION_LANG_FRE,	"FEL_FRE", SAVESLOT_NONE, MENUPAGE_LANGUAGE_SETTINGS, 0, 0, MENUALIGN_CENTER,
+		MENUACTION_LANG_GER,	"FEL_GER", SAVESLOT_NONE, MENUPAGE_LANGUAGE_SETTINGS, 0, 0, MENUALIGN_CENTER,
+		MENUACTION_LANG_ITA,	"FEL_ITA", SAVESLOT_NONE, MENUPAGE_LANGUAGE_SETTINGS, 0, 0, MENUALIGN_CENTER,
+		MENUACTION_LANG_SPA,    "FEL_SPA", SAVESLOT_NONE, MENUPAGE_LANGUAGE_SETTINGS, 0, 0, MENUALIGN_CENTER,
+		MENUACTION_GOBACK,		"FEDS_TB", SAVESLOT_NONE, MENUPAGE_NONE, 0, 0, MENUALIGN_CENTER,
+	},
+
+	// MENUPAGE_MAP = 6
+	{ "FEH_MAP", MENUPAGE_NONE, 2,
+		 MENUACTION_GOBACK,	"FEDS_TB", SAVESLOT_NONE, MENUPAGE_NONE, 70, 380, MENUALIGN_CENTER,
+	},
+
+	// MENUPAGE_NEW_GAME_RELOAD = 7
+	{ "FES_NGA", MENUPAGE_NEW_GAME, 0,
+		MENUACTION_LABEL,		"FESZ_QR",	SAVESLOT_NONE,	0, 0, 0, 0,
+		MENUACTION_NO,			"FEM_NO",	SAVESLOT_NONE,	MENUPAGE_NEW_GAME, 320, 200, MENUALIGN_CENTER,
+		MENUACTION_NEWGAME,		"FEM_YES",	SAVESLOT_NONE,	MENUPAGE_NEW_GAME_RELOAD, 320, 225, MENUALIGN_CENTER,
+	},
+
+	// MENUPAGE_CHOOSE_LOAD_SLOT = 8
+	{ "FET_LG", MENUPAGE_NEW_GAME, 1,
+		MENUACTION_CHECKSAVE,	"FEM_SL1", SAVESLOT_1,		0, 40, 90, MENUALIGN_LEFT,
+		MENUACTION_CHECKSAVE,	"FEM_SL2", SAVESLOT_2,		0, 0, 0, MENUALIGN_LEFT,
+		MENUACTION_CHECKSAVE,	"FEM_SL3", SAVESLOT_3,		0, 0, 0, MENUALIGN_LEFT,
+		MENUACTION_CHECKSAVE,	"FEM_SL4", SAVESLOT_4,		0, 0, 0, MENUALIGN_LEFT,
+		MENUACTION_CHECKSAVE,	"FEM_SL5", SAVESLOT_5,		0, 0, 0, MENUALIGN_LEFT,
+		MENUACTION_CHECKSAVE,	"FEM_SL6", SAVESLOT_6,		0, 0, 0, MENUALIGN_LEFT,
+		MENUACTION_CHECKSAVE,	"FEM_SL7", SAVESLOT_7,		0, 0, 0, MENUALIGN_LEFT,
+		MENUACTION_CHECKSAVE,	"FEM_SL8", SAVESLOT_8,		0, 0, 0, MENUALIGN_LEFT,
+		MENUACTION_GOBACK,		"FEDS_TB", SAVESLOT_NONE,	0, 320, 345, MENUALIGN_CENTER,
+	},
+
+	// MENUPAGE_CHOOSE_DELETE_SLOT = 9
+	{ "FES_DEL", MENUPAGE_NEW_GAME, 2,
+		MENUACTION_CHECKSAVE,	"FEM_SL1",	SAVESLOT_1,		0, 40, 90, MENUALIGN_LEFT,
+		MENUACTION_CHECKSAVE,	"FEM_SL2",	SAVESLOT_2,		0, 0, 0, MENUALIGN_LEFT,
+		MENUACTION_CHECKSAVE,	"FEM_SL3",	SAVESLOT_3,		0, 0, 0, MENUALIGN_LEFT,
+		MENUACTION_CHECKSAVE,	"FEM_SL4",	SAVESLOT_4,		0, 0, 0, MENUALIGN_LEFT,
+		MENUACTION_CHECKSAVE,	"FEM_SL5",	SAVESLOT_5,		0, 0, 0, MENUALIGN_LEFT,
+		MENUACTION_CHECKSAVE,	"FEM_SL6",	SAVESLOT_6,		0, 0, 0, MENUALIGN_LEFT,
+		MENUACTION_CHECKSAVE,	"FEM_SL7",	SAVESLOT_7,		0, 0, 0, MENUALIGN_LEFT,
+		MENUACTION_CHECKSAVE,	"FEM_SL8",	SAVESLOT_8,		0, 0, 0, MENUALIGN_LEFT,
+		MENUACTION_GOBACK,		"FEDS_TB",	SAVESLOT_NONE,	0, 320, 345, MENUALIGN_CENTER,
+	},
+
+	// MENUPAGE_LOAD_SLOT_CONFIRM = 10
+	{ "FET_LG", MENUPAGE_CHOOSE_LOAD_SLOT, 0,
+		 MENUACTION_LABEL,		"FESZ_QL",	SAVESLOT_NONE,	0, 0, 0, 0,
+		 MENUACTION_NO,			"FEM_NO",	SAVESLOT_NONE,	MENUPAGE_CHOOSE_LOAD_SLOT, 320, 200, MENUALIGN_CENTER,
+		 MENUACTION_YES,		"FEM_YES",	SAVESLOT_NONE,	MENUPAGE_LOADING_IN_PROGRESS, 320, 225, MENUALIGN_CENTER,
+	},
+
+	// MENUPAGE_DELETE_SLOT_CONFIRM = 11
+	{ "FES_DEL", MENUPAGE_CHOOSE_DELETE_SLOT, 0,
+		 MENUACTION_LABEL,		"FESZ_QD",	SAVESLOT_NONE,  MENUPAGE_NONE, 0, 0, 0,
+		 MENUACTION_NO,			"FEM_NO",	SAVESLOT_NONE,  MENUPAGE_CHOOSE_DELETE_SLOT, 320, 200, MENUALIGN_CENTER,
+		 MENUACTION_YES,		"FEM_YES",	SAVESLOT_NONE,	MENUPAGE_DELETING_IN_PROGRESS, 320, 225, MENUALIGN_CENTER,
+	},
+
+	// MENUPAGE_LOADING_IN_PROGRESS = 12
+	{ "FET_LG", MENUPAGE_CHOOSE_LOAD_SLOT, 0,
+	},
+
+	// MENUPAGE_DELETING_IN_PROGRESS = 13
+	{ "FES_DEL", MENUPAGE_CHOOSE_DELETE_SLOT, 0,
+	},
+
+	// MENUPAGE_DELETE_SUCCESSFUL = 14
+	{ "FES_DEL", MENUPAGE_NEW_GAME, 0,
+		 MENUACTION_LABEL,		"FES_DSC",	SAVESLOT_NONE,	0, 0, 0, 0,
+		 MENUACTION_CHANGEMENU,	"FEM_OK",	SAVESLOT_NONE,	MENUPAGE_NEW_GAME, 320, 225, MENUALIGN_CENTER,
+	},
+
+	// MENUPAGE_CHOOSE_SAVE_SLOT = 15
+	{ "FET_SG", MENUPAGE_DISABLED, 0,
+		MENUACTION_SAVEGAME,			"FEM_SL1", SAVESLOT_1,		MENUPAGE_SAVE_OVERWRITE_CONFIRM, 40, 90, MENUALIGN_LEFT,
+		MENUACTION_SAVEGAME,			"FEM_SL2", SAVESLOT_2,		MENUPAGE_SAVE_OVERWRITE_CONFIRM, 0, 0, MENUALIGN_LEFT,
+		MENUACTION_SAVEGAME,			"FEM_SL3", SAVESLOT_3,		MENUPAGE_SAVE_OVERWRITE_CONFIRM, 0, 0, MENUALIGN_LEFT,
+		MENUACTION_SAVEGAME,			"FEM_SL4", SAVESLOT_4,		MENUPAGE_SAVE_OVERWRITE_CONFIRM, 0, 0, MENUALIGN_LEFT,
+		MENUACTION_SAVEGAME,			"FEM_SL5", SAVESLOT_5,		MENUPAGE_SAVE_OVERWRITE_CONFIRM, 0, 0, MENUALIGN_LEFT,
+		MENUACTION_SAVEGAME,			"FEM_SL6", SAVESLOT_6,		MENUPAGE_SAVE_OVERWRITE_CONFIRM, 0, 0, MENUALIGN_LEFT,
+		MENUACTION_SAVEGAME,			"FEM_SL7", SAVESLOT_7,		MENUPAGE_SAVE_OVERWRITE_CONFIRM, 0, 0, MENUALIGN_LEFT,
+		MENUACTION_SAVEGAME,			"FEM_SL8", SAVESLOT_8,		MENUPAGE_SAVE_OVERWRITE_CONFIRM, 0, 0, MENUALIGN_LEFT,
+		MENUACTION_RESUME_FROM_SAVEZONE,"FESZ_CA", SAVESLOT_NONE,	0, 320, 345, MENUALIGN_CENTER,
+	},
+
+	// MENUPAGE_SAVE_OVERWRITE_CONFIRM = 16
+	{ "FET_SG", MENUPAGE_CHOOSE_SAVE_SLOT, 0,
+		MENUACTION_LABEL,		"FESZ_QZ", SAVESLOT_NONE, MENUPAGE_NONE, 0, 0, 0,
+		MENUACTION_NO,			"FEM_NO", SAVESLOT_NONE, MENUPAGE_CHOOSE_SAVE_SLOT, 320, 200, MENUALIGN_CENTER,
+		MENUACTION_YES,			"FEM_YES",  SAVESLOT_NONE, MENUPAGE_SAVING_IN_PROGRESS, 320, 225, MENUALIGN_CENTER,
+	},
+
+	// MENUPAGE_SAVING_IN_PROGRESS = 17
+	{ "FET_SG", MENUPAGE_CHOOSE_SAVE_SLOT, 0,
+	},
+
+	// MENUPAGE_SAVE_SUCCESSFUL = 18
+	{ "FET_SG", MENUPAGE_CHOOSE_SAVE_SLOT, 0,
+		MENUACTION_LABEL,					"FES_SSC",	SAVESLOT_LABEL,	MENUPAGE_NONE, 0, 0, 0,
+		MENUACTION_RESUME_FROM_SAVEZONE,	"FEM_OK",	SAVESLOT_NONE,	MENUPAGE_CHOOSE_SAVE_SLOT, 320, 225, MENUALIGN_CENTER,
+	},
+
+	// MENUPAGE_SAVE_CUSTOM_WARNING = 19
+	{ "FET_SG", MENUPAGE_NONE, 0,
+		MENUACTION_LABEL,		"",			SAVESLOT_NONE, 0, 0, 0, 0,
+		MENUACTION_CHANGEMENU,	"FEM_OK",	SAVESLOT_NONE, MENUPAGE_CHOOSE_SAVE_SLOT, 320, 225, MENUALIGN_CENTER,
+	},
+
+	// MENUPAGE_SAVE_CHEAT_WARNING = 20
+	{ "FET_SG", MENUPAGE_NEW_GAME, 0,
+		MENUACTION_LABEL,		"FES_CHE",	SAVESLOT_NONE,	MENUPAGE_NONE, 0, 0, 0,
+		MENUACTION_CHANGEMENU,	"FEM_OK",	SAVESLOT_NONE,	MENUPAGE_CHOOSE_SAVE_SLOT, 320, 225, MENUALIGN_CENTER,
+	},
+
+	// MENUPAGE_SKIN_SELECT = 21
+	{ "FET_PS", MENUPAGE_OPTIONS, 4,
+		 MENUACTION_GOBACK,		"FEDS_TB",	SAVESLOT_NONE, MENUPAGE_OPTIONS, 0, 0, 0,
+	},
+
+	// MENUPAGE_SAVE_UNUSED = 22
+	{ "FET_SG", MENUPAGE_NEW_GAME, 0,
+		 MENUACTION_LABEL,		"FED_LWR",	SAVESLOT_NONE,	0, 0, 0, 0,
+		 MENUACTION_CHANGEMENU,	"FEC_OKK",	SAVESLOT_NONE,	MENUPAGE_CHOOSE_SAVE_SLOT, 0, 0, 0,
+	},
+
+	// MENUPAGE_SAVE_FAILED = 23
+	{ "FET_SG", MENUPAGE_CHOOSE_SAVE_SLOT, 0,
+		 MENUACTION_LABEL,		"FEC_SVU",	SAVESLOT_NONE,	0, 0, 0, 0,
+		 MENUACTION_CHANGEMENU,	"FEC_OKK",	SAVESLOT_NONE,	MENUPAGE_CHOOSE_SAVE_SLOT, 0, 0, 0,
+	},
+
+	// MENUPAGE_SAVE_FAILED_2 = 24
+	{ "FET_LG", MENUPAGE_CHOOSE_SAVE_SLOT, 0,
+		 MENUACTION_LABEL,		"FEC_SVU",	SAVESLOT_NONE,	0, 0, 0, 0,
+	},
+
+	// MENUPAGE_LOAD_FAILED = 25
+	{ "FET_LG", MENUPAGE_NEW_GAME, 0,
+		 MENUACTION_LABEL,		"FEC_LUN",	SAVESLOT_NONE,  0, 0, 0, 0,
+		 MENUACTION_GOBACK,		"FEDS_TB",	SAVESLOT_NONE,  MENUPAGE_NEW_GAME, 0, 0, 0,
+	},
+
+	// MENUPAGE_CONTROLLER_PC = 26
+	{ "FET_CTL", MENUPAGE_OPTIONS, 0,
+#ifdef PC_PLAYER_CONTROLS
+		MENUACTION_CTRLMETHOD,	"FET_STI", SAVESLOT_NONE, MENUPAGE_CONTROLLER_PC, 320, 150, MENUALIGN_CENTER,
+		MENUACTION_KEYBOARDCTRLS,"FEC_RED", SAVESLOT_NONE, MENUPAGE_KEYBOARD_CONTROLS, 0, 0, MENUALIGN_CENTER,
+#else
+		MENUACTION_KEYBOARDCTRLS,"FEC_RED", SAVESLOT_NONE, MENUPAGE_KEYBOARD_CONTROLS, 320, 150, MENUALIGN_CENTER,
+#endif
+		MENUACTION_CHANGEMENU,	"FEC_MOU", SAVESLOT_NONE, MENUPAGE_MOUSE_CONTROLS, 0, 0, MENUALIGN_CENTER,
+		MENUACTION_RESTOREDEF,	"FET_DEF", SAVESLOT_NONE, MENUPAGE_CONTROLLER_PC, 0, 0, MENUALIGN_CENTER,
+		MENUACTION_GOBACK,		"FEDS_TB", SAVESLOT_NONE, 0, 0, 0, MENUALIGN_CENTER,
+	},
+
+	// MENUPAGE_OPTIONS = 27
+	{ "FET_OPT", MENUPAGE_NONE, 5,
+		 MENUACTION_CHANGEMENU,		"FEO_CON", SAVESLOT_NONE, MENUPAGE_CONTROLLER_PC, 320, 132, MENUALIGN_CENTER,
+		 MENUACTION_LOADRADIO,		"FEO_AUD", SAVESLOT_NONE, MENUPAGE_SOUND_SETTINGS, 0, 0, MENUALIGN_CENTER,
+		 MENUACTION_CHANGEMENU,		"FEO_DIS", SAVESLOT_NONE, MENUPAGE_DISPLAY_SETTINGS, 0, 0, MENUALIGN_CENTER,
+		 MENUACTION_CHANGEMENU,		"FEO_LAN", SAVESLOT_NONE, MENUPAGE_LANGUAGE_SETTINGS, 0, 0, MENUALIGN_CENTER,
+		 MENUACTION_PLAYERSETUP,	"FET_PS", SAVESLOT_NONE, MENUPAGE_SKIN_SELECT, 0, 0, MENUALIGN_CENTER,
+		 MENUACTION_GOBACK,			"FEDS_TB", SAVESLOT_NONE, 0, 0, 0, MENUALIGN_CENTER,
+	},
+
+	// MENUPAGE_EXIT = 28
+	{ "FET_QG", MENUPAGE_NONE, 6,
+		MENUACTION_LABEL,		"FEQ_SRE",	SAVESLOT_NONE, 0, 0, 0, 0,
+		MENUACTION_DONTCANCEL,	"FEM_NO",	SAVESLOT_NONE, MENUPAGE_NONE, 320, 200, MENUALIGN_CENTER,
+		MENUACTION_CANCELGAME,	"FEM_YES",	SAVESLOT_NONE, MENUPAGE_NONE, 320, 225, MENUALIGN_CENTER,
+	},
+
+	// MENUPAGE_START_MENU = 29
+	{ "FEM_MM", MENUPAGE_DISABLED, 0,
+		  MENUACTION_CHANGEMENU,	"FEP_STG",	SAVESLOT_NONE,	MENUPAGE_NEW_GAME, 320, 170, MENUALIGN_CENTER,
+		  MENUACTION_CHANGEMENU,	"FEP_OPT",	SAVESLOT_NONE,	MENUPAGE_OPTIONS, 0, 0, MENUALIGN_CENTER,
+		  MENUACTION_CHANGEMENU,	"FEP_QUI",	SAVESLOT_NONE,	MENUPAGE_EXIT, 0, 0, MENUALIGN_CENTER,
+	},
+	
+	// MENUPAGE_KEYBOARD_CONTROLS = 30
+	{ "FET_STI", MENUPAGE_CONTROLLER_PC, 1,
+	},
+
+	// MENUPAGE_MOUSE_CONTROLS = 31
+	{ "FEC_MOU", MENUPAGE_CONTROLLER_PC, 2,
+		MENUACTION_MOUSESENS,	"FEC_MSH",	SAVESLOT_NONE, MENUPAGE_MOUSE_CONTROLS, 40, 170, MENUALIGN_LEFT,
+		MENUACTION_INVVERT,		"FEC_IVV",	SAVESLOT_NONE, MENUPAGE_MOUSE_CONTROLS, 0, 0, MENUALIGN_LEFT,
+		MENUACTION_MOUSESTEER,	"FET_MST",	SAVESLOT_NONE, MENUPAGE_MOUSE_CONTROLS, 0, 0, MENUALIGN_LEFT,
+		MENUACTION_GOBACK,		"FEDS_TB",	SAVESLOT_NONE, 0, 320, 260, MENUALIGN_CENTER,
+	},
+
+	// MENUPAGE_PAUSE_MENU = 32
+	{ "FET_PAU", MENUPAGE_DISABLED, 0,
+		MENUACTION_RESUME,		"FEP_RES",	SAVESLOT_NONE, 0, 320, 120, MENUALIGN_CENTER,
+		MENUACTION_CHANGEMENU,	"FEH_SGA",	SAVESLOT_NONE, MENUPAGE_NEW_GAME, 0, 0, MENUALIGN_CENTER,
+		MENUACTION_CHANGEMENU,	"FEH_MAP",	SAVESLOT_NONE, MENUPAGE_MAP, 0, 0, MENUALIGN_CENTER,
+		MENUACTION_CHANGEMENU,	"FEP_STA",	SAVESLOT_NONE, MENUPAGE_STATS, 0, 0, MENUALIGN_CENTER,
+		MENUACTION_CHANGEMENU,	"FEH_BRI",	SAVESLOT_NONE, MENUPAGE_BRIEFS, 0, 0, MENUALIGN_CENTER,
+		MENUACTION_CHANGEMENU,	"FET_OPT",	SAVESLOT_NONE, MENUPAGE_OPTIONS, 0, 0, MENUALIGN_CENTER,
+		MENUACTION_CHANGEMENU,	"FEP_QUI",	SAVESLOT_NONE, MENUPAGE_EXIT, 0, 0, MENUALIGN_CENTER,
+	},
+
+	// MENUPAGE_NONE = 33
+	{ "", 0, 0, },
+
+#ifdef LEGACY_MENU_OPTIONS
+	// MENUPAGE_DEBUG_MENU
+	{ "FED_DBG", MENUPAGE_NONE, 0,
+		MENUACTION_RELOADIDE,	"FED_RID", SAVESLOT_NONE, MENUPAGE_NONE, 0, 0, 0,
+		MENUACTION_SETDBGFLAG,	"FED_DFL", SAVESLOT_NONE, MENUPAGE_NONE, 0, 0, 0,
+		MENUACTION_SWITCHBIGWHITEDEBUGLIGHT,	"FED_DLS", SAVESLOT_NONE, MENUPAGE_NONE, 0, 0, 0,
+		MENUACTION_COLLISIONPOLYS,	"FED_SCP", SAVESLOT_NONE, MENUPAGE_NONE, 0, 0, 0,
+		MENUACTION_GOBACK,		"FEDS_TB", SAVESLOT_NONE, MENUPAGE_NONE, 0, 0, 0,
+	},
+	
+	// MENUPAGE_CONTROLLER_PC_OLD1
+	{ "FET_CTL", MENUPAGE_CONTROLLER_PC, 0,
+		MENUACTION_GETKEY,	"FEC_PLB", SAVESLOT_NONE, MENUPAGE_CONTROLLER_PC_OLD1, 0, 0, 0,
+		MENUACTION_GETKEY,	"FEC_CWL", SAVESLOT_NONE, MENUPAGE_CONTROLLER_PC_OLD1, 0, 0, 0,
+		MENUACTION_GETKEY,	"FEC_CWR", SAVESLOT_NONE, MENUPAGE_CONTROLLER_PC_OLD1, 0, 0, 0,
+		MENUACTION_GETKEY,	"FEC_LKT", SAVESLOT_NONE, MENUPAGE_CONTROLLER_PC_OLD1, 0, 0, 0,
+		MENUACTION_GETKEY,	"FEC_PJP", SAVESLOT_NONE, MENUPAGE_CONTROLLER_PC_OLD1, 0, 0, 0,
+		MENUACTION_GETKEY,	"FEC_PSP", SAVESLOT_NONE, MENUPAGE_CONTROLLER_PC_OLD1, 0, 0, 0,
+		MENUACTION_GETKEY,	"FEC_TLF", SAVESLOT_NONE, MENUPAGE_CONTROLLER_PC_OLD1, 0, 0, 0,
+		MENUACTION_GETKEY,	"FEC_TRG", SAVESLOT_NONE, MENUPAGE_CONTROLLER_PC_OLD1, 0, 0, 0,
+		MENUACTION_GETKEY,	"FEC_CCM", SAVESLOT_NONE, MENUPAGE_CONTROLLER_PC_OLD1, 0, 0, 0,
+		MENUACTION_GOBACK,		"FEDS_TB", SAVESLOT_NONE, MENUPAGE_NONE, 0, 0, 0,
+	},
+
+	// MENUPAGE_CONTROLLER_PC_OLD2
+	{ "FET_CTL", MENUPAGE_CONTROLLER_PC, 1,
+
+	},
+
+	// MENUPAGE_CONTROLLER_PC_OLD3
+	{ "FET_CTL", MENUPAGE_CONTROLLER_PC, 2,
+		 MENUACTION_GETKEY,	"FEC_LUP", SAVESLOT_NONE, MENUPAGE_CONTROLLER_PC_OLD3, 0, 0, 0,
+		 MENUACTION_GETKEY,	"FEC_LDN", SAVESLOT_NONE, MENUPAGE_CONTROLLER_PC_OLD3, 0, 0, 0,
+		 MENUACTION_GETKEY,	"FEC_SMS", SAVESLOT_NONE, MENUPAGE_CONTROLLER_PC_OLD3, 0, 0, 0,
+		 MENUACTION_SHOWHEADBOB,	"FEC_GSL", SAVESLOT_NONE, MENUPAGE_CONTROLLER_PC_OLD3, 0, 0, 0,
+		 MENUACTION_GOBACK,		"FEDS_TB", SAVESLOT_NONE, MENUPAGE_NONE, 0, 0, 0,
+	},
+
+	// MENUPAGE_CONTROLLER_PC_OLD4
+	{ "FET_CTL", MENUPAGE_CONTROLLER_PC, 3,
+
+	},
+
+	// MENUPAGE_CONTROLLER_DEBUG
+	{ "FEC_DBG", MENUPAGE_CONTROLLER_PC, 3,
+		 MENUACTION_GETKEY,	"FEC_TGD",	SAVESLOT_NONE, MENUPAGE_CONTROLLER_DEBUG, 0, 0, 0,
+		 MENUACTION_GETKEY,	"FEC_TDO",	SAVESLOT_NONE, MENUPAGE_CONTROLLER_DEBUG, 0, 0, 0,
+		 MENUACTION_GETKEY,	"FEC_TSS",	SAVESLOT_NONE, MENUPAGE_CONTROLLER_DEBUG, 0, 0, 0,
+		 MENUACTION_GETKEY,	"FEC_SMS",	SAVESLOT_NONE, MENUPAGE_CONTROLLER_DEBUG, 0, 0, 0,
+		 MENUACTION_GOBACK,	"FEDS_TB",	SAVESLOT_NONE, MENUPAGE_NONE, 0, 0, 0,
+	},
+#endif
+
+	// MENUPAGE_OUTRO - Originally 34
+	{ "", 0, 0, },
+};
+
+#endif
+#endif
diff --git a/src/core/MenuScreensCustom.cpp b/src/core/MenuScreensCustom.cpp
new file mode 100644
index 0000000..0534e34
--- /dev/null
+++ b/src/core/MenuScreensCustom.cpp
@@ -0,0 +1,759 @@
+#include "common.h"
+#if defined DETECT_JOYSTICK_MENU && defined XINPUT
+#include <windows.h>
+#include <xinput.h>
+#if !defined(PSAPI_VERSION) || (PSAPI_VERSION > 1)
+#pragma comment( lib, "Xinput9_1_0.lib" )
+#else
+#pragma comment( lib, "Xinput.lib" )
+#endif
+#endif
+#include "platform.h"
+#include "crossplatform.h"
+#include "Renderer.h"
+#include "Frontend.h"
+#include "Font.h"
+#include "Camera.h"
+#include "main.h"
+#include "MBlur.h"
+#include "postfx.h"
+#include "custompipes.h"
+#include "RwHelper.h"
+#include "Text.h"
+#include "Streaming.h"
+#include "FileLoader.h"
+#include "Collision.h"
+#include "ModelInfo.h"
+#include "Pad.h"
+#include "ControllerConfig.h"
+
+// Menu screens array is at the bottom of the file.
+
+#ifdef PC_MENU
+
+#ifdef CUSTOM_FRONTEND_OPTIONS
+
+#ifdef IMPROVED_VIDEOMODE
+	#define VIDEOMODE_SELECTOR MENUACTION_CFO_SELECT, "FEM_SCF", { new CCFOSelect((int8*)&FrontEndMenuManager.m_nPrefsWindowed, "VideoMode", "Windowed", screenModes, 2, true, ScreenModeAfterChange, true) }, 0, 0, MENUALIGN_LEFT,
+#else
+	#define VIDEOMODE_SELECTOR
+#endif
+
+#ifdef MULTISAMPLING
+	#define MULTISAMPLING_SELECTOR MENUACTION_CFO_DYNAMIC, "FED_AAS", { new CCFODynamic((int8*)&FrontEndMenuManager.m_nPrefsMSAALevel, "Graphics", "MultiSampling", MultiSamplingDraw, MultiSamplingButtonPress) }, 0, 0, MENUALIGN_LEFT,
+#else
+	#define MULTISAMPLING_SELECTOR
+#endif
+
+#ifdef CUTSCENE_BORDERS_SWITCH
+	#define CUTSCENE_BORDERS_TOGGLE MENUACTION_CFO_SELECT, "FEM_CSB", { new CCFOSelect((int8 *)&FrontEndMenuManager.m_PrefsCutsceneBorders, "Display", "CutsceneBorders", off_on, 2, false) }, 0, 0, MENUALIGN_LEFT,
+#else
+	#define CUTSCENE_BORDERS_TOGGLE
+#endif
+
+#ifdef FREE_CAM
+	#define FREE_CAM_TOGGLE MENUACTION_CFO_SELECT, "FEC_FRC", { new CCFOSelect((int8*)&TheCamera.bFreeCam, "Display", "FreeCam", off_on, 2, false) }, 0, 0, MENUALIGN_LEFT,
+#else
+	#define FREE_CAM_TOGGLE
+#endif
+
+#ifdef PS2_ALPHA_TEST
+	#define DUALPASS_SELECTOR MENUACTION_CFO_SELECT, "FEM_2PR", { new CCFOSelect((int8*)&gPS2alphaTest, "Graphics", "PS2AlphaTest", off_on, 2, false) }, 0, 0, MENUALIGN_LEFT,
+#else
+	#define DUALPASS_SELECTOR 
+#endif
+
+#ifdef NO_ISLAND_LOADING
+	#define ISLAND_LOADING_SELECTOR MENUACTION_CFO_SELECT, "FEM_ISL", { new CCFOSelect((int8*)&FrontEndMenuManager.m_PrefsIslandLoading, "Graphics", "IslandLoading", islandLoadingOpts, ARRAY_SIZE(islandLoadingOpts), true, IslandLoadingAfterChange) }, 0, 0, MENUALIGN_LEFT,
+#else
+	#define ISLAND_LOADING_SELECTOR 
+#endif
+
+#ifdef EXTENDED_COLOURFILTER
+	#define POSTFX_SELECTORS \
+		MENUACTION_CFO_SELECT, "FED_CLF", { new CCFOSelect((int8*)&CPostFX::EffectSwitch, "Graphics", "ColourFilter", filterNames, ARRAY_SIZE(filterNames), false) }, 0, 0, MENUALIGN_LEFT, \
+		MENUACTION_CFO_SELECT, "FED_MBL", { new CCFOSelect((int8*)&CPostFX::MotionBlurOn, "Graphics", "MotionBlur", off_on, 2, false) }, 0, 0, MENUALIGN_LEFT,
+#else
+	#define POSTFX_SELECTORS
+#endif	
+
+#ifdef INVERT_LOOK_FOR_PAD
+	#define INVERT_PAD_SELECTOR MENUACTION_CFO_SELECT, "FEC_ILU", { new CCFOSelect((int8*)&CPad::bInvertLook4Pad, "Controller", "InvertPad", off_on, 2, false) }, 0, 0, MENUALIGN_LEFT,
+#else
+	#define INVERT_PAD_SELECTOR
+#endif
+
+#ifdef GAMEPAD_MENU
+	#define SELECT_CONTROLLER_TYPE  MENUACTION_CFO_SELECT, "FEC_TYP", { new CCFOSelect((int8*)&FrontEndMenuManager.m_PrefsControllerType, "Controller", "Type", controllerTypes, ARRAY_SIZE(controllerTypes), false, ControllerTypeAfterChange) }, 0, 0, MENUALIGN_LEFT,
+#else
+	#define SELECT_CONTROLLER_TYPE
+#endif
+
+const char *filterNames[] = { "FEM_NON", "FEM_SIM", "FEM_NRM", "FEM_MOB" };
+const char *off_on[] = { "FEM_OFF", "FEM_ON" };
+
+void RestoreDefGraphics(int8 action) {
+	if (action != FEOPTION_ACTION_SELECT)
+		return;
+
+	#ifdef PS2_ALPHA_TEST
+		gPS2alphaTest = false;
+	#endif
+	#ifdef MULTISAMPLING
+		FrontEndMenuManager.m_nPrefsMSAALevel = FrontEndMenuManager.m_nDisplayMSAALevel = 0;
+	#endif
+	#ifdef NO_ISLAND_LOADING
+	    	if (!FrontEndMenuManager.m_bGameNotLoaded) {
+	    		FrontEndMenuManager.m_PrefsIslandLoading = FrontEndMenuManager.ISLAND_LOADING_LOW;
+				CStreaming::RemoveUnusedBigBuildings(CGame::currLevel);
+				CStreaming::RemoveUnusedBuildings(CGame::currLevel);
+				CStreaming::RequestIslands(CGame::currLevel);
+		        CStreaming::LoadAllRequestedModels(true);
+	    	} else
+	    		FrontEndMenuManager.m_PrefsIslandLoading = FrontEndMenuManager.ISLAND_LOADING_LOW;
+	#endif
+	#ifdef GRAPHICS_MENU_OPTIONS // otherwise Frontend will handle those
+		FrontEndMenuManager.m_PrefsFrameLimiter = true;
+		FrontEndMenuManager.m_PrefsVsyncDisp = true;
+		#ifdef LEGACY_MENU_OPTIONS
+			FrontEndMenuManager.m_PrefsVsync = true;
+		#endif
+		FrontEndMenuManager.m_PrefsUseWideScreen = false;
+		FrontEndMenuManager.m_nDisplayVideoMode = FrontEndMenuManager.m_nPrefsVideoMode;
+		CMBlur::BlurOn = false;
+		FrontEndMenuManager.SaveSettings();
+	#endif
+}
+
+void RestoreDefDisplay(int8 action) {
+	if (action != FEOPTION_ACTION_SELECT)
+		return;
+
+	#ifdef CUTSCENE_BORDERS_SWITCH
+		FrontEndMenuManager.m_PrefsCutsceneBorders = true;
+	#endif
+	#ifdef FREE_CAM
+		TheCamera.bFreeCam = false;
+	#endif
+	#ifdef GRAPHICS_MENU_OPTIONS // otherwise Frontend will handle those
+		FrontEndMenuManager.m_PrefsBrightness = 256;
+		FrontEndMenuManager.m_PrefsLOD = 1.2f;
+		CRenderer::ms_lodDistScale = 1.2f;
+		FrontEndMenuManager.m_PrefsShowSubtitles = false;
+		FrontEndMenuManager.m_PrefsShowLegends = true;
+		FrontEndMenuManager.m_PrefsRadarMode = 0;
+		FrontEndMenuManager.m_PrefsShowHud = true;
+		FrontEndMenuManager.SaveSettings();
+	#endif
+}
+
+#ifdef NO_ISLAND_LOADING
+const char *islandLoadingOpts[] = { "FEM_LOW", "FEM_MED", "FEM_HIG" };
+void IslandLoadingAfterChange(int8 before, int8 after) {
+	if (!FrontEndMenuManager.m_bGameNotLoaded) {
+		if (after > FrontEndMenuManager.ISLAND_LOADING_LOW) {
+		    FrontEndMenuManager.m_PrefsIslandLoading = before; // calls below needs previous mode :shrug:
+		    
+		    if (after == FrontEndMenuManager.ISLAND_LOADING_HIGH) {
+			    CStreaming::RemoveIslandsNotUsed(LEVEL_BEACH);
+			    CStreaming::RemoveIslandsNotUsed(LEVEL_MAINLAND);
+			}
+		    if (before == FrontEndMenuManager.ISLAND_LOADING_LOW) {
+			    FrontEndMenuManager.m_PrefsIslandLoading = after;
+			    CStreaming::RequestBigBuildings(CGame::currLevel);
+			    
+		    } else if (before == FrontEndMenuManager.ISLAND_LOADING_HIGH) {
+			    FrontEndMenuManager.m_PrefsIslandLoading = after;
+			    CStreaming::RequestIslands(CGame::currLevel);
+		    } else
+		    	    FrontEndMenuManager.m_PrefsIslandLoading = after;
+		    	    
+		} else { // low
+		    CStreaming::RemoveUnusedBigBuildings(CGame::currLevel);
+		    CStreaming::RemoveUnusedBuildings(CGame::currLevel);
+		    CStreaming::RequestIslands(CGame::currLevel);
+		}
+
+		CStreaming::LoadAllRequestedModels(true);
+	}
+
+	FrontEndMenuManager.SetHelperText(0);
+}
+#endif
+
+#ifndef MULTISAMPLING
+void GraphicsGoBack() {
+}
+#else
+void GraphicsGoBack() {
+	FrontEndMenuManager.m_nDisplayMSAALevel = FrontEndMenuManager.m_nPrefsMSAALevel;
+}
+
+void MultiSamplingButtonPress(int8 action) {
+	if (action == FEOPTION_ACTION_SELECT) {
+		if (FrontEndMenuManager.m_nDisplayMSAALevel != FrontEndMenuManager.m_nPrefsMSAALevel) {
+			FrontEndMenuManager.m_nPrefsMSAALevel = FrontEndMenuManager.m_nDisplayMSAALevel;
+			_psSelectScreenVM(FrontEndMenuManager.m_nPrefsVideoMode);
+			FrontEndMenuManager.SetHelperText(0);
+			FrontEndMenuManager.SaveSettings();
+		}
+	} else if (action == FEOPTION_ACTION_LEFT || action == FEOPTION_ACTION_RIGHT) {
+		if (FrontEndMenuManager.m_bGameNotLoaded) {
+			FrontEndMenuManager.m_nDisplayMSAALevel += (action == FEOPTION_ACTION_RIGHT ? 1 : -1);
+
+			int i = 0;
+			int maxAA = RwD3D8EngineGetMaxMultiSamplingLevels();
+			while (maxAA != 1) {
+				i++;
+				maxAA >>= 1;
+			}
+
+			if (FrontEndMenuManager.m_nDisplayMSAALevel < 0)
+				FrontEndMenuManager.m_nDisplayMSAALevel = i;
+			else if (FrontEndMenuManager.m_nDisplayMSAALevel > i)
+				FrontEndMenuManager.m_nDisplayMSAALevel = 0;
+		}
+	} else if (action == FEOPTION_ACTION_FOCUSLOSS) {
+		if (FrontEndMenuManager.m_nDisplayMSAALevel != FrontEndMenuManager.m_nPrefsMSAALevel) {
+			FrontEndMenuManager.m_nDisplayMSAALevel = FrontEndMenuManager.m_nPrefsMSAALevel;
+			FrontEndMenuManager.SetHelperText(3);
+		}
+	}
+}
+
+wchar* MultiSamplingDraw(bool *disabled, bool userHovering) {
+	static wchar unicodeTemp[64];
+	if (userHovering) {
+		if (FrontEndMenuManager.m_nDisplayMSAALevel == FrontEndMenuManager.m_nPrefsMSAALevel) {
+			if (FrontEndMenuManager.m_nHelperTextMsgId == 1) // Press enter to apply
+				FrontEndMenuManager.ResetHelperText();
+		} else {
+			FrontEndMenuManager.SetHelperText(1);
+		}
+	} else {
+		if (FrontEndMenuManager.m_nDisplayMSAALevel != FrontEndMenuManager.m_nPrefsMSAALevel) {
+			FrontEndMenuManager.m_nDisplayMSAALevel = FrontEndMenuManager.m_nPrefsMSAALevel;
+		}
+	}
+
+	if (!FrontEndMenuManager.m_bGameNotLoaded)
+		*disabled = true;
+
+	switch (FrontEndMenuManager.m_nDisplayMSAALevel) {
+		case 0:
+			return TheText.Get("FEM_OFF");
+		default:
+			sprintf(gString, "%iX", 1 << (FrontEndMenuManager.m_nDisplayMSAALevel));
+			AsciiToUnicode(gString, unicodeTemp);
+			return unicodeTemp;
+	}
+}
+#endif
+
+#ifdef IMPROVED_VIDEOMODE
+const char* screenModes[] = { "FED_FLS", "FED_WND" };
+void ScreenModeAfterChange(int8 before, int8 after)
+{
+	_psSelectScreenVM(FrontEndMenuManager.m_nPrefsVideoMode); // apply same resolution
+	FrontEndMenuManager.SetHelperText(0);
+}
+
+#endif
+
+#ifdef DETECT_JOYSTICK_MENU
+wchar selectedJoystickUnicode[128];
+int cachedButtonNum = -1;
+
+wchar* DetectJoystickDraw(bool* disabled, bool userHovering) {
+
+#if defined RW_GL3 && !defined LIBRW_SDL2
+	int numButtons;
+	int found = -1;
+	const char *joyname;
+	if (userHovering) {
+		for (int i = 0; i <= GLFW_JOYSTICK_LAST; i++) {
+			if ((joyname = glfwGetJoystickName(i))) {
+				const uint8* buttons = glfwGetJoystickButtons(i, &numButtons);
+				for (int j = 0; j < numButtons; j++) {
+					if (buttons[j]) {
+						found = i;
+						break;
+					}
+				}
+				if (found != -1)
+					break;
+			}
+		}
+
+		if (found != -1 && PSGLOBAL(joy1id) != found) {
+			if (PSGLOBAL(joy1id) != -1 && PSGLOBAL(joy1id) != found)
+				PSGLOBAL(joy2id) = PSGLOBAL(joy1id);
+			else
+				PSGLOBAL(joy2id) = -1;
+
+			strcpy(gSelectedJoystickName, joyname);
+			PSGLOBAL(joy1id) = found;
+			cachedButtonNum = numButtons;
+		}
+	}
+	if (PSGLOBAL(joy1id) == -1)
+#elif defined XINPUT
+	int found = -1;
+	XINPUT_STATE xstate;
+	memset(&xstate, 0, sizeof(XINPUT_STATE));
+	if (userHovering) {
+		for (int i = 0; i <= 3; i++) {
+			if (XInputGetState(i, &xstate) == ERROR_SUCCESS) {
+				if (xstate.Gamepad.bLeftTrigger || xstate.Gamepad.bRightTrigger) {
+					found = i;
+					break;
+				}
+				for (int j = XINPUT_GAMEPAD_DPAD_UP; j != XINPUT_GAMEPAD_Y << 1; j = (j << 1)) {
+					if (xstate.Gamepad.wButtons & j) {
+						found = i;
+						break;
+					}
+				}
+				if (found != -1)
+					break;
+			}
+		}
+		if (found != -1 && CPad::XInputJoy1 != found) {
+			// We should never leave pads -1, so we can process them when they're connected and kinda support hotplug.
+			CPad::XInputJoy2 = (CPad::XInputJoy1 == -1 ? (found + 1) % 4 : CPad::XInputJoy1);
+			CPad::XInputJoy1 = found;
+			cachedButtonNum = 0; // fake too, because xinput bypass CControllerConfig
+		}
+	}
+	sprintf(gSelectedJoystickName, "%d", CPad::XInputJoy1); // fake, on xinput we only store gamepad ids(thanks MS) so this is a temp variable to be used below
+	if (CPad::XInputJoy1 == -1)
+#endif
+		AsciiToUnicode("Not found", selectedJoystickUnicode);
+	else
+		AsciiToUnicode(gSelectedJoystickName, selectedJoystickUnicode);
+
+	return selectedJoystickUnicode;
+}
+
+void DetectJoystickGoBack() {
+	if (cachedButtonNum != -1) {
+#ifdef LOAD_INI_SETTINGS
+		ControlsManager.InitDefaultControlConfigJoyPad(cachedButtonNum);
+		SaveINIControllerSettings();
+#else
+		// Otherwise no way to save gSelectedJoystickName or ms_padButtonsInited anyway :shrug: Why do you even use this config.??
+#endif
+		cachedButtonNum = -1;
+	}
+}
+#endif
+
+#ifdef GAMEPAD_MENU
+const char* controllerTypes[] = { "FEC_DS2", "FEC_DS3", "FEC_DS4", "FEC_360", "FEC_ONE" };
+void ControllerTypeAfterChange(int8 before, int8 after)
+{
+	FrontEndMenuManager.LoadController(after);
+}
+#endif
+
+CMenuScreenCustom aScreens[] = {
+	// MENUPAGE_STATS = 0
+	{ "FEH_STA", MENUPAGE_NONE, nil, nil,
+		MENUACTION_GOBACK, "FEDS_TB", {nil, SAVESLOT_NONE, MENUPAGE_NONE}, 190, 320, MENUALIGN_RIGHT,
+	},
+
+	// MENUPAGE_NEW_GAME = 1
+	{ "FEP_STG", MENUPAGE_NONE, nil, nil,
+		MENUACTION_CHANGEMENU, "FES_NGA", {nil, SAVESLOT_NONE, MENUPAGE_NEW_GAME_RELOAD}, 320, 155, MENUALIGN_CENTER,
+		MENUACTION_CHANGEMENU, "FES_LOA",  {nil, SAVESLOT_NONE, MENUPAGE_CHOOSE_LOAD_SLOT}, 0, 0, MENUALIGN_CENTER,
+		MENUACTION_CHANGEMENU, "FES_DEL", {nil, SAVESLOT_NONE, MENUPAGE_CHOOSE_DELETE_SLOT}, 0, 0, MENUALIGN_CENTER,
+		MENUACTION_GOBACK, "FEDS_TB", {nil, SAVESLOT_NONE, 0}, 0, 0, MENUALIGN_CENTER,
+	},
+
+	// MENUPAGE_BRIEFS = 2
+	{ "FEH_BRI", MENUPAGE_NONE, nil, nil,
+		MENUACTION_GOBACK, "FEDS_TB", {nil, SAVESLOT_NONE, MENUPAGE_NONE}, 190, 320, MENUALIGN_RIGHT,
+	},
+
+	// MENUPAGE_SOUND_SETTINGS = 3
+	{ "FEH_AUD", MENUPAGE_OPTIONS, nil, nil,
+		MENUACTION_MUSICVOLUME,		"FEA_MUS", {nil, SAVESLOT_NONE, MENUPAGE_SOUND_SETTINGS}, 40, 76, MENUALIGN_LEFT,
+		MENUACTION_SFXVOLUME,		"FEA_SFX", {nil, SAVESLOT_NONE, MENUPAGE_SOUND_SETTINGS}, 0, 0, MENUALIGN_LEFT,
+		MENUACTION_MP3VOLUMEBOOST,	"FEA_MPB", {nil, SAVESLOT_NONE, MENUPAGE_SOUND_SETTINGS}, 0, 0, MENUALIGN_LEFT,
+		MENUACTION_AUDIOHW,			"FEA_3DH", {nil, SAVESLOT_NONE, MENUPAGE_SOUND_SETTINGS}, 0, 0, MENUALIGN_LEFT,
+		MENUACTION_SPEAKERCONF,		"FEA_SPK", {nil, SAVESLOT_NONE, MENUPAGE_SOUND_SETTINGS}, 0, 0, MENUALIGN_LEFT,
+		MENUACTION_DYNAMICACOUSTIC,	"FET_DAM", {nil, SAVESLOT_NONE, MENUPAGE_SOUND_SETTINGS}, 0, 0, MENUALIGN_LEFT,
+		MENUACTION_RADIO,			"FEA_RSS", {nil, SAVESLOT_NONE, MENUPAGE_SOUND_SETTINGS}, 0, 0, MENUALIGN_LEFT,
+		MENUACTION_RESTOREDEF,		"FET_DEF", {nil, SAVESLOT_NONE, MENUPAGE_SOUND_SETTINGS}, 320, 367, MENUALIGN_CENTER,
+		MENUACTION_GOBACK,			"FEDS_TB", {nil, SAVESLOT_NONE, MENUPAGE_NONE}, 0, 0, MENUALIGN_CENTER,
+	},
+
+	// MENUPAGE_DISPLAY_SETTINGS = 4
+#ifndef GRAPHICS_MENU_OPTIONS
+	{ "FEH_DIS", MENUPAGE_OPTIONS, new CCustomScreenLayout({40, 78, 25, true}), nil,
+		MENUACTION_BRIGHTNESS,	"FED_BRI", {nil, SAVESLOT_NONE, MENUPAGE_DISPLAY_SETTINGS}, 0, 0, MENUALIGN_LEFT,
+		MENUACTION_DRAWDIST,	"FEM_LOD", {nil, SAVESLOT_NONE, MENUPAGE_DISPLAY_SETTINGS}, 0, 0, MENUALIGN_LEFT,
+#ifdef LEGACY_MENU_OPTIONS
+		MENUACTION_FRAMESYNC,	"FEM_VSC", {nil, SAVESLOT_NONE, MENUPAGE_DISPLAY_SETTINGS}, 0, 0, MENUALIGN_LEFT,
+#endif
+		MENUACTION_FRAMELIMIT,	"FEM_FRM", {nil, SAVESLOT_NONE, MENUPAGE_DISPLAY_SETTINGS}, 0, 0, MENUALIGN_LEFT,
+#if defined LEGACY_MENU_OPTIONS && !defined EXTENDED_COLOURFILTER
+		MENUACTION_TRAILS,		"FED_TRA", {nil, SAVESLOT_NONE, MENUPAGE_DISPLAY_SETTINGS}, 0, 0, MENUALIGN_LEFT,
+#endif
+		MENUACTION_SUBTITLES,	"FED_SUB", {nil, SAVESLOT_NONE, MENUPAGE_DISPLAY_SETTINGS}, 0, 0, MENUALIGN_LEFT,
+		MENUACTION_WIDESCREEN,	"FED_WIS", {nil, SAVESLOT_NONE, MENUPAGE_DISPLAY_SETTINGS}, 0, 0, MENUALIGN_LEFT,
+		MENUACTION_LEGENDS,		"MAP_LEG", {nil, SAVESLOT_NONE, MENUPAGE_DISPLAY_SETTINGS}, 0, 0, MENUALIGN_LEFT,
+		MENUACTION_RADARMODE,	"FED_RDR", {nil, SAVESLOT_NONE, MENUPAGE_DISPLAY_SETTINGS}, 0, 0, MENUALIGN_LEFT,
+		MENUACTION_HUD,			"FED_HUD", {nil, SAVESLOT_NONE, MENUPAGE_DISPLAY_SETTINGS}, 0, 0, MENUALIGN_LEFT,
+		MENUACTION_SCREENRES,	"FED_RES", {nil, SAVESLOT_NONE, MENUPAGE_DISPLAY_SETTINGS}, 0, 0, MENUALIGN_LEFT,
+		VIDEOMODE_SELECTOR
+		MULTISAMPLING_SELECTOR
+		ISLAND_LOADING_SELECTOR
+		DUALPASS_SELECTOR
+		CUTSCENE_BORDERS_TOGGLE
+		FREE_CAM_TOGGLE
+		POSTFX_SELECTORS
+		// re3.cpp inserts here pipeline selectors if neo/neo.txd exists and EXTENDED_PIPELINES defined
+		MENUACTION_RESTOREDEF,	"FET_DEF", {nil, SAVESLOT_NONE, MENUPAGE_DISPLAY_SETTINGS}, 320, 0, MENUALIGN_CENTER,
+		MENUACTION_GOBACK,		"FEDS_TB", {nil, SAVESLOT_NONE, MENUPAGE_NONE}, 320, 0, MENUALIGN_CENTER,
+	},
+#else
+	{ "FEH_DIS", MENUPAGE_OPTIONS, new CCustomScreenLayout({40, 78, 25, true}), nil,
+		MENUACTION_BRIGHTNESS,	"FED_BRI", { nil, SAVESLOT_NONE, MENUPAGE_DISPLAY_SETTINGS }, 0, 0, MENUALIGN_LEFT,
+		MENUACTION_DRAWDIST,	"FEM_LOD", { nil, SAVESLOT_NONE, MENUPAGE_DISPLAY_SETTINGS }, 0, 0, MENUALIGN_LEFT,
+		CUTSCENE_BORDERS_TOGGLE
+		FREE_CAM_TOGGLE
+		MENUACTION_LEGENDS,		"MAP_LEG", { nil, SAVESLOT_NONE, MENUPAGE_DISPLAY_SETTINGS }, 0, 0, MENUALIGN_LEFT,
+		MENUACTION_RADARMODE,	"FED_RDR", { nil, SAVESLOT_NONE, MENUPAGE_DISPLAY_SETTINGS }, 0, 0, MENUALIGN_LEFT,
+		MENUACTION_HUD,			"FED_HUD", { nil, SAVESLOT_NONE, MENUPAGE_DISPLAY_SETTINGS }, 0, 0, MENUALIGN_LEFT,
+		MENUACTION_SUBTITLES,	"FED_SUB", { nil, SAVESLOT_NONE, MENUPAGE_DISPLAY_SETTINGS }, 0, 0, MENUALIGN_LEFT,
+		MENUACTION_CFO_DYNAMIC,	"FET_DEF", { new CCFODynamic(nil, nil, nil, nil, RestoreDefDisplay) }, 320, 0, MENUALIGN_CENTER,
+		MENUACTION_GOBACK,		"FEDS_TB", { nil, SAVESLOT_NONE, MENUPAGE_NONE}, 320, 0, MENUALIGN_CENTER,
+	},
+#endif
+
+	// MENUPAGE_LANGUAGE_SETTINGS = 5
+	{ "FEH_LAN", MENUPAGE_OPTIONS, nil, nil,
+		MENUACTION_LANG_ENG,	"FEL_ENG", {nil, SAVESLOT_NONE, MENUPAGE_LANGUAGE_SETTINGS}, 320, 132, MENUALIGN_CENTER,
+		MENUACTION_LANG_FRE,	"FEL_FRE", {nil, SAVESLOT_NONE, MENUPAGE_LANGUAGE_SETTINGS}, 0, 0, MENUALIGN_CENTER,
+		MENUACTION_LANG_GER,	"FEL_GER", {nil, SAVESLOT_NONE, MENUPAGE_LANGUAGE_SETTINGS}, 0, 0, MENUALIGN_CENTER,
+		MENUACTION_LANG_ITA,	"FEL_ITA", {nil, SAVESLOT_NONE, MENUPAGE_LANGUAGE_SETTINGS}, 0, 0, MENUALIGN_CENTER,
+		MENUACTION_LANG_SPA,    "FEL_SPA", {nil, SAVESLOT_NONE, MENUPAGE_LANGUAGE_SETTINGS}, 0, 0, MENUALIGN_CENTER,
+		MENUACTION_GOBACK,		"FEDS_TB", {nil, SAVESLOT_NONE, MENUPAGE_NONE}, 0, 0, MENUALIGN_CENTER,
+	},
+
+	// MENUPAGE_MAP = 6
+	{ "FEH_MAP", MENUPAGE_NONE, nil, nil,
+		 MENUACTION_GOBACK,	"FEDS_TB", {nil, SAVESLOT_NONE, MENUPAGE_NONE}, 70, 380, MENUALIGN_CENTER,
+	},
+
+	// MENUPAGE_NEW_GAME_RELOAD = 7
+	{ "FES_NGA", MENUPAGE_NEW_GAME, nil, nil,
+		MENUACTION_LABEL,		"FESZ_QR",	{nil, SAVESLOT_NONE,	0}, 0, 0, 0,
+		MENUACTION_NO,			"FEM_NO",	{nil, SAVESLOT_NONE,	MENUPAGE_NEW_GAME}, 320, 200, MENUALIGN_CENTER,
+		MENUACTION_NEWGAME,		"FEM_YES",	{nil, SAVESLOT_NONE,	MENUPAGE_NEW_GAME_RELOAD}, 320, 225, MENUALIGN_CENTER,
+	},
+
+	// MENUPAGE_CHOOSE_LOAD_SLOT = 8
+	{ "FET_LG", MENUPAGE_NEW_GAME, nil, nil,
+		MENUACTION_CHECKSAVE,	"FEM_SL1", {nil, SAVESLOT_1,		0}, 40, 90, MENUALIGN_LEFT,
+		MENUACTION_CHECKSAVE,	"FEM_SL2", {nil, SAVESLOT_2,		0}, 0, 0, MENUALIGN_LEFT,
+		MENUACTION_CHECKSAVE,	"FEM_SL3", {nil, SAVESLOT_3,		0}, 0, 0, MENUALIGN_LEFT,
+		MENUACTION_CHECKSAVE,	"FEM_SL4", {nil, SAVESLOT_4,		0}, 0, 0, MENUALIGN_LEFT,
+		MENUACTION_CHECKSAVE,	"FEM_SL5", {nil, SAVESLOT_5,		0}, 0, 0, MENUALIGN_LEFT,
+		MENUACTION_CHECKSAVE,	"FEM_SL6", {nil, SAVESLOT_6,		0}, 0, 0, MENUALIGN_LEFT,
+		MENUACTION_CHECKSAVE,	"FEM_SL7", {nil, SAVESLOT_7,		0}, 0, 0, MENUALIGN_LEFT,
+		MENUACTION_CHECKSAVE,	"FEM_SL8", {nil, SAVESLOT_8,		0}, 0, 0, MENUALIGN_LEFT,
+		MENUACTION_GOBACK,		"FEDS_TB", {nil, SAVESLOT_NONE,	0}, 320, 345, MENUALIGN_CENTER,
+	},
+
+	// MENUPAGE_CHOOSE_DELETE_SLOT = 9
+	{ "FES_DEL", MENUPAGE_NEW_GAME, nil, nil,
+		MENUACTION_CHECKSAVE,	"FEM_SL1",	{nil, SAVESLOT_1,		0}, 40, 90, MENUALIGN_LEFT,
+		MENUACTION_CHECKSAVE,	"FEM_SL2",	{nil, SAVESLOT_2,		0}, 0, 0, MENUALIGN_LEFT,
+		MENUACTION_CHECKSAVE,	"FEM_SL3",	{nil, SAVESLOT_3,		0}, 0, 0, MENUALIGN_LEFT,
+		MENUACTION_CHECKSAVE,	"FEM_SL4",	{nil, SAVESLOT_4,		0}, 0, 0, MENUALIGN_LEFT,
+		MENUACTION_CHECKSAVE,	"FEM_SL5",	{nil, SAVESLOT_5,		0}, 0, 0, MENUALIGN_LEFT,
+		MENUACTION_CHECKSAVE,	"FEM_SL6",	{nil, SAVESLOT_6,		0}, 0, 0, MENUALIGN_LEFT,
+		MENUACTION_CHECKSAVE,	"FEM_SL7",	{nil, SAVESLOT_7,		0}, 0, 0, MENUALIGN_LEFT,
+		MENUACTION_CHECKSAVE,	"FEM_SL8",	{nil, SAVESLOT_8,		0}, 0, 0, MENUALIGN_LEFT,
+		MENUACTION_GOBACK,		"FEDS_TB",	{nil, SAVESLOT_NONE,	0}, 320, 345, MENUALIGN_CENTER,
+	},
+
+	// MENUPAGE_LOAD_SLOT_CONFIRM = 10
+	{ "FET_LG", MENUPAGE_CHOOSE_LOAD_SLOT, nil, nil,
+		 MENUACTION_LABEL,		"FESZ_QL",	{nil, SAVESLOT_NONE,	0}, 0, 0, 0,
+		 MENUACTION_NO,			"FEM_NO",	{nil, SAVESLOT_NONE,	MENUPAGE_CHOOSE_LOAD_SLOT}, 320, 200, MENUALIGN_CENTER,
+		 MENUACTION_YES,		"FEM_YES",	{nil, SAVESLOT_NONE,	MENUPAGE_LOADING_IN_PROGRESS}, 320, 225, MENUALIGN_CENTER,
+	},
+
+	// MENUPAGE_DELETE_SLOT_CONFIRM = 11
+	{ "FES_DEL", MENUPAGE_CHOOSE_DELETE_SLOT, nil, nil,
+		 MENUACTION_LABEL,		"FESZ_QD",	{nil, SAVESLOT_NONE,  MENUPAGE_NONE}, 0, 0, 0,
+		 MENUACTION_NO,			"FEM_NO",	{nil, SAVESLOT_NONE,  MENUPAGE_CHOOSE_DELETE_SLOT}, 320, 200, MENUALIGN_CENTER,
+		 MENUACTION_YES,		"FEM_YES",	{nil, SAVESLOT_NONE,	MENUPAGE_DELETING_IN_PROGRESS}, 320, 225, MENUALIGN_CENTER,
+	},
+
+	// MENUPAGE_LOADING_IN_PROGRESS = 12
+	{ "FET_LG", MENUPAGE_CHOOSE_LOAD_SLOT, nil, nil,
+	},
+
+	// MENUPAGE_DELETING_IN_PROGRESS = 13
+	{ "FES_DEL", MENUPAGE_CHOOSE_DELETE_SLOT, nil, nil,
+	},
+
+	// MENUPAGE_DELETE_SUCCESSFUL = 14
+	{ "FES_DEL", MENUPAGE_NEW_GAME, nil, nil,
+		 MENUACTION_LABEL,		"FES_DSC",	{nil, SAVESLOT_NONE,	0}, 0, 0, 0,
+		 MENUACTION_CHANGEMENU,	"FEM_OK",	{nil, SAVESLOT_NONE,	MENUPAGE_NEW_GAME}, 320, 225, MENUALIGN_CENTER,
+	},
+
+	// MENUPAGE_CHOOSE_SAVE_SLOT = 15
+	{ "FET_SG", MENUPAGE_DISABLED, nil, nil,
+		MENUACTION_SAVEGAME,			"FEM_SL1", {nil, SAVESLOT_1,		MENUPAGE_SAVE_OVERWRITE_CONFIRM}, 40, 90, MENUALIGN_LEFT,
+		MENUACTION_SAVEGAME,			"FEM_SL2", {nil, SAVESLOT_2,		MENUPAGE_SAVE_OVERWRITE_CONFIRM}, 0, 0, MENUALIGN_LEFT,
+		MENUACTION_SAVEGAME,			"FEM_SL3", {nil, SAVESLOT_3,		MENUPAGE_SAVE_OVERWRITE_CONFIRM}, 0, 0, MENUALIGN_LEFT,
+		MENUACTION_SAVEGAME,			"FEM_SL4", {nil, SAVESLOT_4,		MENUPAGE_SAVE_OVERWRITE_CONFIRM}, 0, 0, MENUALIGN_LEFT,
+		MENUACTION_SAVEGAME,			"FEM_SL5", {nil, SAVESLOT_5,		MENUPAGE_SAVE_OVERWRITE_CONFIRM}, 0, 0, MENUALIGN_LEFT,
+		MENUACTION_SAVEGAME,			"FEM_SL6", {nil, SAVESLOT_6,		MENUPAGE_SAVE_OVERWRITE_CONFIRM}, 0, 0, MENUALIGN_LEFT,
+		MENUACTION_SAVEGAME,			"FEM_SL7", {nil, SAVESLOT_7,		MENUPAGE_SAVE_OVERWRITE_CONFIRM}, 0, 0, MENUALIGN_LEFT,
+		MENUACTION_SAVEGAME,			"FEM_SL8", {nil, SAVESLOT_8,		MENUPAGE_SAVE_OVERWRITE_CONFIRM}, 0, 0, MENUALIGN_LEFT,
+		MENUACTION_RESUME_FROM_SAVEZONE,"FESZ_CA", {nil, SAVESLOT_NONE,	0}, 320, 345, MENUALIGN_CENTER,
+	},
+
+	// MENUPAGE_SAVE_OVERWRITE_CONFIRM = 16
+	{ "FET_SG", MENUPAGE_CHOOSE_SAVE_SLOT, nil, nil,
+		MENUACTION_LABEL,		"FESZ_QZ", {nil, SAVESLOT_NONE, MENUPAGE_NONE}, 0, 0, 0,
+		MENUACTION_NO,			"FEM_NO", {nil, SAVESLOT_NONE, MENUPAGE_CHOOSE_SAVE_SLOT}, 320, 200, MENUALIGN_CENTER,
+		MENUACTION_YES,			"FEM_YES",  {nil, SAVESLOT_NONE, MENUPAGE_SAVING_IN_PROGRESS}, 320, 225, MENUALIGN_CENTER,
+	},
+
+	// MENUPAGE_SAVING_IN_PROGRESS = 17
+	{ "FET_SG", MENUPAGE_CHOOSE_SAVE_SLOT, nil, nil,
+	},
+
+	// MENUPAGE_SAVE_SUCCESSFUL = 18
+	{ "FET_SG", MENUPAGE_CHOOSE_SAVE_SLOT, nil, nil,
+		MENUACTION_LABEL,					"FES_SSC",	{nil, SAVESLOT_LABEL,	MENUPAGE_NONE}, 0, 0, 0,
+		MENUACTION_RESUME_FROM_SAVEZONE,	"FEM_OK",	{nil, SAVESLOT_NONE,	MENUPAGE_CHOOSE_SAVE_SLOT}, 320, 225, MENUALIGN_CENTER,
+	},
+
+	// MENUPAGE_SAVE_CUSTOM_WARNING = 19
+	{ "FET_SG", MENUPAGE_NONE, nil, nil,
+		MENUACTION_LABEL,		"",			{nil, SAVESLOT_NONE, 0}, 0, 0, 0,
+		MENUACTION_CHANGEMENU,	"FEM_OK",	{nil, SAVESLOT_NONE, MENUPAGE_CHOOSE_SAVE_SLOT}, 320, 225, MENUALIGN_CENTER,
+	},
+
+	// MENUPAGE_SAVE_CHEAT_WARNING = 20
+	{ "FET_SG", MENUPAGE_NEW_GAME, nil, nil,
+		MENUACTION_LABEL,		"FES_CHE",	{nil, SAVESLOT_NONE,	MENUPAGE_NONE}, 0, 0, 0,
+		MENUACTION_CHANGEMENU,	"FEM_OK",	{nil, SAVESLOT_NONE,	MENUPAGE_CHOOSE_SAVE_SLOT}, 320, 225, MENUALIGN_CENTER,
+	},
+
+	// MENUPAGE_SKIN_SELECT = 21
+	{ "FET_PS", MENUPAGE_OPTIONS, nil, nil,
+		 MENUACTION_GOBACK,		"FEDS_TB",	{nil, SAVESLOT_NONE, MENUPAGE_OPTIONS}, 0, 0, 0,
+	},
+
+	// MENUPAGE_SAVE_UNUSED = 22
+	{ "FET_SG", MENUPAGE_NEW_GAME, nil, nil,
+		 MENUACTION_LABEL,		"FED_LWR",	{nil, SAVESLOT_NONE,	0}, 0, 0, 0,
+		 MENUACTION_CHANGEMENU,	"FEC_OKK",	{nil, SAVESLOT_NONE,	MENUPAGE_CHOOSE_SAVE_SLOT}, 0, 0, 0,
+	},
+
+	// MENUPAGE_SAVE_FAILED = 23
+	{ "FET_SG", MENUPAGE_CHOOSE_SAVE_SLOT, nil, nil,
+		 MENUACTION_LABEL,		"FEC_SVU",	{nil, SAVESLOT_NONE,	0}, 0, 0, 0,
+		 MENUACTION_CHANGEMENU,	"FEC_OKK",	{nil, SAVESLOT_NONE,	MENUPAGE_CHOOSE_SAVE_SLOT}, 0, 0, 0,
+	},
+
+	// MENUPAGE_SAVE_FAILED_2 = 24
+	{ "FET_LG", MENUPAGE_CHOOSE_SAVE_SLOT, nil, nil,
+		 MENUACTION_LABEL,		"FEC_SVU",	{nil, SAVESLOT_NONE,	0}, 0, 0, 0,
+	},
+
+	// MENUPAGE_LOAD_FAILED = 25
+	{ "FET_LG", MENUPAGE_NEW_GAME, nil, nil,
+		 MENUACTION_LABEL,		"FEC_LUN",	{nil, SAVESLOT_NONE,  0}, 0, 0, 0,
+		 MENUACTION_GOBACK,		"FEDS_TB",	{nil, SAVESLOT_NONE,  MENUPAGE_NEW_GAME}, 0, 0, 0,
+	},
+
+	// MENUPAGE_CONTROLLER_PC = 26
+	{ "FET_CTL", MENUPAGE_OPTIONS, new CCustomScreenLayout({0, 0, MENU_DEFAULT_LINE_HEIGHT, false, false, 150}), nil,
+#ifdef PC_PLAYER_CONTROLS
+		MENUACTION_CTRLMETHOD,	"FET_STI", {nil, SAVESLOT_NONE, MENUPAGE_CONTROLLER_PC}, 320, 150, MENUALIGN_CENTER,
+		MENUACTION_KEYBOARDCTRLS,"FEC_RED", {nil, SAVESLOT_NONE, MENUPAGE_KEYBOARD_CONTROLS}, 0, 0, MENUALIGN_CENTER,
+#else
+		MENUACTION_KEYBOARDCTRLS,"FEC_RED", {nil, SAVESLOT_NONE, MENUPAGE_KEYBOARD_CONTROLS}, 320, 150, MENUALIGN_CENTER,
+#endif
+#ifdef GAMEPAD_MENU
+		MENUACTION_CHANGEMENU,	"FET_AGS", {nil, SAVESLOT_NONE, MENUPAGE_CONTROLLER_SETTINGS}, 0, 0, MENUALIGN_CENTER,
+#endif
+#ifdef DETECT_JOYSTICK_MENU
+		MENUACTION_CHANGEMENU,	"FEC_JOD", {nil, SAVESLOT_NONE, MENUPAGE_DETECT_JOYSTICK}, 0, 0, MENUALIGN_CENTER,
+#endif
+		MENUACTION_CHANGEMENU,	"FEC_MOU", {nil, SAVESLOT_NONE, MENUPAGE_MOUSE_CONTROLS}, 0, 0, MENUALIGN_CENTER,
+		MENUACTION_RESTOREDEF,	"FET_DEF", {nil, SAVESLOT_NONE, MENUPAGE_CONTROLLER_PC}, 320, 0, MENUALIGN_CENTER,
+		MENUACTION_GOBACK,		"FEDS_TB", {nil, SAVESLOT_NONE, 0}, 320, 0, MENUALIGN_CENTER,
+   },
+
+	// MENUPAGE_OPTIONS = 27
+	{ "FET_OPT", MENUPAGE_NONE, nil, nil,
+		 MENUACTION_CHANGEMENU,		"FEO_CON", {nil, SAVESLOT_NONE, MENUPAGE_CONTROLLER_PC}, 320, 132, MENUALIGN_CENTER,
+		 MENUACTION_LOADRADIO,		"FEO_AUD", {nil, SAVESLOT_NONE, MENUPAGE_SOUND_SETTINGS}, 0, 0, MENUALIGN_CENTER,
+		 MENUACTION_CHANGEMENU,		"FEO_DIS", {nil, SAVESLOT_NONE, MENUPAGE_DISPLAY_SETTINGS}, 0, 0, MENUALIGN_CENTER,
+#ifdef GRAPHICS_MENU_OPTIONS
+		 MENUACTION_CHANGEMENU,		"FET_GFX", {nil, SAVESLOT_NONE, MENUPAGE_GRAPHICS_SETTINGS}, 0, 0, MENUALIGN_CENTER,
+#endif
+		 MENUACTION_CHANGEMENU,		"FEO_LAN", {nil, SAVESLOT_NONE, MENUPAGE_LANGUAGE_SETTINGS}, 0, 0, MENUALIGN_CENTER,
+		 MENUACTION_PLAYERSETUP,	"FET_PS", {nil, SAVESLOT_NONE, MENUPAGE_SKIN_SELECT}, 0, 0, MENUALIGN_CENTER,
+		 MENUACTION_GOBACK,			"FEDS_TB", {nil, SAVESLOT_NONE, 0}, 0, 0, MENUALIGN_CENTER,
+   },
+
+	// MENUPAGE_EXIT = 28
+	{ "FET_QG", MENUPAGE_NONE, nil, nil,
+		MENUACTION_LABEL,		"FEQ_SRE",	{nil, SAVESLOT_NONE, 0}, 0, 0, 0,
+		MENUACTION_DONTCANCEL,	"FEM_NO",	{nil, SAVESLOT_NONE, MENUPAGE_NONE}, 320, 200, MENUALIGN_CENTER,
+		MENUACTION_CANCELGAME,	"FEM_YES",	{nil, SAVESLOT_NONE, MENUPAGE_NONE}, 320, 225, MENUALIGN_CENTER,
+   },
+
+	// MENUPAGE_START_MENU = 29
+	{ "FEM_MM", MENUPAGE_DISABLED, nil, nil,
+		  MENUACTION_CHANGEMENU,	"FEP_STG",	{nil, SAVESLOT_NONE,	MENUPAGE_NEW_GAME}, 320, 170, MENUALIGN_CENTER,
+		  MENUACTION_CHANGEMENU,	"FEP_OPT",	{nil, SAVESLOT_NONE,	MENUPAGE_OPTIONS}, 0, 0, MENUALIGN_CENTER,
+		  MENUACTION_CHANGEMENU,	"FEP_QUI",	{nil, SAVESLOT_NONE,	MENUPAGE_EXIT}, 0, 0, MENUALIGN_CENTER,
+   },
+
+	// MENUPAGE_KEYBOARD_CONTROLS = 30
+	{ "FET_STI", MENUPAGE_CONTROLLER_PC, nil, nil,
+   },
+
+	// MENUPAGE_MOUSE_CONTROLS = 31
+	{ "FEC_MOU", MENUPAGE_CONTROLLER_PC, nil, nil,
+		MENUACTION_MOUSESENS,	"FEC_MSH",	{nil, SAVESLOT_NONE, MENUPAGE_MOUSE_CONTROLS}, 40, 170, MENUALIGN_LEFT,
+		MENUACTION_INVVERT,		"FEC_IVV",	{nil, SAVESLOT_NONE, MENUPAGE_MOUSE_CONTROLS}, 0, 0, MENUALIGN_LEFT,
+#ifndef GAMEPAD_MENU
+	   INVERT_PAD_SELECTOR
+#endif
+		MENUACTION_MOUSESTEER,	"FET_MST",	{nil, SAVESLOT_NONE, MENUPAGE_MOUSE_CONTROLS}, 0, 0, MENUALIGN_LEFT,
+		MENUACTION_GOBACK,		"FEDS_TB",	{nil, SAVESLOT_NONE, 0}, 320, 0, MENUALIGN_CENTER,
+		//MENUACTION_GOBACK,		"FEDS_TB",	{nil, SAVESLOT_NONE, 0}, 320, 260, MENUALIGN_CENTER, // original y
+   },
+
+	// MENUPAGE_PAUSE_MENU = 32
+	{ "FET_PAU", MENUPAGE_DISABLED, nil, nil,
+		MENUACTION_RESUME,		"FEP_RES",	{nil, SAVESLOT_NONE, 0}, 320, 120, MENUALIGN_CENTER,
+		MENUACTION_CHANGEMENU,	"FEH_SGA",	{nil, SAVESLOT_NONE, MENUPAGE_NEW_GAME}, 0, 0, MENUALIGN_CENTER,
+		MENUACTION_CHANGEMENU,	"FEH_MAP",	{nil, SAVESLOT_NONE, MENUPAGE_MAP}, 0, 0, MENUALIGN_CENTER,
+		MENUACTION_CHANGEMENU,	"FEP_STA",	{nil, SAVESLOT_NONE, MENUPAGE_STATS}, 0, 0, MENUALIGN_CENTER,
+		MENUACTION_CHANGEMENU,	"FEH_BRI",	{nil, SAVESLOT_NONE, MENUPAGE_BRIEFS}, 0, 0, MENUALIGN_CENTER,
+		MENUACTION_CHANGEMENU,	"FET_OPT",	{nil, SAVESLOT_NONE, MENUPAGE_OPTIONS}, 0, 0, MENUALIGN_CENTER,
+		MENUACTION_CHANGEMENU,	"FEP_QUI",	{nil, SAVESLOT_NONE, MENUPAGE_EXIT}, 0, 0, MENUALIGN_CENTER,
+   },
+
+	// MENUPAGE_NONE = 33
+	{ "", 0, nil, nil, },
+
+#ifdef GAMEPAD_MENU
+	{ "FET_AGS", MENUPAGE_CONTROLLER_PC, new CCustomScreenLayout({40, 78, 25, true, true}), nil,
+		MENUACTION_CTRLCONFIG,		"FEC_CCF", { nil, SAVESLOT_NONE, MENUPAGE_CONTROLLER_SETTINGS }, 40, 76, MENUALIGN_LEFT,
+		MENUACTION_CTRLDISPLAY,		"FEC_CDP", { nil, SAVESLOT_NONE, MENUPAGE_CONTROLLER_SETTINGS }, 0, 0, MENUALIGN_LEFT,
+		INVERT_PAD_SELECTOR
+		MENUACTION_CTRLVIBRATION,	"FEC_VIB", { nil, SAVESLOT_NONE, MENUPAGE_CONTROLLER_SETTINGS }, 0, 0, MENUALIGN_LEFT,
+		SELECT_CONTROLLER_TYPE
+		MENUACTION_GOBACK,		"FEDS_TB", { nil, SAVESLOT_NONE, MENUPAGE_NONE }, 0, 0, MENUALIGN_LEFT,
+	},
+#endif
+#ifdef LEGACY_MENU_OPTIONS
+	// MENUPAGE_DEBUG_MENU = 18
+	{ "FED_DBG", MENUPAGE_NONE, nil, nil,
+		MENUACTION_RELOADIDE,	"FED_RID", {nil, SAVESLOT_NONE, MENUPAGE_NONE}, 0, 0, 0,
+		MENUACTION_SETDBGFLAG,	"FED_DFL", {nil, SAVESLOT_NONE, MENUPAGE_NONE}, 0, 0, 0,
+		MENUACTION_SWITCHBIGWHITEDEBUGLIGHT,	"FED_DLS", {nil, SAVESLOT_NONE, MENUPAGE_NONE}, 0, 0, 0,
+		MENUACTION_COLLISIONPOLYS,	"FED_SCP", {nil, SAVESLOT_NONE, MENUPAGE_NONE}, 0, 0, 0,
+		MENUACTION_GOBACK,		"FEDS_TB", {nil, SAVESLOT_NONE, MENUPAGE_NONE}, 0, 0, 0,
+   },
+
+	// MENUPAGE_CONTROLLER_PC_OLD1 = 36
+	{ "FET_CTL", MENUPAGE_CONTROLLER_PC, nil, nil,
+		MENUACTION_GETKEY,	"FEC_PLB", {nil, SAVESLOT_NONE, MENUPAGE_CONTROLLER_PC_OLD1}, 0, 0, 0,
+		MENUACTION_GETKEY,	"FEC_CWL", {nil, SAVESLOT_NONE, MENUPAGE_CONTROLLER_PC_OLD1}, 0, 0, 0,
+		MENUACTION_GETKEY,	"FEC_CWR", {nil, SAVESLOT_NONE, MENUPAGE_CONTROLLER_PC_OLD1}, 0, 0, 0,
+		MENUACTION_GETKEY,	"FEC_LKT", {nil, SAVESLOT_NONE, MENUPAGE_CONTROLLER_PC_OLD1}, 0, 0, 0,
+		MENUACTION_GETKEY,	"FEC_PJP", {nil, SAVESLOT_NONE, MENUPAGE_CONTROLLER_PC_OLD1}, 0, 0, 0,
+		MENUACTION_GETKEY,	"FEC_PSP", {nil, SAVESLOT_NONE, MENUPAGE_CONTROLLER_PC_OLD1}, 0, 0, 0,
+		MENUACTION_GETKEY,	"FEC_TLF", {nil, SAVESLOT_NONE, MENUPAGE_CONTROLLER_PC_OLD1}, 0, 0, 0,
+		MENUACTION_GETKEY,	"FEC_TRG", {nil, SAVESLOT_NONE, MENUPAGE_CONTROLLER_PC_OLD1}, 0, 0, 0,
+		MENUACTION_GETKEY,	"FEC_CCM", {nil, SAVESLOT_NONE, MENUPAGE_CONTROLLER_PC_OLD1}, 0, 0, 0,
+		MENUACTION_GOBACK,		"FEDS_TB", {nil, SAVESLOT_NONE, MENUPAGE_NONE}, 0, 0, 0,
+   },
+
+	// MENUPAGE_CONTROLLER_PC_OLD2 = 37
+	{ "FET_CTL", MENUPAGE_CONTROLLER_PC, nil, nil,
+
+	},
+
+	// MENUPAGE_CONTROLLER_PC_OLD3 = 38
+	{ "FET_CTL", MENUPAGE_CONTROLLER_PC, nil, nil,
+		 MENUACTION_GETKEY,	"FEC_LUP", {nil, SAVESLOT_NONE, MENUPAGE_CONTROLLER_PC_OLD3}, 0, 0, 0,
+		 MENUACTION_GETKEY,	"FEC_LDN", {nil, SAVESLOT_NONE, MENUPAGE_CONTROLLER_PC_OLD3}, 0, 0, 0,
+		 MENUACTION_GETKEY,	"FEC_SMS", {nil, SAVESLOT_NONE, MENUPAGE_CONTROLLER_PC_OLD3}, 0, 0, 0,
+		 MENUACTION_SHOWHEADBOB,	"FEC_GSL", {nil, SAVESLOT_NONE, MENUPAGE_CONTROLLER_PC_OLD3}, 0, 0, 0,
+		 MENUACTION_GOBACK,		"FEDS_TB", {nil, SAVESLOT_NONE, MENUPAGE_NONE}, 0, 0, 0,
+   },
+
+	// MENUPAGE_CONTROLLER_PC_OLD4 = 39
+	{ "FET_CTL", MENUPAGE_CONTROLLER_PC, nil, nil,
+
+	},
+
+	// MENUPAGE_CONTROLLER_DEBUG = 40
+	{ "FEC_DBG", MENUPAGE_CONTROLLER_PC, nil, nil,
+		 MENUACTION_GETKEY,	"FEC_TGD",	{nil, SAVESLOT_NONE, MENUPAGE_CONTROLLER_DEBUG}, 0, 0, 0,
+		 MENUACTION_GETKEY,	"FEC_TDO",	{nil, SAVESLOT_NONE, MENUPAGE_CONTROLLER_DEBUG}, 0, 0, 0,
+		 MENUACTION_GETKEY,	"FEC_TSS",	{nil, SAVESLOT_NONE, MENUPAGE_CONTROLLER_DEBUG}, 0, 0, 0,
+		 MENUACTION_GETKEY,	"FEC_SMS",	{nil, SAVESLOT_NONE, MENUPAGE_CONTROLLER_DEBUG}, 0, 0, 0,
+		 MENUACTION_GOBACK,	"FEDS_TB",	{nil, SAVESLOT_NONE, MENUPAGE_NONE}, 0, 0, 0,
+   },
+#endif
+
+#ifdef GRAPHICS_MENU_OPTIONS
+	// MENUPAGE_GRAPHICS_SETTINGS
+	{ "FET_GFX", MENUPAGE_OPTIONS, new CCustomScreenLayout({40, 78, 25, true, true}), GraphicsGoBack,
+
+		MENUACTION_SCREENRES,	"FED_RES", { nil, SAVESLOT_NONE, MENUPAGE_GRAPHICS_SETTINGS }, 0, 0, MENUALIGN_LEFT,
+		MENUACTION_WIDESCREEN,	"FED_WIS", { nil, SAVESLOT_NONE, MENUPAGE_GRAPHICS_SETTINGS }, 0, 0, MENUALIGN_LEFT,
+		VIDEOMODE_SELECTOR
+#ifdef LEGACY_MENU_OPTIONS
+		MENUACTION_FRAMESYNC,	"FEM_VSC", {nil, SAVESLOT_NONE, MENUPAGE_GRAPHICS_SETTINGS}, 0, 0, MENUALIGN_LEFT,
+#endif
+		MENUACTION_FRAMELIMIT,	"FEM_FRM", { nil, SAVESLOT_NONE, MENUPAGE_GRAPHICS_SETTINGS }, 0, 0, MENUALIGN_LEFT,
+		MULTISAMPLING_SELECTOR
+		ISLAND_LOADING_SELECTOR
+		DUALPASS_SELECTOR
+#ifdef EXTENDED_COLOURFILTER
+		POSTFX_SELECTORS
+#elif defined LEGACY_MENU_OPTIONS
+		MENUACTION_TRAILS,		"FED_TRA", { nil, SAVESLOT_NONE, MENUPAGE_GRAPHICS_SETTINGS }, 0, 0, MENUALIGN_LEFT,
+#endif
+		// re3.cpp inserts here pipeline selectors if neo/neo.txd exists and EXTENDED_PIPELINES defined
+		MENUACTION_CFO_DYNAMIC,	"FET_DEF", { new CCFODynamic(nil, nil, nil, nil, RestoreDefGraphics) }, 320, 0, MENUALIGN_CENTER,
+		MENUACTION_GOBACK,		"FEDS_TB", {nil, SAVESLOT_NONE, MENUPAGE_NONE}, 320, 0, MENUALIGN_CENTER,
+	},
+#endif
+
+#ifdef DETECT_JOYSTICK_MENU
+	// MENUPAGE_DETECT_JOYSTICK
+	{ "FEC_JOD", MENUPAGE_CONTROLLER_PC, new CCustomScreenLayout({0, 0, 0, false, false, 30}), DetectJoystickGoBack,
+		MENUACTION_LABEL,	"FEC_JPR", { nil, SAVESLOT_NONE, MENUPAGE_NONE }, 0, 0, 0,
+		MENUACTION_CFO_DYNAMIC,	"FEC_JDE", { new CCFODynamic(nil, nil, nil, DetectJoystickDraw, nil) }, 80, 200, MENUALIGN_LEFT,
+		MENUACTION_GOBACK,		"FEDS_TB", {nil, SAVESLOT_NONE, MENUPAGE_NONE}, 320, 225, MENUALIGN_CENTER,
+	},
+#endif
+
+	// MENUPAGE_OUTRO = 34
+	{ "", 0, nil, nil, },
+};
+
+#endif
+#endif
diff --git a/src/core/Pad.cpp b/src/core/Pad.cpp
new file mode 100644
index 0000000..e75510e
--- /dev/null
+++ b/src/core/Pad.cpp
@@ -0,0 +1,3633 @@
+#define WITHDINPUT
+#include "common.h"
+#include "crossplatform.h"
+#include "platform.h"
+#ifdef XINPUT
+#include <xinput.h>
+#if !defined(PSAPI_VERSION) || (PSAPI_VERSION > 1)
+#pragma comment( lib, "Xinput9_1_0.lib" )
+#else
+#pragma comment( lib, "Xinput.lib" )
+#endif
+#endif
+
+#include "Pad.h"
+#include "ControllerConfig.h"
+#include "Timer.h"
+#include "Frontend.h"
+#include "Camera.h"
+#include "Game.h"
+#include "CutsceneMgr.h"
+#include "Font.h"
+#include "Hud.h"
+#include "Text.h"
+#include "Timer.h"
+#include "Record.h"
+#include "World.h"
+#include "Vehicle.h"
+#include "Ped.h"
+#include "Population.h"
+#include "Record.h"
+#include "Replay.h"
+#include "Weather.h"
+#include "Streaming.h"
+#include "PathFind.h"
+#include "Wanted.h"
+#include "WaterLevel.h"
+#include "General.h"
+#include "Fluff.h"
+#include "Gangs.h"
+#include "platform.h"
+#include "Stats.h"
+#include "CarCtrl.h"
+#include "TrafficLights.h"
+
+#ifdef GTA_PS2
+#include "eetypes.h"
+#include "libpad.h"
+#endif
+
+CPad Pads[MAX_PADS];
+#ifdef GTA_PS2
+u_long128 pad_dma_buf[scePadDmaBufferMax] __attribute__((aligned(64)));
+u_long128 pad2_dma_buf[scePadDmaBufferMax] __attribute__((aligned(64)));
+#endif
+
+CMousePointerStateHelper MousePointerStateHelper;
+
+bool CPad::bDisplayNoControllerMessage;
+bool CPad::bObsoleteControllerMessage;
+bool CPad::bOldDisplayNoControllerMessage;
+bool CPad::m_bMapPadOneToPadTwo;
+bool CPad::m_bDebugCamPCOn;
+bool CPad::bHasPlayerCheated;
+bool CPad::bInvertLook4Pad;
+#ifdef GTA_PS2
+unsigned char act_direct[6];
+unsigned char act_align[6];
+#endif
+
+CKeyboardState CPad::OldKeyState;
+CKeyboardState CPad::NewKeyState;
+CKeyboardState CPad::TempKeyState;
+
+char CPad::KeyBoardCheatString[30];
+
+CMouseControllerState CPad::OldMouseControllerState;
+CMouseControllerState CPad::NewMouseControllerState;
+CMouseControllerState CPad::PCTempMouseControllerState;
+
+#ifdef DETECT_PAD_INPUT_SWITCH
+bool CPad::IsAffectedByController = false;
+#endif
+
+_TODO("gbFastTime");
+extern bool gbFastTime;
+
+#ifdef WALLCLIMB_CHEAT
+extern bool gGravityCheat;
+#endif
+
+void SpecialCarCheats()
+{
+	if ( !CVehicle::bCheat9 )
+	{
+		((CVehicleModelInfo*)CModelInfo::GetModelInfo(MI_INFERNUS))->m_wheelScale *= 1.3f;
+		((CVehicleModelInfo*)CModelInfo::GetModelInfo(MI_CHEETAH))->m_wheelScale *= 1.3f;
+		((CVehicleModelInfo*)CModelInfo::GetModelInfo(MI_PHEONIX))->m_wheelScale *= 1.3f;
+		((CVehicleModelInfo*)CModelInfo::GetModelInfo(MI_DELUXO))->m_wheelScale *= 1.3f;
+		mod_HandlingManager.GetHandlingData(HANDLING_LANDSTAL)->Transmission.fEngineAcceleration *= 2.0f;
+		mod_HandlingManager.GetHandlingData(HANDLING_PATRIOT)->Transmission.fEngineAcceleration *= 2.0f;
+		mod_HandlingManager.GetHandlingData(HANDLING_BOBCAT)->Transmission.fEngineAcceleration *= 2.0f;
+		mod_HandlingManager.GetHandlingData(HANDLING_BFINJECT)->Transmission.fEngineAcceleration *= 2.0f;
+		mod_HandlingManager.GetHandlingData(HANDLING_RANCHER)->Transmission.fEngineAcceleration *= 2.0f;
+		mod_HandlingManager.GetHandlingData(HANDLING_DESPERAD)->Transmission.fEngineAcceleration *= 2.0f;
+		mod_HandlingManager.GetHandlingData(HANDLING_DELUXO)->Transmission.fEngineAcceleration *= 2.0f;
+
+		mod_HandlingManager.GetHandlingData(HANDLING_BAGGAGE)->Transmission.fEngineAcceleration *= 2.0f;
+		mod_HandlingManager.GetHandlingData(HANDLING_BAGGAGE)->Transmission.fMaxVelocity *= 2.0f;
+		mod_HandlingManager.GetHandlingData(HANDLING_BAGGAGE)->Transmission.InitGearRatios();
+
+		mod_HandlingManager.GetHandlingData(HANDLING_GOLFCART)->Transmission.fEngineAcceleration *= 2.0f;
+		mod_HandlingManager.GetHandlingData(HANDLING_GOLFCART)->Transmission.fMaxVelocity *= 2.0f;
+		mod_HandlingManager.GetHandlingData(HANDLING_GOLFCART)->Transmission.InitGearRatios();
+
+		mod_HandlingManager.GetHandlingData(HANDLING_STINGER)->fCollisionDamageMultiplier *= 0.25f;
+		mod_HandlingManager.GetHandlingData(HANDLING_STINGER)->fMass *= 2.5f;
+		mod_HandlingManager.GetHandlingData(HANDLING_STINGER)->fTurnMass *= 4.0f;
+
+		mod_HandlingManager.GetHandlingData(HANDLING_BANSHEE)->fCollisionDamageMultiplier *= 0.25f;
+		mod_HandlingManager.GetHandlingData(HANDLING_BANSHEE)->fMass *= 2.5f;
+		mod_HandlingManager.GetHandlingData(HANDLING_BANSHEE)->fTurnMass *= 4.0f;
+
+		mod_HandlingManager.GetHandlingData(HANDLING_SABRETUR)->fCollisionDamageMultiplier *= 0.25f;
+		mod_HandlingManager.GetHandlingData(HANDLING_SABRETUR)->fMass *= 2.5f;
+		mod_HandlingManager.GetHandlingData(HANDLING_SABRETUR)->fTurnMass *= 4.0f;
+
+		mod_HandlingManager.GetHandlingData(HANDLING_COMET)->fCollisionDamageMultiplier *= 0.25f;
+		mod_HandlingManager.GetHandlingData(HANDLING_COMET)->fMass *= 2.5f;
+		mod_HandlingManager.GetHandlingData(HANDLING_COMET)->fTurnMass *= 4.0f;
+
+		mod_HandlingManager.GetHandlingData(HANDLING_DELUXO)->fCollisionDamageMultiplier *= 0.25f;
+		mod_HandlingManager.GetHandlingData(HANDLING_DELUXO)->fMass *= 2.5f;
+		mod_HandlingManager.GetHandlingData(HANDLING_DELUXO)->fTurnMass *= 4.0f;
+		CHud::SetHelpMessage(TheText.Get("CHEAT1"), true);
+		CVehicle::bCheat9 = true;
+		CPad::bHasPlayerCheated = true;
+	}
+}
+
+void PickUpChicksCheat()
+{
+	if ( FindPlayerVehicle() && (FindPlayerVehicle()->IsCar() || FindPlayerVehicle()->IsBike()) )
+	{
+		CVehicle *vehicle = FindPlayerVehicle();
+		if ( FindPlayerVehicle()->IsBike() )
+		{
+			if ( vehicle->pPassengers[0] )
+				vehicle->pPassengers[0]->SetObjective(OBJECTIVE_LEAVE_CAR, vehicle);
+		}
+		CPed* someoneElse = (CPed*)CWorld::TestSphereAgainstWorld(vehicle->GetPosition(), 6.0f, FindPlayerPed(), false, false, true, false, false, false);
+		if ( someoneElse && someoneElse->m_nPedState != PED_DRIVING )
+		{
+			CHud::SetHelpMessage(TheText.Get("CHEAT1"), true);
+			someoneElse->SetObjective(OBJECTIVE_ENTER_CAR_AS_PASSENGER, vehicle);
+		}
+	}
+}
+
+void WeaponCheat1()
+{
+	CHud::SetHelpMessage(TheText.Get("CHEAT2"), true);
+
+	CStreaming::RequestModel(MI_BRASS_KNUCKLES, STREAMFLAGS_DONT_REMOVE);
+	CStreaming::RequestModel(MI_BASEBALL_BAT, STREAMFLAGS_DONT_REMOVE);
+	CStreaming::RequestModel(MI_MOLOTOV, STREAMFLAGS_DONT_REMOVE);
+	CStreaming::RequestModel(MI_COLT45, STREAMFLAGS_DONT_REMOVE);
+	CStreaming::RequestModel(MI_SHOTGUN, STREAMFLAGS_DONT_REMOVE);
+	CStreaming::RequestModel(MI_TEC9, STREAMFLAGS_DONT_REMOVE);
+	CStreaming::RequestModel(MI_RUGER, STREAMFLAGS_DONT_REMOVE);
+	CStreaming::RequestModel(MI_SNIPERRIFLE, STREAMFLAGS_DONT_REMOVE);
+	CStreaming::RequestModel(MI_FLAMETHROWER, STREAMFLAGS_DONT_REMOVE);
+	CStreaming::LoadAllRequestedModels(false);
+
+	FindPlayerPed()->GiveWeapon(WEAPONTYPE_BRASSKNUCKLE, 1);
+	FindPlayerPed()->GiveWeapon(WEAPONTYPE_BASEBALLBAT, 1);
+	FindPlayerPed()->GiveWeapon(WEAPONTYPE_MOLOTOV, 10);
+	FindPlayerPed()->GiveWeapon(WEAPONTYPE_COLT45, 100);
+	FindPlayerPed()->GiveWeapon(WEAPONTYPE_SHOTGUN, 50);
+	FindPlayerPed()->GiveWeapon(WEAPONTYPE_TEC9, 150);
+	FindPlayerPed()->GiveWeapon(WEAPONTYPE_RUGER, 120);
+	FindPlayerPed()->GiveWeapon(WEAPONTYPE_SNIPERRIFLE, 25);
+	FindPlayerPed()->GiveWeapon(WEAPONTYPE_FLAMETHROWER, 200);
+
+	CStreaming::SetModelIsDeletable(MI_BRASS_KNUCKLES);
+	CStreaming::SetModelIsDeletable(MI_BASEBALL_BAT);
+	CStreaming::SetModelIsDeletable(MI_MOLOTOV);
+	CStreaming::SetModelIsDeletable(MI_COLT45);
+	CStreaming::SetModelIsDeletable(MI_SHOTGUN);
+	CStreaming::SetModelIsDeletable(MI_TEC9);
+	CStreaming::SetModelIsDeletable(MI_RUGER);
+	CStreaming::SetModelIsDeletable(MI_SNIPERRIFLE);
+	CStreaming::SetModelIsDeletable(MI_FLAMETHROWER);
+#ifdef MOBILE_IMPROVEMENTS
+	if (FindPlayerVehicle()) {
+		FindPlayerPed()->RemoveWeaponWhenEnteringVehicle();
+	}
+#endif
+}
+
+void WeaponCheat2()
+{
+	CHud::SetHelpMessage(TheText.Get("CHEAT2"), true);
+
+	CStreaming::RequestModel(MI_KATANA, STREAMFLAGS_DONT_REMOVE);
+	CStreaming::RequestModel(MI_GRENADE, STREAMFLAGS_DONT_REMOVE);
+	CStreaming::RequestModel(MI_BOMB, STREAMFLAGS_DONT_REMOVE);
+	CStreaming::RequestModel(MI_PYTHON, STREAMFLAGS_DONT_REMOVE);
+	CStreaming::RequestModel(MI_STUBBY_SHOTGUN, STREAMFLAGS_DONT_REMOVE);
+	CStreaming::RequestModel(MI_SILENCEDINGRAM, STREAMFLAGS_DONT_REMOVE);
+	CStreaming::RequestModel(MI_M4, STREAMFLAGS_DONT_REMOVE);
+	CStreaming::RequestModel(MI_LASERSCOPE, STREAMFLAGS_DONT_REMOVE);
+	CStreaming::RequestModel(MI_ROCKETLAUNCHER, STREAMFLAGS_DONT_REMOVE);
+	CStreaming::LoadAllRequestedModels(false);
+
+#ifdef FIX_BUGS
+	FindPlayerPed()->GiveWeapon(WEAPONTYPE_KATANA, 1);
+#else
+	FindPlayerPed()->GiveWeapon(WEAPONTYPE_KATANA, 0);
+#endif
+	FindPlayerPed()->GiveWeapon(WEAPONTYPE_DETONATOR_GRENADE, 10);
+	FindPlayerPed()->GiveWeapon(WEAPONTYPE_PYTHON, 40);
+	FindPlayerPed()->GiveWeapon(WEAPONTYPE_STUBBY_SHOTGUN, 25);
+	FindPlayerPed()->GiveWeapon(WEAPONTYPE_SILENCED_INGRAM, 100);
+	FindPlayerPed()->GiveWeapon(WEAPONTYPE_M4, 150);
+	FindPlayerPed()->GiveWeapon(WEAPONTYPE_LASERSCOPE, 21);
+	FindPlayerPed()->GiveWeapon(WEAPONTYPE_ROCKETLAUNCHER, 5);
+
+	CStreaming::SetModelIsDeletable(MI_KATANA);
+	CStreaming::SetModelIsDeletable(MI_GRENADE);
+	CStreaming::SetModelIsDeletable(MI_BOMB);
+	CStreaming::SetModelIsDeletable(MI_PYTHON);
+	CStreaming::SetModelIsDeletable(MI_STUBBY_SHOTGUN);
+	CStreaming::SetModelIsDeletable(MI_SILENCEDINGRAM);
+	CStreaming::SetModelIsDeletable(MI_M4);
+	CStreaming::SetModelIsDeletable(MI_LASERSCOPE);
+	CStreaming::SetModelIsDeletable(MI_ROCKETLAUNCHER);
+#ifdef MOBILE_IMPROVEMENTS
+	if (FindPlayerVehicle()) {
+		FindPlayerPed()->RemoveWeaponWhenEnteringVehicle();
+	}
+#endif
+}
+
+void WeaponCheat3()
+{
+	CHud::SetHelpMessage(TheText.Get("CHEAT2"), true);
+
+	CStreaming::RequestModel(MI_CHAINSAW, STREAMFLAGS_DONT_REMOVE);
+	CStreaming::RequestModel(MI_GRENADE, STREAMFLAGS_DONT_REMOVE);
+	CStreaming::RequestModel(MI_PYTHON, STREAMFLAGS_DONT_REMOVE);
+	CStreaming::RequestModel(MI_SPAS12_SHOTGUN, STREAMFLAGS_DONT_REMOVE);
+	CStreaming::RequestModel(MI_MP5, STREAMFLAGS_DONT_REMOVE);
+	CStreaming::RequestModel(MI_M4, STREAMFLAGS_DONT_REMOVE);
+	CStreaming::RequestModel(MI_LASERSCOPE, STREAMFLAGS_DONT_REMOVE);
+	CStreaming::RequestModel(MI_MINIGUN, STREAMFLAGS_DONT_REMOVE);
+	CStreaming::RequestModel(MI_MINIGUN2, STREAMFLAGS_DONT_REMOVE);
+	CStreaming::LoadAllRequestedModels(false);
+
+#ifdef FIX_BUGS
+	FindPlayerPed()->GiveWeapon(WEAPONTYPE_CHAINSAW, 1);
+#else
+	FindPlayerPed()->GiveWeapon(WEAPONTYPE_CHAINSAW, 0);
+#endif
+	FindPlayerPed()->GiveWeapon(WEAPONTYPE_GRENADE, 10);
+	FindPlayerPed()->GiveWeapon(WEAPONTYPE_PYTHON, 40);
+	FindPlayerPed()->GiveWeapon(WEAPONTYPE_SPAS12_SHOTGUN, 30);
+	FindPlayerPed()->GiveWeapon(WEAPONTYPE_MP5, 100);
+	FindPlayerPed()->GiveWeapon(WEAPONTYPE_M4, 150);
+	FindPlayerPed()->GiveWeapon(WEAPONTYPE_LASERSCOPE, 21);
+	FindPlayerPed()->GiveWeapon(WEAPONTYPE_MINIGUN, 500);
+
+	CStreaming::SetModelIsDeletable(MI_CHAINSAW);
+	CStreaming::SetModelIsDeletable(MI_GRENADE);
+	CStreaming::SetModelIsDeletable(MI_PYTHON);
+	CStreaming::SetModelIsDeletable(MI_SPAS12_SHOTGUN);
+	CStreaming::SetModelIsDeletable(MI_MP5);
+	CStreaming::SetModelIsDeletable(MI_M4);
+	CStreaming::SetModelIsDeletable(MI_LASERSCOPE);
+	CStreaming::SetModelIsDeletable(MI_MINIGUN);
+	CStreaming::SetModelIsDeletable(MI_MINIGUN2);
+
+#ifdef MOBILE_IMPROVEMENTS
+	if (FindPlayerVehicle()) {
+		FindPlayerPed()->RemoveWeaponWhenEnteringVehicle();
+	}
+#endif
+}
+
+void HealthCheat()
+{
+	CHud::SetHelpMessage(TheText.Get("CHEAT3"), true);
+	FindPlayerPed()->m_fHealth = CWorld::Players[0].m_nMaxHealth;
+	if (FindPlayerVehicle()) {
+		FindPlayerVehicle()->m_fHealth = 1000.0f;
+		if (FindPlayerVehicle()->m_vehType == VEHICLE_TYPE_CAR) {
+			((CAutomobile*)FindPlayerVehicle())->Damage.SetEngineStatus(0);
+			for (int32 i = 0; i < 4; i++)
+				((CAutomobile*)FindPlayerVehicle())->Damage.SetWheelStatus(i, WHEEL_STATUS_OK);
+		}
+	}
+}
+
+// TODO(Miami): this is HELLA different on mobile, although it mostly has debug oriented things like player exiting it's current car and enters spawned one etc.
+void VehicleCheat(int model)
+{
+	CHud::SetHelpMessage(TheText.Get("CHEAT1"), true);
+	CStreaming::RequestModel(model, STREAMFLAGS_DONT_REMOVE);
+	CStreaming::LoadAllRequestedModels(false);
+	if (CStreaming::ms_aInfoForModel[model].m_loadState == STREAMSTATE_LOADED) {
+		CHud::SetHelpMessage(TheText.Get("CHEAT1"), true);
+
+		if (!(CStreaming::ms_aInfoForModel[model].m_loadState & STREAMFLAGS_DONT_REMOVE)) {
+			CStreaming::SetModelIsDeletable(model);
+			CStreaming::SetModelTxdIsDeletable(model);
+		}
+
+		int32 node = ThePaths.FindNodeClosestToCoors(FindPlayerCoors(), PATH_CAR, 100.0f);
+		if (node < 0) return;
+
+#ifdef FIX_BUGS
+		CAutomobile* vehicle = new CAutomobile(model, RANDOM_VEHICLE);
+#else
+		CAutomobile* vehicle = new CAutomobile(model, MISSION_VEHICLE);
+#endif
+		if (vehicle != nil) {
+			CVector pos = ThePaths.m_pathNodes[node].GetPosition();
+			pos.z += 4.0f;
+			vehicle->SetPosition(pos);
+			vehicle->SetOrientation(0.0f, 0.0f, DEGTORAD(200.0f));
+
+			vehicle->SetStatus(STATUS_ABANDONED);
+			vehicle->m_nDoorLock = CARLOCK_UNLOCKED;
+			CWorld::Add(vehicle);
+		}
+	}
+	CStats::CheatedCount += 1000;
+	CPad::bHasPlayerCheated = true;
+}
+
+
+void BlowUpCarsCheat()
+{
+	CHud::SetHelpMessage(TheText.Get("CHEAT1"), true);
+
+	int i = CPools::GetVehiclePool()->GetSize();
+	while (i-- > 0) {
+		if (CVehicle *veh = CPools::GetVehiclePool()->GetSlot(i))
+			veh->BlowUpCar(nil);
+	}
+}
+
+void ChangePlayerCheat()
+{
+	// I don't know wtf is going on in here...
+	int modelId, anotherModelId;
+
+	if (FindPlayerPed()->IsPedInControl() && CModelInfo::GetModelInfo("player", nil)) {
+		CHud::SetHelpMessage(TheText.Get("CHEAT1"), true);
+		CPlayerPed *ped = FindPlayerPed();
+		AssocGroupId AnimGrp = ped->m_animGroup;
+		do
+		{
+			do {
+				modelId = CGeneral::GetRandomNumberInRange(0, MI_PGA);
+				anotherModelId = modelId+1;
+			} while (!CModelInfo::GetModelInfo(anotherModelId));
+		} while (anotherModelId >= MI_SPECIAL01 && anotherModelId <= MI_SPECIAL04 || modelId == MI_TAXI_D);
+
+		uint8 flags = CStreaming::ms_aInfoForModel[anotherModelId].m_flags;
+		ped->DeleteRwObject();
+		CStreaming::RequestModel(anotherModelId, STREAMFLAGS_DEPENDENCY| STREAMFLAGS_DONT_REMOVE);
+		CStreaming::LoadAllRequestedModels(false);
+		ped->m_modelIndex = -1;
+		ped->SetModelIndex(anotherModelId);
+		ped->m_animGroup = AnimGrp;
+		if (modelId != -1) {
+			if (!(flags & STREAMFLAGS_DONT_REMOVE))
+				CStreaming::SetModelIsDeletable(anotherModelId);
+		}
+	}
+}
+
+void ChangePlayerModel(const char* name) {
+	if (!FindPlayerVehicle()) {
+		FindPlayerPed()->Undress(name);
+		CStreaming::LoadAllRequestedModels(0);
+		FindPlayerPed()->Dress();
+	}
+}
+
+void MayhemCheat()
+{
+	CHud::SetHelpMessage(TheText.Get("CHEAT1"), true);
+	for (int i = PEDTYPE_CIVMALE; i < PEDTYPE_SPECIAL; i++)
+		CPedType::SetThreats(i, PED_FLAG_PLAYER1 | PED_FLAG_PLAYER2 | PED_FLAG_PLAYER3 | PED_FLAG_PLAYER4 |
+			PED_FLAG_CIVMALE | PED_FLAG_CIVFEMALE | PED_FLAG_COP | PED_FLAG_GANG1 |
+			PED_FLAG_GANG2 | PED_FLAG_GANG3 | PED_FLAG_GANG4 | PED_FLAG_GANG5 |
+			PED_FLAG_GANG6 | PED_FLAG_GANG7 | PED_FLAG_GANG8 | PED_FLAG_GANG9 |
+			PED_FLAG_EMERGENCY | PED_FLAG_PROSTITUTE | PED_FLAG_CRIMINAL | PED_FLAG_SPECIAL );
+	CStats::CheatedCount += 1000;
+	CPad::bHasPlayerCheated = true;
+}
+
+void EverybodyAttacksPlayerCheat()
+{
+	CHud::SetHelpMessage(TheText.Get("CHEAT1"), true);
+	for (int i = PEDTYPE_CIVMALE; i < PEDTYPE_SPECIAL; i++)
+		CPedType::AddThreat(i, PED_FLAG_PLAYER1);
+
+	CStats::CheatedCount += 1000;
+	CPad::bHasPlayerCheated = true;
+}
+
+void WeaponsForAllCheat()
+{
+	CHud::SetHelpMessage(TheText.Get("CHEAT1"), true);
+	CPopulation::ms_bGivePedsWeapons = !CPopulation::ms_bGivePedsWeapons;
+	CStats::CheatedCount += 1000;
+	CPad::bHasPlayerCheated = true;
+}
+
+void FastTimeCheat()
+{
+	CHud::SetHelpMessage(TheText.Get("CHEAT1"), true);
+	if (CTimer::GetTimeScale() < 4.0f)
+		CTimer::SetTimeScale(CTimer::GetTimeScale() * 2.0f);
+}
+
+void SlowTimeCheat()
+{
+	CHud::SetHelpMessage(TheText.Get("CHEAT1"), true);
+	if (CTimer::GetTimeScale() > 0.25f)
+		CTimer::SetTimeScale(CTimer::GetTimeScale() * 0.5f);
+}
+
+void MoneyCheat()
+{
+	CWorld::Players[CWorld::PlayerInFocus].m_nMoney += 250000;
+	CHud::SetHelpMessage(TheText.Get("CHEAT6"), true);
+}
+
+void ArmourCheat()
+{
+	CHud::SetHelpMessage(TheText.Get("CHEAT4"), true);
+	FindPlayerPed()->m_fArmour = CWorld::Players[0].m_nMaxArmour;
+}
+
+void WantedLevelUpCheat()
+{
+	CHud::SetHelpMessage(TheText.Get("CHEAT5"), true);
+	FindPlayerPed()->m_pWanted->CheatWantedLevel(Min(FindPlayerPed()->m_pWanted->GetWantedLevel() + 2, 6));
+}
+
+void WantedLevelDownCheat()
+{
+	CHud::SetHelpMessage(TheText.Get("CHEAT5"), true);
+	FindPlayerPed()->m_pWanted->CheatWantedLevel(0);
+}
+
+void SunnyWeatherCheat()
+{
+	CHud::SetHelpMessage(TheText.Get("CHEAT7"), true);
+	CWeather::ForceWeatherNow(WEATHER_SUNNY);
+}
+
+void ExtraSunnyWeatherCheat()
+{
+	CHud::SetHelpMessage(TheText.Get("CHEAT7"), true);
+	CWeather::ForceWeatherNow(WEATHER_EXTRA_SUNNY);
+}
+
+void CloudyWeatherCheat()
+{
+	CHud::SetHelpMessage(TheText.Get("CHEAT7"), true);
+	CWeather::ForceWeatherNow(WEATHER_CLOUDY);
+}
+
+void RainyWeatherCheat()
+{
+	CHud::SetHelpMessage(TheText.Get("CHEAT7"), true);
+	CWeather::ForceWeatherNow(WEATHER_RAINY);
+}
+
+void FoggyWeatherCheat()
+{
+	CHud::SetHelpMessage(TheText.Get("CHEAT7"), true);
+	CWeather::ForceWeatherNow(WEATHER_FOGGY);
+}
+
+void FastWeatherCheat()
+{
+	CHud::SetHelpMessage(TheText.Get("CHEAT1"), true);
+	gbFastTime = !gbFastTime;
+}
+
+void OnlyRenderWheelsCheat()
+{
+	CHud::SetHelpMessage(TheText.Get("CHEAT1"), true);
+	CVehicle::bWheelsOnlyCheat = !CVehicle::bWheelsOnlyCheat;
+	CStats::CheatedCount += 1000;
+	CPad::bHasPlayerCheated = true;
+}
+
+void ChittyChittyBangBangCheat()
+{
+#ifdef BETTER_ALLCARSAREDODO_CHEAT
+	CHud::SetHelpMessage(TheText.Get(!CVehicle::bAllDodosCheat ? "CHEAT1" : "CHEATOF"), true);
+#else
+	CHud::SetHelpMessage(TheText.Get("CHEAT1"), true);
+#endif
+	CVehicle::bAllDodosCheat = !CVehicle::bAllDodosCheat;
+	CStats::CheatedCount += 1000;
+	CPad::bHasPlayerCheated = true;
+}
+
+void StrongGripCheat()
+{
+	CHud::SetHelpMessage(TheText.Get("CHEAT1"), true);
+	CVehicle::bCheat3 = !CVehicle::bCheat3;
+	CStats::CheatedCount += 1000;
+	CPad::bHasPlayerCheated = true;
+}
+
+void FannyMagnetCheat()
+{
+	CHud::SetHelpMessage(TheText.Get("CHEAT1"), true);
+	CPed::bFannyMagnetCheat = !CPed::bFannyMagnetCheat;
+	CPad::bHasPlayerCheated = true;
+}
+
+void BlackCarsCheat()
+{
+	CHud::SetHelpMessage(TheText.Get("CHEAT1"), true);
+	gbBlackCars = true;
+	gbPinkCars = false;
+}
+
+void PinkCarsCheat()
+{
+	CHud::SetHelpMessage(TheText.Get("CHEAT1"), true);
+	gbBlackCars = false;
+	gbPinkCars = true;
+}
+
+void TrafficLightsCheat()
+{
+	CHud::SetHelpMessage(TheText.Get("CHEAT1"), true);
+	CTrafficLights::bGreenLightsCheat = true;
+}
+
+void MadCarsCheat()
+{
+	CHud::SetHelpMessage(TheText.Get("CHEAT1"), true);
+	CCarCtrl::bMadDriversCheat = true;
+}
+
+void NoSeaBedCheat(void)
+{
+	CHud::SetHelpMessage(TheText.Get("CHEAT1"), true);
+	CWaterLevel::m_bRenderSeaBed = !CWaterLevel::m_bRenderSeaBed;
+}
+
+void RenderWaterLayersCheat(void)
+{
+	CHud::SetHelpMessage(TheText.Get("CHEAT1"), true);
+	if ( ++CWaterLevel::m_nRenderWaterLayers > 5 )
+			CWaterLevel::m_nRenderWaterLayers = 0;
+}
+
+void BackToTheFuture(void)
+{
+	CHud::SetHelpMessage(TheText.Get("CHEAT1"), true);
+	CVehicle::bHoverCheat = !CVehicle::bHoverCheat;
+	CPad::bHasPlayerCheated = true;
+}
+
+void SuicideCheat(void) {
+	CHud::SetHelpMessage(TheText.Get("CHEAT1"), true);
+	FindPlayerPed()->InflictDamage(nil, WEAPONTYPE_UNARMED, 1000.0f, PEDPIECE_TORSO, 0);
+}
+
+void DoChicksWithGunsCheat(void) {
+	CHud::SetHelpMessage(TheText.Get("CHEAT1"), true);
+	CStreaming::SetModelIsDeletable(CGangs::GetGangPedModel1(GANG_PLAYER));
+	CStreaming::SetModelIsDeletable(CGangs::GetGangPedModel2(GANG_PLAYER));
+	CStreaming::SetModelTxdIsDeletable(CGangs::GetGangPedModel1(GANG_PLAYER));
+	CStreaming::SetModelTxdIsDeletable(CGangs::GetGangPedModel2(GANG_PLAYER));
+	CStreaming::RemoveCurrentZonesModels();
+	CGangs::SetGangPedModels(GANG_PLAYER, MI_HFYBE, MI_WFYBE);
+	CGangs::SetGangWeapons(GANG_PLAYER, WEAPONTYPE_M4, WEAPONTYPE_M4);
+	CStats::CheatedCount += 1000;
+	CPad::bHasPlayerCheated = true;
+}
+
+//////////////////////////////////////////////////////////////////////////
+
+#ifdef KANGAROO_CHEAT
+void KangarooCheat()
+{
+	wchar *string;
+	CPed *playerPed = FindPlayerPed();
+	int m_fMass;
+
+	if (playerPed->m_ped_flagI80) {
+		string = TheText.Get("CHEATOF");
+		m_fMass = 70.0f;
+	} else {
+		string = TheText.Get("CHEAT1");
+		m_fMass = 15.0f;
+	}
+	CHud::SetHelpMessage(string, true);
+	playerPed->m_ped_flagI80 = !playerPed->m_ped_flagI80;
+
+	playerPed->m_fMass = m_fMass;
+	playerPed->m_fAirResistance = 0.4f / m_fMass;
+}
+#endif
+
+#ifdef RESTORE_ALLCARSHELI_CHEAT
+void AllCarsHeliCheat(void)
+{
+	wchar* string;
+	if (bAllCarCheat) {
+		string = TheText.Get("CHEATOF");
+		bAllCarCheat = false;
+	}
+	else {
+		string = TheText.Get("CHEAT1");
+		bAllCarCheat = true;
+	}
+	CHud::SetHelpMessage(string, true);
+}
+#endif
+
+#ifdef WALLCLIMB_CHEAT
+void WallClimbingCheat(void)
+{
+	wchar* string;
+	if (gGravityCheat) {
+		string = TheText.Get("CHEATOF");
+		gGravityCheat = false;
+	}
+	else {
+		string = TheText.Get("CHEAT1");
+		gGravityCheat = true;
+	}
+	CHud::SetHelpMessage(string, true);
+}
+#endif
+
+void FlyingFishCheat(void)
+{
+	CHud::SetHelpMessage(TheText.Get("CHEAT1"), true);
+	CVehicle::bCheat8 = !CVehicle::bCheat8;
+	CPad::bHasPlayerCheated = true;
+}
+
+void DoShowChaseStatCheat(void) {
+	CHud::SetHelpMessage(TheText.Get("CHEAT1"), true);
+	CStats::ShowChaseStatOnScreen = 1;
+}
+
+bool
+CControllerState::CheckForInput(void)
+{
+	return !!RightStickX || !!RightStickY || !!LeftStickX || !!LeftStickY
+		|| !!DPadUp || !!DPadDown || !!DPadLeft || !!DPadRight
+		|| !!Triangle || !!Cross || !!Circle || !!Square
+		|| !!Start || !!Select
+		|| !!LeftShoulder1 || !!LeftShoulder2 || !!RightShoulder1 || !!RightShoulder2
+		|| !!LeftShock || !!RightShock;
+}
+
+void
+CControllerState::Clear(void)
+{
+	LeftStickX = LeftStickY = RightStickX = RightStickY = 0;
+	LeftShoulder1 = LeftShoulder2 = RightShoulder1 = RightShoulder2 = 0;
+	DPadUp = DPadDown = DPadLeft = DPadRight = 0;
+	Start = Select = 0;
+	Square = Triangle = Cross = Circle = 0;
+	LeftShock = RightShock = 0;
+	NetworkTalk = 0;
+}
+
+void CKeyboardState::Clear()
+{
+	for ( int32 i = 0; i < ARRAY_SIZE(F); i++	)
+		F[i] = 0;
+
+	for ( int32 i = 0; i < ARRAY_SIZE(VK_KEYS); i++	 )
+		VK_KEYS[i] = 0;
+
+	ESC = INS = DEL = HOME = END = PGUP = PGDN = 0;
+
+	UP = DOWN = LEFT = RIGHT = 0;
+
+	NUMLOCK = 0;
+
+	DIV = MUL = SUB = ADD = 0;
+
+	DECIMAL = NUM1 = NUM2 = NUM3 = NUM4 = 0;
+
+	NUM5 = NUM6 = NUM7 = NUM8 = 0;
+
+	NUM9 = NUM0 = SCROLLLOCK = PAUSE = 0;
+
+	BACKSP = TAB = CAPSLOCK = EXTENTER = 0;
+
+	LSHIFT = SHIFT = RSHIFT = LCTRL = RCTRL = LALT = RALT = 0;
+
+	LWIN = RWIN = APPS = 0;
+}
+
+#ifdef GTA_PS2_STUFF
+void CPad::Initialise(void)
+{
+#ifdef GTA_PS2
+	scePadInit(0);
+
+	scePadPortOpen(0, 0, pad_dma_buf );
+	scePadPortOpen(1, 0, pad2_dma_buf );
+#endif
+	for (int i = 0; i < MAX_PADS; i++)
+	{
+		CPad::GetPad(i)->Clear(true);
+		CPad::GetPad(i)->Mode = 0;
+	}
+
+	bObsoleteControllerMessage	   = false;
+	bOldDisplayNoControllerMessage = false;
+	bDisplayNoControllerMessage	   = false;
+	m_bMapPadOneToPadTwo = false;
+	m_bDebugCamPCOn = false;
+}
+#endif
+
+void CPad::Clear(bool bResetPlayerControls)
+{
+	NewState.Clear();
+	OldState.Clear();
+
+	PCTempKeyState.Clear();
+	PCTempJoyState.Clear();
+	PCTempMouseState.Clear();
+
+	NewKeyState.Clear();
+	OldKeyState.Clear();
+	TempKeyState.Clear();
+
+	NewMouseControllerState.Clear();
+	OldMouseControllerState.Clear();
+	PCTempMouseControllerState.Clear();
+
+	Phase = 0;
+	ShakeFreq = 0;
+	ShakeDur = 0;
+
+	for (int32 i = 0; i < DRUNK_STEERING_BUFFER_SIZE; i++)
+		SteeringLeftRightBuffer[i] = 0;
+
+	DrunkDrivingBufferUsed = 0;
+
+	if ( bResetPlayerControls )
+		DisablePlayerControls = PLAYERCONTROL_ENABLED;
+
+	JustOutOfFrontend = 0;
+	bApplyBrakes = false;
+
+	for ( int32 i = 0; i < HORNHISTORY_SIZE; i++ )
+		bHornHistory[i] = false;
+
+	iCurrHornHistory = 0;
+
+	for ( int32 i = 0; i < ARRAY_SIZE(CheatString); i++ )
+		CheatString[i] = ' ';
+
+	LastTimeTouched = CTimer::GetTimeInMilliseconds();
+	AverageWeapon = 0;
+	AverageEntries = 0;
+}
+
+uint32 CPad::InputHowLongAgo()
+{
+	return CTimer::GetTimeInMilliseconds() - LastTimeTouched;
+}
+
+void CPad::ClearMouseHistory()
+{
+	PCTempMouseControllerState.Clear();
+	NewMouseControllerState.Clear();
+	OldMouseControllerState.Clear();
+}
+
+// unused
+void CPad::ClearKeyBoardHistory()
+{
+	NewKeyState.Clear();
+	OldKeyState.Clear();
+	TempKeyState.Clear();
+}
+
+CMouseControllerState::CMouseControllerState()
+{
+	LMB = 0;
+	RMB = 0;
+	MMB = 0;
+	WHEELUP = 0;
+	WHEELDN = 0;
+	MXB1 = 0;
+	MXB2 = 0;
+
+	x = 0.0f;
+	y = 0.0f;
+}
+
+void CMouseControllerState::Clear()
+{
+	LMB = 0;
+	RMB = 0;
+	MMB = 0;
+	WHEELUP = 0;
+	WHEELDN = 0;
+	MXB1 = 0;
+	MXB2 = 0;
+}
+
+CMouseControllerState CMousePointerStateHelper::GetMouseSetUp()
+{
+	CMouseControllerState state;
+
+#if defined RW_D3D9 || defined RWLIBS
+	if ( PSGLOBAL(mouse) == nil )
+		_InputInitialiseMouse(!FrontEndMenuManager.m_bMenuActive && _InputMouseNeedsExclusive());
+
+	if ( PSGLOBAL(mouse) != nil )
+	{
+		DIDEVCAPS devCaps;
+		devCaps.dwSize = sizeof(DIDEVCAPS);
+
+		PSGLOBAL(mouse)->GetCapabilities(&devCaps);
+		switch ( devCaps.dwButtons )
+		{
+			case 3:
+			case 4:
+			case 5:
+			case 6:
+			case 7:
+			case 8:
+				state.MMB = true;
+
+			case 2:
+				state.RMB = true;
+
+			case 1:
+				state.LMB = true;
+		}
+
+		if ( devCaps.dwAxes == 3 )
+		{
+			state.WHEELDN = true;
+			state.WHEELUP = true;
+		}
+	}
+#else
+	// It seems there is no way to get number of buttons on mouse, so assign all buttons if we have mouse.
+	double xpos = 1.0f, ypos;
+	glfwGetCursorPos(PSGLOBAL(window), &xpos, &ypos);
+
+	if (xpos != 0.f) {
+		state.MMB = true;
+		state.RMB = true;
+		state.LMB = true;
+		state.WHEELDN = true;
+		state.WHEELUP = true;
+	}
+#endif
+
+	return state;
+}
+
+void CPad::UpdateMouse()
+{
+#if defined RW_D3D9 || defined RWLIBS
+	if ( IsForegroundApp() )
+	{
+		if ( PSGLOBAL(mouse) == nil )
+			_InputInitialiseMouse(!FrontEndMenuManager.m_bMenuActive && _InputMouseNeedsExclusive());
+
+		DIMOUSESTATE2 state;
+
+		if ( PSGLOBAL(mouse) != nil && SUCCEEDED(_InputGetMouseState(&state)) )
+		{
+			int32 signX = 1;
+			int32 signy = 1;
+
+			if ( !FrontEndMenuManager.m_bMenuActive )
+			{
+				if ( MousePointerStateHelper.bInvertVertically )
+					signy = -1;
+				if ( MousePointerStateHelper.bInvertHorizontally )
+					signX = -1;
+			}
+
+			PCTempMouseControllerState.Clear();
+
+			PCTempMouseControllerState.x = (float)(signX * state.lX);
+			PCTempMouseControllerState.y = (float)(signy * state.lY);
+			PCTempMouseControllerState.LMB = state.rgbButtons[0] & 128;
+			PCTempMouseControllerState.RMB = state.rgbButtons[1] & 128;
+			PCTempMouseControllerState.MMB = state.rgbButtons[2] & 128;
+			PCTempMouseControllerState.MXB1 = state.rgbButtons[3] & 128;
+			PCTempMouseControllerState.MXB2 = state.rgbButtons[4] & 128;
+
+			if ( state.lZ > 0 )
+				PCTempMouseControllerState.WHEELUP = 1;
+			else if ( state.lZ < 0 )
+				PCTempMouseControllerState.WHEELDN = 1;
+
+			OldMouseControllerState = NewMouseControllerState;
+			NewMouseControllerState = PCTempMouseControllerState;
+		}
+	}
+#else
+	if ( IsForegroundApp() && PSGLOBAL(cursorIsInWindow) )
+	{
+		double xpos = 1.0f, ypos;
+		glfwGetCursorPos(PSGLOBAL(window), &xpos, &ypos);
+		if (xpos == 0.f)
+			return;
+
+		int32 signX = 1;
+		int32 signy = 1;
+
+		if (!FrontEndMenuManager.m_bMenuActive)
+		{
+			if (MousePointerStateHelper.bInvertVertically)
+				signy = -1;
+			if (MousePointerStateHelper.bInvertHorizontally)
+				signX = -1;
+		}
+
+		PCTempMouseControllerState.Clear();
+
+		PCTempMouseControllerState.x = (float)(signX * (xpos - PSGLOBAL(lastMousePos.x)));
+		PCTempMouseControllerState.y = (float)(signy * (ypos - PSGLOBAL(lastMousePos.y)));
+		PCTempMouseControllerState.LMB = glfwGetMouseButton(PSGLOBAL(window), GLFW_MOUSE_BUTTON_LEFT);
+		PCTempMouseControllerState.RMB = glfwGetMouseButton(PSGLOBAL(window), GLFW_MOUSE_BUTTON_RIGHT);
+		PCTempMouseControllerState.MMB = glfwGetMouseButton(PSGLOBAL(window), GLFW_MOUSE_BUTTON_MIDDLE);
+		PCTempMouseControllerState.MXB1 = glfwGetMouseButton(PSGLOBAL(window), GLFW_MOUSE_BUTTON_4);
+		PCTempMouseControllerState.MXB2 = glfwGetMouseButton(PSGLOBAL(window), GLFW_MOUSE_BUTTON_5);
+
+		if (PSGLOBAL(mouseWheel) > 0)
+			PCTempMouseControllerState.WHEELUP = 1;
+		else if (PSGLOBAL(mouseWheel) < 0)
+			PCTempMouseControllerState.WHEELDN = 1;
+
+		PSGLOBAL(lastMousePos.x) = xpos;
+		PSGLOBAL(lastMousePos.y) = ypos;
+		PSGLOBAL(mouseWheel) = 0.0f;
+
+		OldMouseControllerState = NewMouseControllerState;
+		NewMouseControllerState = PCTempMouseControllerState;
+	}
+#endif
+}
+
+CControllerState CPad::ReconcileTwoControllersInput(CControllerState const &State1, CControllerState const &State2)
+{
+	static CControllerState ReconState;
+
+	ReconState.Clear();
+
+#define _RECONCILE_BUTTON(button) \
+	{ if ( State1.button || State2.button ) ReconState.button = 255; }
+
+#define _RECONCILE_AXIS_POSITIVE(axis) \
+	{ if ( State1.axis >= 0 && State2.axis >= 0 ) ReconState.axis = Max(State1.axis, State2.axis); }
+
+#define _RECONCILE_AXIS_NEGATIVE(axis) \
+	{ if ( State1.axis <= 0 && State2.axis <= 0 ) ReconState.axis = Min(State1.axis, State2.axis); }
+
+#define _RECONCILE_AXIS(axis) \
+	{ _RECONCILE_AXIS_POSITIVE(axis); _RECONCILE_AXIS_NEGATIVE(axis); }
+
+#define _FIX_AXIS_DIR(axis) \
+	{ if ( State1.axis > 0 && State2.axis < 0 || State1.axis < 0 && State2.axis > 0 ) ReconState.axis = 0; }
+
+#define _FIX_RECON_DIR(pos, neg, axis) \
+	{ if ( (ReconState.pos || ReconState.axis < 0) && (ReconState.neg || ReconState.axis > 0) ) { ReconState.pos = 0; ReconState.neg = 0; ReconState.axis = 0; } }
+
+	_RECONCILE_BUTTON(LeftShoulder1);
+	_RECONCILE_BUTTON(LeftShoulder2);
+	_RECONCILE_BUTTON(RightShoulder1);
+	_RECONCILE_BUTTON(RightShoulder2);
+	_RECONCILE_BUTTON(Start);
+	_RECONCILE_BUTTON(Select);
+	_RECONCILE_BUTTON(Square);
+	_RECONCILE_BUTTON(Triangle);
+	_RECONCILE_BUTTON(Cross);
+	_RECONCILE_BUTTON(Circle);
+	_RECONCILE_BUTTON(LeftShock);
+	_RECONCILE_BUTTON(RightShock);
+	_RECONCILE_BUTTON(NetworkTalk);
+	_RECONCILE_AXIS(LeftStickX);
+	_RECONCILE_AXIS(LeftStickY);
+	_FIX_AXIS_DIR(LeftStickX);
+	_FIX_AXIS_DIR(LeftStickY);
+	_RECONCILE_AXIS(RightStickX);
+	_RECONCILE_AXIS(RightStickY);
+	_FIX_AXIS_DIR(RightStickX);
+	_FIX_AXIS_DIR(RightStickY);
+	_RECONCILE_BUTTON(DPadUp);
+	_RECONCILE_BUTTON(DPadDown);
+	_RECONCILE_BUTTON(DPadLeft);
+	_RECONCILE_BUTTON(DPadRight);
+	_FIX_RECON_DIR(DPadUp, DPadDown, LeftStickY);
+	_FIX_RECON_DIR(DPadLeft, DPadRight, LeftStickX);
+
+	return ReconState;
+
+#undef _RECONCILE_BUTTON
+#undef _RECONCILE_AXIS_POSITIVE
+#undef _RECONCILE_AXIS_NEGATIVE
+#undef _RECONCILE_AXIS
+#undef _FIX_AXIS_DIR
+#undef _FIX_RECON_DIR
+}
+
+void CPad::StartShake(int16 nDur, uint8 nFreq)
+{
+	if ( !FrontEndMenuManager.m_PrefsUseVibration )
+		return;
+
+	if ( CCutsceneMgr::IsRunning() || CGame::playingIntro )
+		return;
+
+	if ( nFreq == 0 )
+	{
+		ShakeDur = 0;
+		ShakeFreq = 0;
+		return;
+	}
+
+	if ( nDur > ShakeDur )
+	{
+		ShakeDur = nDur;
+		ShakeFreq = nFreq;
+	}
+}
+
+void CPad::StartShake_Distance(int16 nDur, uint8 nFreq, float fX, float fY, float fZ)
+{
+	if ( !FrontEndMenuManager.m_PrefsUseVibration )
+		return;
+
+	if ( CCutsceneMgr::IsRunning() || CGame::playingIntro )
+		return;
+
+	float fDist = ( TheCamera.GetPosition() - CVector(fX, fY, fZ) ).Magnitude();
+
+	if ( fDist < 70.0f )
+	{
+		if ( nFreq == 0 )
+		{
+			ShakeDur = 0;
+			ShakeFreq = 0;
+			return;
+		}
+
+		if ( nDur > ShakeDur )
+		{
+			ShakeDur = nDur;
+			ShakeFreq = nFreq;
+		}
+	}
+}
+
+void CPad::StartShake_Train(float fX, float fY)
+{
+	if ( !FrontEndMenuManager.m_PrefsUseVibration )
+		return;
+
+	if ( CCutsceneMgr::IsRunning() || CGame::playingIntro )
+		return;
+
+	if (FindPlayerVehicle() != nil && FindPlayerVehicle()->IsTrain() )
+		return;
+
+	float fDist = ( TheCamera.GetPosition() - CVector(fX, fY, 0.0f) ).Magnitude2D();
+
+	if ( fDist < 70.0f )
+	{
+		int32 freq = (int32)((70.0f - fDist) * 70.0f / 70.0f + 30.0f);
+
+		if ( ShakeDur < 100 )
+		{
+			ShakeDur = 100;
+			ShakeFreq = freq;
+		}
+	}
+}
+
+#ifdef GTA_PS2_STUFF
+void CPad::AddToCheatString(char c)
+{
+	for ( int32 i = ARRAY_SIZE(CheatString) - 2; i >= 0; i-- )
+		CheatString[i + 1] = CheatString[i];
+
+	CheatString[0] = c;
+
+#define _CHEATCMP(str)	strncmp(str, CheatString, sizeof(str)-1)
+	// "4414LDRULDRU"	-	R2 R2 L1 R2 LEFT DOWN RIGHT UP LEFT DOWN RIGHT UP
+	if ( !_CHEATCMP("URDLURDL4144") )
+		WeaponCheat1();
+
+	// "4411LDRULDRU"	-	R2 R2 L1 L1 LEFT DOWN RIGHT UP LEFT DOWN RIGHT UP
+	else if ( !_CHEATCMP("URDLURDL1144") )
+		MoneyCheat();
+
+	// "4412LDRULDRU"	-	R2 R2 L1 L2 LEFT DOWN RIGHT UP LEFT DOWN RIGHT UP
+	else if ( !_CHEATCMP("URDLURDL2144") )
+		ArmourCheat();
+
+	// "4413LDRULDRU"	-	R2 R2 L1 R1 LEFT DOWN RIGHT UP LEFT DOWN RIGHT UP
+	else if ( !_CHEATCMP("URDLURDL3144") )
+		HealthCheat();
+
+	// "4414LRLRLR"		-	R2 R2 L1 R2 LEFT RIGHT LEFT RIGHT LEFT RIGHT
+	else if ( !_CHEATCMP("RLRLRL4144") )
+		WantedLevelUpCheat();
+
+	// "4414UDUDUD"		-	R2 R2 L1 R2 UP DOWN UP DOWN UP DOWN
+	else if ( !_CHEATCMP("DUDUDU4144") )
+		WantedLevelDownCheat();
+
+	// "1234432T"		-	L1 L2 R1 R2 R2 R1 L2 TRIANGLE
+	else if ( !_CHEATCMP("T2344321") )
+		SunnyWeatherCheat();
+
+	// "1234432S"		-	L1 L2 R1 R2 R2 R1 L2 SQUARE
+	else if ( !_CHEATCMP("S2344321") )
+		CloudyWeatherCheat();
+
+	// "1234432C"		-	L1 L2 R1 R2 R2 R1 L2 CIRCLE
+	else if ( !_CHEATCMP("C2344321") )
+		RainyWeatherCheat();
+
+	// "1234432X"		-	L1 L2 R1 R2 R2 R1 L2 CROSS
+	else if ( !_CHEATCMP("X2344321") )
+		FoggyWeatherCheat();
+
+	// "CCCCCC321TCT"	-	CIRCLE CIRCLE CIRCLE CIRCLE CIRCLE CIRCLE R1 L2 L1 TRIANGLE CIRCLE TRIANGLE
+	else if ( !_CHEATCMP("TCT123CCCCCC") )
+		VehicleCheat(MI_RHINO);
+
+	// "CCCSSSSS1TCT"	-	CIRCLE CIRCLE CIRCLE SQUARE SQUARE SQUARE SQUARE SQUARE L1 TRIANGLE CIRCLE TRIANGLE
+	else if ( !_CHEATCMP("TCT1SSSSSCCC") )
+		FastWeatherCheat();
+
+	// "241324TSCT21"	-	L2 R2 L1 R1 L2 R2 TRIANGLE SQUARE CIRCLE TRIANGLE L2 L1
+	else if ( !_CHEATCMP("12TCST423142") )
+		BlowUpCarsCheat();
+
+	// "RDLU12ULDR"		-	RIGHT DOWN LEFT UP L1 L2 UP LEFT DOWN RIGHT
+	else if ( !_CHEATCMP("RDLU21ULDR") )
+		ChangePlayerCheat();
+
+	// "DULUX3421"		-	DOWN UP LEFT UP CROSS R1 R2 L2 L1
+	else if ( !_CHEATCMP("1243XULUD") )
+		MayhemCheat();
+
+	// "DULUX3412"		-	DOWN UP LEFT UP CROSS R1 R2 L1 L2
+	else if ( !_CHEATCMP("2143XULUD") )
+		EverybodyAttacksPlayerCheat();
+
+	// "43TX21UD"		-	R2 R1 TRIANGLE CROSS L2 L1 UP DOWN
+	else if ( !_CHEATCMP("DU12XT34") )
+		WeaponsForAllCheat();
+
+	// "TURDS12"		-	TRIANGLE UP RIGHT DOWN SQUARE L1 L2
+	else if ( !_CHEATCMP("21SDRUT") )
+		FastTimeCheat();
+
+	// "TURDS34"		-	TRIANGLE UP RIGHT DOWN SQUARE R1 R2
+	else if ( !_CHEATCMP("43SDRUT") )
+		SlowTimeCheat();
+
+	// "11S4T1T"		-	L1 L1 SQUARE R2 TRIANGLE L1 TRIANGLE
+	else if ( !_CHEATCMP("T1T4S11") )
+		OnlyRenderWheelsCheat();
+
+	// "R4C32D13"		-	RIGHT R2 CIRCLE R1 L2 DOWN L1 R1
+	else if ( !_CHEATCMP("31D23C4R") )
+		ChittyChittyBangBangCheat();
+
+	// "3141L33T"		-	R1 L1 R2 L1 LEFT R1 R1 TRIANGLE
+	else if ( !_CHEATCMP("T33L1413") )
+		StrongGripCheat();
+
+#undef _CHEATCMP
+}
+#endif
+
+int Cheat_strncmp(char* sourceStr, char* origCheatStr)
+{
+#define ccmp(n) if((uint8)sourceStr[i] != (uint8)origCheatStr[i] - n) return 1;
+	int i = 0;
+	while(origCheatStr[i])
+	{
+		switch(i)
+		{
+		case 0: ccmp(3); break;
+		case 1: ccmp(5); break;
+		case 2: ccmp(7); break;
+		case 3: ccmp(1); break;
+		case 4: ccmp(13); break;
+		case 5: ccmp(27); break;
+		case 6: ccmp(3); break;
+		case 7: ccmp(7); break;
+		case 8: ccmp(1); break;
+		case 9: ccmp(11); break;
+		case 10: ccmp(13); break;
+		case 11: ccmp(8); break;
+		case 12: ccmp(7); break;
+		case 13: ccmp(32); break;
+		case 14: ccmp(13); break;
+		case 15: ccmp(6); break;
+		case 16: ccmp(28); break;
+		case 17: ccmp(19); break;
+		case 18: ccmp(10); break;
+		case 19: ccmp(3); break;
+		case 20: ccmp(3); break;
+		case 21: ccmp(5); break;
+		case 22: ccmp(7); break;
+		case 23: ccmp(1); break;
+		case 24: ccmp(13); break;
+		case 25: ccmp(27); break;
+		case 26: ccmp(3); break;
+		case 27: ccmp(7); break;
+		default: return 1;
+		}
+		i++;
+	}
+	return 0;
+#undef ccmp
+}
+
+// TODO(Miami): Mobile has changed some of the cheats to include debugging things
+void CPad::AddToPCCheatString(char c)
+{
+	for (int32 i = ARRAY_SIZE(KeyBoardCheatString) - 2; i >= 0; i--)
+		KeyBoardCheatString[i + 1] = KeyBoardCheatString[i];
+
+	KeyBoardCheatString[0] = c;
+
+#define _CHEATCMP(str) strncmp(str, KeyBoardCheatString, sizeof(str)-1)
+
+	// "THUGSTOOLS"
+	if (!Cheat_strncmp(KeyBoardCheatString, "VQVPanJ\\I_")) {
+		KeyBoardCheatString[0] = ' ';
+		WeaponCheat1();
+	}
+	// "PROFESSIONALTOOLS"
+	else if (!Cheat_strncmp(KeyBoardCheatString, "VQVPagDUPT`[Lf\\Xl")) {
+		KeyBoardCheatString[0] = ' ';
+		WeaponCheat2();
+	}
+	// "NUTTERTOOLS"
+	else if (!Cheat_strncmp(KeyBoardCheatString, "VQVPamH[U`[")) {
+		KeyBoardCheatString[0] = ' ';
+		WeaponCheat3();
+	}
+	// "PRECIOUSPROTECTION"
+	else if (!Cheat_strncmp(KeyBoardCheatString, "QTPUP`WVS[`]ViPKnc")) {
+		KeyBoardCheatString[0] = ' ';
+		ArmourCheat();
+	}
+	// "ASPIRINE"
+	else if (!Cheat_strncmp(KeyBoardCheatString, "HSPSVkVH")) {
+		KeyBoardCheatString[0] = ' ';
+		HealthCheat();
+	}
+	// "YOUWONTTAKEMEALIVE"
+	else if (!Cheat_strncmp(KeyBoardCheatString, "H[PMN`PLLLa\\Uod[kl")) {
+		KeyBoardCheatString[0] = ' ';
+		WantedLevelUpCheat();
+	}
+	// "LEAVEMEALONE"
+	else if (!Cheat_strncmp(KeyBoardCheatString, "HSVMN`PLWLRT")) {
+		KeyBoardCheatString[0] = ' ';
+		WantedLevelDownCheat();
+	}
+	// "APLEASANTDAY"
+	else if (!Cheat_strncmp(KeyBoardCheatString, "\\FKU[\\VHFW]I")) {
+		KeyBoardCheatString[0] = ' ';
+		SunnyWeatherCheat();
+	}
+	// "ALOVELYDAY"
+	else if (!Cheat_strncmp(KeyBoardCheatString, "\\FKZY`YVML")) {
+		KeyBoardCheatString[0] = ' ';
+		ExtraSunnyWeatherCheat();
+	}
+	// "ABITDRIEG"
+	else if (!Cheat_strncmp(KeyBoardCheatString, "JJPSQoLIB")) {
+		KeyBoardCheatString[0] = ' ';
+		CloudyWeatherCheat();
+	}
+	// "CATSANDDOGS"
+	else if (!Cheat_strncmp(KeyBoardCheatString, "VLVEQiDZULP")) {
+		KeyBoardCheatString[0] = ' ';
+		RainyWeatherCheat();
+	}
+	// "CANTSEEATHING"
+	else if (!Cheat_strncmp(KeyBoardCheatString, "JSPIa\\HLT_[IJ")) {
+		KeyBoardCheatString[0] = ' ';
+		FoggyWeatherCheat();
+	}
+	// "PANZER"
+	else if (!Cheat_strncmp(KeyBoardCheatString, "UJaONk")) {
+		KeyBoardCheatString[0] = ' ';
+		VehicleCheat(MI_RHINO);
+	}
+	// "LIFEISPASSINGMEBY"
+	else if (!Cheat_strncmp(KeyBoardCheatString, "\\GLNTiLZTL][PeSOh")) {
+		KeyBoardCheatString[0] = ' ';
+		FastWeatherCheat();
+	}
+	// "BIGBANG"
+	else if (!Cheat_strncmp(KeyBoardCheatString, "JSHCTdE")) {
+		KeyBoardCheatString[0] = ' ';
+		BlowUpCarsCheat();
+	}
+	// "STILLLIKEDRESSINGUP"
+	else if (!Cheat_strncmp(KeyBoardCheatString, "SZNOVnVLSORSPlYReg]")) {
+		KeyBoardCheatString[0] = ' ';
+		ChangePlayerCheat();
+	}
+	// "FIGHTFIGHTFIGHT"
+	else if (!Cheat_strncmp(KeyBoardCheatString, "WMNJSoKNJQaPNiS")) {
+		KeyBoardCheatString[0] = ' ';
+		MayhemCheat();
+	}
+	// "NOBODYLIKESME"
+	else if (!Cheat_strncmp(KeyBoardCheatString, "HRZFXdO`EZOWU")) {
+		KeyBoardCheatString[0] = ' ';
+		EverybodyAttacksPlayerCheat();
+	}
+	// "OURGODGIVENRIGHTTOBEARARMS"
+	else if (!Cheat_strncmp(KeyBoardCheatString, "VRYB_\\HIP_aPNi_TaiSJGTNSbj")) {
+		KeyBoardCheatString[0] = ' ';
+		WeaponsForAllCheat();
+	}
+	// "ONSPEED"
+	else if (!Cheat_strncmp(KeyBoardCheatString, "GJLQ`iR")) {
+		KeyBoardCheatString[0] = ' ';
+		FastTimeCheat();
+	}
+	// "BOOOOOORING"
+	else if (!Cheat_strncmp(KeyBoardCheatString, "JSPS\\jRVPZO")) {
+		KeyBoardCheatString[0] = ' ';
+		SlowTimeCheat();
+	}
+	// "WHEELSAREALLINEED"
+	else if (!Cheat_strncmp(KeyBoardCheatString, "GJLOVgOHF]N[SeRNs")) {
+		KeyBoardCheatString[0] = ' ';
+		OnlyRenderWheelsCheat();
+	}
+	//COMEFLYWITHME
+	else if (!Cheat_strncmp(KeyBoardCheatString, "HROUVr\\SGPZWJ")) {
+		KeyBoardCheatString[0] = ' ';
+		ChittyChittyBangBangCheat();
+	}
+	// "GRIPISEVERYTHING"
+	else if (!Cheat_strncmp(KeyBoardCheatString, "JSPIatULWP`QWi_M")) {
+		KeyBoardCheatString[0] = ' ';
+		StrongGripCheat();
+	}
+	// "CHASESTAT"
+	else if (!Cheat_strncmp(KeyBoardCheatString, "WF[TRnDOD")) {
+		KeyBoardCheatString[0] = ' ';
+		DoShowChaseStatCheat();
+	}
+	// "CHICKSWITHGUNS"
+	else if (!Cheat_strncmp(KeyBoardCheatString, "VS\\HUoL^TVPQOc")) {
+		KeyBoardCheatString[0] = ' ';
+		DoChicksWithGunsCheat();
+	}
+	// "ICANTTAKEITANYMORE"
+	else if (!Cheat_strncmp(KeyBoardCheatString, "HWVNfiD[JPXI[t[G_\\")) {
+		KeyBoardCheatString[0] = ' ';
+		SuicideCheat();
+	}
+	// "GREENLIGHT"
+	else if (!Cheat_strncmp(KeyBoardCheatString, "WMNJYiHLSR")) {
+		KeyBoardCheatString[0] = ' ';
+		TrafficLightsCheat();
+	}
+	// "MIAMITRAFFIC"
+	else if (!Cheat_strncmp(KeyBoardCheatString, "FNMGNmWPNLVU")) {
+		KeyBoardCheatString[0] = ' ';
+		MadCarsCheat();
+	}
+	// "AHAIRDRESSERSCAR"
+	else if (!Cheat_strncmp(KeyBoardCheatString, "UFJT_`VZF]QZPaUG")) {
+		KeyBoardCheatString[0] = ' ';
+		PinkCarsCheat();
+	}
+	// "IWANTITPAINTEDBLACK"
+	else if (!Cheat_strncmp(KeyBoardCheatString, "NHHMO_H[OTNX[iaT]jS")) {
+		KeyBoardCheatString[0] = ' ';
+		BlackCarsCheat();
+	}
+	// "TRAVELINSTYLE"
+	else if (!Cheat_strncmp(KeyBoardCheatString, "HQ`U`iLSFaNZ[")) {
+		KeyBoardCheatString[0] = ' ';
+		VehicleCheat(MI_BLOODRA);
+	}
+	// "THELASTRIDE"
+	else if (!Cheat_strncmp(KeyBoardCheatString, "HIPSanDSFSa")) {
+		KeyBoardCheatString[0] = ' ';
+		VehicleCheat(MI_ROMERO);
+	}
+	// "ROCKANDROLLCAR"
+	else if (!Cheat_strncmp(KeyBoardCheatString, "UFJMYjUKOLXKVr")) {
+		KeyBoardCheatString[0] = ' ';
+		VehicleCheat(MI_LOVEFIST);
+	}
+	// "RUBBISHCAR"
+	else if (!Cheat_strncmp(KeyBoardCheatString, "UFJI`dEIV]")) {
+		KeyBoardCheatString[0] = ' ';
+		VehicleCheat(MI_TRASH);
+	}
+	// "GETTHEREQUICKLY"
+	else if (!Cheat_strncmp(KeyBoardCheatString, "\\QRDVpTLSPU\\[eT")) {
+		KeyBoardCheatString[0] = ' ';
+		VehicleCheat(MI_BLOODRB);
+	}
+	// "GETTHEREFAST"
+	else if (!Cheat_strncmp(KeyBoardCheatString, "WXHGRmHOU_RO")) {
+		KeyBoardCheatString[0] = ' ';
+		VehicleCheat(MI_SABRETUR);
+	}
+	// "BETTERTHANWALKING"
+	else if (!Cheat_strncmp(KeyBoardCheatString, "JSPLY\\ZUBSaZLtaK^")) {
+		KeyBoardCheatString[0] = ' ';
+		VehicleCheat(MI_CADDY);
+	}
+	// "GETTHEREFASTINDEED"
+	else if (!Cheat_strncmp(KeyBoardCheatString, "GJLE[dWZBQfZLvRXa[^WHL")) {
+		KeyBoardCheatString[0] = ' ';
+		VehicleCheat(MI_HOTRINA);
+	}
+	// "GETTHEREAMAZINGLYFAST"
+	else if (!Cheat_strncmp(KeyBoardCheatString, "WXHGfgJUJeNUHe_Kdg^HJ")) {
+		KeyBoardCheatString[0] = ' ';
+		VehicleCheat(MI_HOTRINB);
+	}
+	// LOOKLIKELANCE
+	else if (!Cheat_strncmp(KeyBoardCheatString, "HHUBY`NPMV\\WS")) {
+		KeyBoardCheatString[0] = ' ';
+		ChangePlayerModel("igbuddy");
+	}
+	// IWANTBIGTITS
+	else if (!Cheat_strncmp(KeyBoardCheatString, "VYPUTdE[OLdQ")) {
+		KeyBoardCheatString[0] = ' ';
+		ChangePlayerModel("igcandy");
+	}
+	// MYSONISALAWYER
+	else if (!Cheat_strncmp(KeyBoardCheatString, "UJ`XNgDZJY\\[`m")) {
+		KeyBoardCheatString[0] = ' ';
+		ChangePlayerModel("igken");
+	}
+	// ILOOKLIKEHILARY
+	else if (!Cheat_strncmp(KeyBoardCheatString, "\\WHMVcHRJWXWVlV")) {
+		KeyBoardCheatString[0] = ' ';
+		ChangePlayerModel("ighlary");
+	}
+	// ROCKANDROLLMAN
+	else if (!Cheat_strncmp(KeyBoardCheatString, "QFTMYjUKOLXKVr")) {
+		KeyBoardCheatString[0] = ' ';
+		ChangePlayerModel("igjezz");
+	}
+	// ONEARMEDBANDIT
+	else if (!Cheat_strncmp(KeyBoardCheatString, "WNKON]GLN]NMUo")) {
+		KeyBoardCheatString[0] = ' ';
+		ChangePlayerModel("igphil");
+	}
+	// IDONTHAVETHEMONEYSONNY
+	else if (!Cheat_strncmp(KeyBoardCheatString, "\\SUP`tHUPXRP[ecGdgXRGN")) {
+		KeyBoardCheatString[0] = ' ';
+		ChangePlayerModel("igsonny");
+	}
+	// FOXYLITTLETHING
+	else if (!Cheat_strncmp(KeyBoardCheatString, "JSPIa`O[UTYa_oS")) {
+		KeyBoardCheatString[0] = ' ';
+		ChangePlayerModel("igmerc");
+	}
+	// WELOVEOURDICK
+	else if (!Cheat_strncmp(KeyBoardCheatString, "NHPE_pRLWZYM^")) {
+		KeyBoardCheatString[0] = ' ';
+		ChangePlayerModel("igdick");
+	}
+	// CHEATSHAVEBEENCRACKED
+	else if (!Cheat_strncmp(KeyBoardCheatString, "GJRDNmFUFPOM]aUYpTOKF")) {
+		KeyBoardCheatString[0] = ' ';
+		ChangePlayerModel("igdiaz");
+	}
+	// DEEPFRIEDMARSBARS
+	else if (!Cheat_strncmp(KeyBoardCheatString, "VWHC`mDTEPVZMpRK")) {
+		KeyBoardCheatString[0] = ' ';
+		gfTommyFatness = 0.26f;
+	}
+	// PROGRAMMER
+	else if (!Cheat_strncmp(KeyBoardCheatString, "UJTNNmJVS[")) {
+		KeyBoardCheatString[0] = ' ';
+		gfTommyFatness = -0.3f;
+	}
+	// SEAWAYS
+	else if (!Cheat_strncmp(KeyBoardCheatString, "V^HXN`V")) {
+		KeyBoardCheatString[0] = ' ';
+		BackToTheFuture();
+	}
+	// LOADSOFLITTLETHINGS
+	else if (!Cheat_strncmp(KeyBoardCheatString, "VLUJUoHSU_VTMo`J]bV")) {
+		KeyBoardCheatString[0] = ' ';
+		SpecialCarCheats();
+	}
+	// HOPINGIRL
+	else if (!Cheat_strncmp(KeyBoardCheatString, "OWPH[dSVI")) {
+		KeyBoardCheatString[0] = ' ';
+		PickUpChicksCheat();
+	}
+	//CERTAINDEATH
+	else if (!Cheat_strncmp(KeyBoardCheatString, "KYHFQiLHU]RK")) {
+		KeyBoardCheatString[0] = ' ';
+		CSmokeTrails::CigOn = !CSmokeTrails::CigOn;
+	}
+	//AIRSHIP
+	else if (!Cheat_strncmp(KeyBoardCheatString, "SNOT_dD")) {
+		KeyBoardCheatString[0] = ' ';
+		FlyingFishCheat();
+	}
+	//FANNYMAGNET
+	else if (!Cheat_strncmp(KeyBoardCheatString, "WJUHNh\\UOLS")) {
+		KeyBoardCheatString[0] = ' ';
+		FannyMagnetCheat();
+	}
+
+#ifdef KANGAROO_CHEAT
+	// "KANGAROO"
+	if (!_CHEATCMP("OORAGNAK"))
+		KangarooCheat();
+#endif
+
+#ifndef MASTER
+	// "PEDDEBUG"
+	if (!_CHEATCMP("GUBEDDEP"))
+		CPed::SwitchDebugDisplay();
+#endif
+
+#ifdef RESTORE_ALLCARSHELI_CHEAT
+	// "CARSAREHELI"
+	if (!_CHEATCMP("ILEHERASRAC"))
+		AllCarsHeliCheat();
+#endif
+
+#ifdef WALLCLIMB_CHEAT
+	// "SPIDERCAR"
+	if (!_CHEATCMP("RACREDIPS"))
+		WallClimbingCheat();
+#endif
+
+#if !defined(PC_WATER) && defined(WATER_CHEATS)
+	// SEABEDCHEAT
+	if (!_CHEATCMP("TAEHCDEBAESON"))
+		NoSeaBedCheat();
+
+	// WATERLAYERSCHEAT
+	if (!_CHEATCMP("TAEHCSREYALRETAW"))
+		RenderWaterLayersCheat();
+#endif
+
+#undef _CHEATCMP
+}
+
+#ifdef XINPUT
+int CPad::XInputJoy1 = 0;
+int CPad::XInputJoy2 = 1;
+void CPad::AffectFromXinput(uint32 pad)
+{
+	pad = pad == 0 ? XInputJoy1 : XInputJoy2;
+	if (pad == -1) // LoadINIControllerSettings can set it to -1
+		return;
+
+	XINPUT_STATE xstate;
+	memset(&xstate, 0, sizeof(XINPUT_STATE));
+	if (XInputGetState(pad, &xstate) == ERROR_SUCCESS)
+	{
+		PCTempJoyState.Circle = (xstate.Gamepad.wButtons & XINPUT_GAMEPAD_B) ? 255 : 0;
+		PCTempJoyState.Cross = (xstate.Gamepad.wButtons & XINPUT_GAMEPAD_A) ? 255 : 0;
+		PCTempJoyState.Square = (xstate.Gamepad.wButtons & XINPUT_GAMEPAD_X) ? 255 : 0;
+		PCTempJoyState.Triangle = (xstate.Gamepad.wButtons & XINPUT_GAMEPAD_Y) ? 255 : 0;
+		PCTempJoyState.DPadDown = (xstate.Gamepad.wButtons & XINPUT_GAMEPAD_DPAD_DOWN) ? 255 : 0;
+		PCTempJoyState.DPadLeft = (xstate.Gamepad.wButtons & XINPUT_GAMEPAD_DPAD_LEFT) ? 255 : 0;
+		PCTempJoyState.DPadRight = (xstate.Gamepad.wButtons & XINPUT_GAMEPAD_DPAD_RIGHT) ? 255 : 0;
+		PCTempJoyState.DPadUp = (xstate.Gamepad.wButtons & XINPUT_GAMEPAD_DPAD_UP) ? 255 : 0;
+		PCTempJoyState.LeftShock = (xstate.Gamepad.wButtons & XINPUT_GAMEPAD_LEFT_THUMB) ? 255 : 0;
+		PCTempJoyState.LeftShoulder1 = (xstate.Gamepad.wButtons & XINPUT_GAMEPAD_LEFT_SHOULDER) ? 255 : 0;
+		PCTempJoyState.LeftShoulder2 = xstate.Gamepad.bLeftTrigger;
+		PCTempJoyState.RightShock = (xstate.Gamepad.wButtons & XINPUT_GAMEPAD_RIGHT_THUMB) ? 255 : 0;
+		PCTempJoyState.RightShoulder1 = (xstate.Gamepad.wButtons & XINPUT_GAMEPAD_RIGHT_SHOULDER) ? 255 : 0;
+		PCTempJoyState.RightShoulder2 = xstate.Gamepad.bRightTrigger;
+
+		PCTempJoyState.Select = (xstate.Gamepad.wButtons & XINPUT_GAMEPAD_BACK) ? 255 : 0;
+#ifdef REGISTER_START_BUTTON
+		PCTempJoyState.Start = (xstate.Gamepad.wButtons & XINPUT_GAMEPAD_START) ? 255 : 0;
+#endif
+		float lx = (float)xstate.Gamepad.sThumbLX / (float)0x7FFF;
+		float ly = (float)xstate.Gamepad.sThumbLY / (float)0x7FFF;
+		float rx = (float)xstate.Gamepad.sThumbRX / (float)0x7FFF;
+		float ry = (float)xstate.Gamepad.sThumbRY / (float)0x7FFF;
+
+		if (Abs(lx) > 0.3f || Abs(ly) > 0.3f) {
+			PCTempJoyState.LeftStickX = (int32)(lx * 128.0f);
+			PCTempJoyState.LeftStickY = (int32)(-ly * 128.0f);
+		}
+
+		if (Abs(rx) > 0.3f || Abs(ry) > 0.3f) {
+			PCTempJoyState.RightStickX = (int32)(rx * 128.0f);
+			PCTempJoyState.RightStickY = (int32)(-ry * 128.0f);
+		}
+
+		XINPUT_VIBRATION VibrationState;
+
+		memset(&VibrationState, 0, sizeof(XINPUT_VIBRATION));
+
+		uint16 iLeftMotor = (uint16)((float)ShakeFreq / 255.0f * (float)0xffff);
+		uint16 iRightMotor = (uint16)((float)ShakeFreq / 255.0f * (float)0xffff);
+
+		if (ShakeDur < CTimer::GetTimeStepInMilliseconds())
+			ShakeDur = 0;
+		else
+			ShakeDur -= CTimer::GetTimeStepInMilliseconds();
+		if (ShakeDur == 0) ShakeFreq = 0;
+
+		VibrationState.wLeftMotorSpeed = iLeftMotor;
+		VibrationState.wRightMotorSpeed = iRightMotor;
+
+		XInputSetState(pad, &VibrationState);
+	}
+}
+#endif
+
+void CPad::UpdatePads(void)
+{
+	bool bUpdate = true;
+
+	GetPad(0)->UpdateMouse();
+#ifdef XINPUT
+	GetPad(0)->AffectFromXinput(m_bMapPadOneToPadTwo ? 1 : 0);
+	GetPad(1)->AffectFromXinput(m_bMapPadOneToPadTwo ? 0 : 1);
+#else
+	CapturePad(0);
+#endif
+
+	// Improve keyboard input latency part 1
+#ifdef FIX_BUGS
+	OldKeyState = NewKeyState;
+	NewKeyState = TempKeyState;
+#endif
+
+#ifdef DETECT_PAD_INPUT_SWITCH
+	if (GetPad(0)->PCTempJoyState.CheckForInput())
+		IsAffectedByController = true;
+	else {
+#endif
+		ControlsManager.ClearSimButtonPressCheckers();
+		ControlsManager.AffectPadFromKeyBoard();
+		ControlsManager.AffectPadFromMouse();
+
+#ifdef DETECT_PAD_INPUT_SWITCH
+	}
+	if (IsAffectedByController && (GetPad(0)->PCTempKeyState.CheckForInput() || GetPad(0)->PCTempMouseState.CheckForInput()))
+		IsAffectedByController = false;
+#endif
+
+	if ( CReplay::IsPlayingBackFromFile() && !FrontEndMenuManager.m_bMenuActive )
+		bUpdate = false;
+
+	if ( bUpdate )
+		GetPad(0)->Update(0);
+
+#ifndef MASTER
+	GetPad(1)->Update(1);
+#else
+	GetPad(1)->NewState.Clear();
+	GetPad(1)->OldState.Clear();
+#endif
+
+	// Improve keyboard input latency part 2
+#ifndef FIX_BUGS
+	OldKeyState = NewKeyState;
+	NewKeyState = TempKeyState;
+#endif
+}
+
+void CPad::ProcessPCSpecificStuff(void)
+{
+	;
+}
+
+void CPad::Update(int16 pad)
+{
+	OldState = NewState;
+
+#ifdef GTA_PS2
+	bObsoleteControllerMessage = false;
+
+	//int iPressureBtn;
+	int id;
+	int ext_id=0;
+	int state;
+	int rterm_id = 0;
+	unsigned short paddata, tpad;
+	unsigned char rdata[32];
+
+	state = scePadGetState(pad, 0);
+
+	switch(Phase)
+	{
+	case 0:
+		if (state != scePadStateStable && state != scePadStateFindCTP1)
+			break;
+		id = scePadInfoMode(pad, 0, InfoModeCurID, 0);
+		if (id==0) break;
+
+		ext_id = scePadInfoMode(pad, 0, InfoModeCurExID, 0);
+		if (ext_id>0) id = ext_id;
+
+		switch(id)
+		{
+		case 4: // Digital controller
+			Phase = 40; // Try for analog(dualshock)
+			break;
+		case 7: // Dualshock2 controller
+			Phase = 50;
+			break;
+		default:
+			Phase = 99;
+			break;
+		}
+		break;
+
+		// Analog Controller (old dualshock)
+	case 40: // Analog Contoller check valid (otherwise fail phase)
+		if (scePadInfoMode(pad, 0, InfoModeIdTable, -1)==0)
+		{
+			Phase = 99;
+			break;
+		}
+		Phase++;
+
+	case 41: // Analog controller: Request Lock analog mode (asynchronous)
+		if (scePadSetMainMode(pad, 0, 1, 3)==1) Phase++;
+		break;
+
+	case 42: // Analog controller: Check state of previous request
+		if (scePadGetReqState(pad, 0)==scePadReqStateFaild)
+		{
+			Phase--;
+		}
+
+		if (scePadGetReqState(pad, 0)==scePadReqStateComplete)
+		{
+			// Lock mode complete
+			Phase=0; // Accept normal dualshock
+		}
+		break;
+
+		// DualShock 2 Controller
+	case 50: // Analog Contoller check valid (otherwise fail phase)
+		if (scePadInfoMode(pad, 0, InfoModeIdTable, -1)==0)
+		{
+			Phase = 99;
+			break;
+		}
+		Phase++;
+
+	case 51: // Analog controller: Request Lock analog mode (asynchronous)
+		if (scePadSetMainMode(pad, 0, 1, 3)==1) Phase++;
+		break;
+
+	case 52: // Analog controller: Check state of previous request
+		if (scePadGetReqState(pad, 0)==scePadReqStateFaild)
+		{
+			Phase--;
+		}
+
+		if (scePadGetReqState(pad, 0)==scePadReqStateComplete)
+		{
+			// Lock mode complete
+			Phase=0; // Accept normal dualshock
+		}
+		break;
+
+	case 70: // DualShock 2 check pressure sensitive possible
+		if (scePadInfoPressMode(pad, 0)==1)
+		{
+			Phase = 76;
+			break;
+		}
+		Phase = 99;
+		break;
+
+	case 76: // DualShock2 enable pressure sensitive mode (asynchronous function)
+		if (scePadEnterPressMode(pad, 0)==1) Phase++;
+		break;
+
+	case 77: // Dualshock2 check status of request pressure sensitive mode
+		if (scePadGetReqState(pad, 0)==scePadReqStateFaild) Phase--;
+		if (scePadGetReqState(pad, 0)==scePadReqStateComplete)
+		{
+			Phase=80;
+		}
+		break;
+
+		// DualShock 2 Controller
+	case 80: // Set motors
+		if (scePadInfoAct(pad, 0, -1, 0)==0)
+		{
+			Phase = 99;
+		}
+
+		act_align[0] = 0; // Offset 0 for motor0
+		act_align[1] = 1; // Offset 1 for motor1
+
+		act_align[2] = 0xff;
+		act_align[3] = 0xff;
+		act_align[4] = 0xff;
+		act_align[5] = 0xff;
+
+		// Asynchronous function
+		if (scePadSetActAlign(pad, 0, act_align)==0) break;
+		Phase++;
+		break;
+
+
+	case 81:
+		if ( scePadGetState(pad, 0) != scePadStateExecCmd )
+		{
+			Phase = 99;
+		}
+
+		break;
+
+	default:
+		if ( state == scePadStateError ) break;
+
+		if ( state == scePadStateStable || state == scePadStateFindCTP1 )
+		{
+			if ( ShakeDur )
+			{
+				ShakeDur = Max(ShakeDur - (int32)CTimer::GetTimeStepInMilliseconds(), 0);
+
+				if ( ShakeDur == 0 )
+				{
+					act_direct[0] = 0;
+					act_direct[1] = 0;
+					scePadSetActDirect(pad, 0, act_direct);
+				}
+				else
+				{
+					act_direct[0] = 0;
+					act_direct[1] = (unsigned char) ShakeFreq;
+					scePadSetActDirect(pad, 0, act_direct);
+				}
+			}
+
+			if (scePadRead( pad, 0, rdata )==0)
+			{
+				NewState.Clear();
+				break;
+			}
+
+			if ((rdata[0] == 0))
+			{
+				paddata = (unsigned short) ( 0xffff ^ ((rdata[2]<<8)|rdata[3]) );
+				rterm_id = (rdata[1]);
+
+				if ( (rterm_id>>4) == 7 ) // DUALSHOCK
+				{
+					if (!CRecordDataForGame::IsPlayingBack() && !CRecordDataForChase::ShouldThisPadBeLeftAlone(pad))
+					{
+						tpad = paddata;
+
+						NewState.DPadUp			= ( tpad & SCE_PADLup )	   ? 255 : 0;
+						NewState.DPadDown		= ( tpad & SCE_PADLdown )  ? 255 : 0;
+						NewState.DPadLeft		= ( tpad & SCE_PADLleft )  ? 255 : 0;
+						NewState.DPadRight		= ( tpad & SCE_PADLright ) ? 255 : 0;
+						NewState.Triangle		= ( tpad & SCE_PADRup )	   ? 255 : 0;
+						NewState.Cross			= ( tpad & SCE_PADRdown )  ? 255 : 0;
+						NewState.Square			= ( tpad & SCE_PADRleft )  ? 255 : 0;
+						NewState.Circle			= ( tpad & SCE_PADRright ) ? 255 : 0;
+						NewState.Start			= ( tpad & SCE_PADstart )  ? 255 : 0;
+						NewState.Select			= ( tpad & SCE_PADselect ) ? 255 : 0;
+						NewState.LeftShoulder1	= ( tpad & SCE_PADL1 )	   ? 255 : 0;
+						NewState.LeftShoulder2	= ( tpad & SCE_PADL2 )	   ? 255 : 0;
+						NewState.RightShoulder1 = ( tpad & SCE_PADR1 )	   ? 255 : 0;
+						NewState.RightShoulder2 = ( tpad & SCE_PADR2 )	   ? 255 : 0;
+						NewState.LeftShock		= ( tpad & SCE_PADi )	   ? 255 : 0;
+						NewState.RightShock		= ( tpad & SCE_PADj )	   ? 255 : 0;
+						NewState.RightStickX	= (short)rdata[4];
+						NewState.RightStickY	= (short)rdata[5];
+						NewState.LeftStickX		= (short)rdata[6];
+						NewState.LeftStickY		= (short)rdata[7];
+
+						#define CLAMP_AXIS(x) (((x) < 43 && (x) >= -42) ? 0 : (((x) > 0) ? (Max((x)-42, 0)*127/85) : Min((x)+42, 0)*127/85))
+						#define FIX_AXIS(x) CLAMP_AXIS((x)-128)
+
+						NewState.RightStickX = FIX_AXIS(NewState.RightStickX);
+						NewState.RightStickY = FIX_AXIS(NewState.RightStickY);
+						NewState.LeftStickX	 = FIX_AXIS(NewState.LeftStickX);
+						NewState.LeftStickY	 = FIX_AXIS(NewState.LeftStickY);
+
+						#undef FIX_AXIS
+						#undef CLAMP_AXIS
+					}
+				}
+				else if ( (rterm_id>>4) == 4 ) // Controller (digital)
+				{
+					if ( pad == 0 )
+						bObsoleteControllerMessage = true;
+					NewState.Clear();
+				}
+
+				if ( NewState.IsAnyButtonPressed() )
+					LastTimeTouched = CTimer::GetTimeInMilliseconds();
+
+				break;
+			}
+
+			if ( ++iCurrHornHistory >= HORNHISTORY_SIZE )
+				iCurrHornHistory = 0;
+
+			bHornHistory[iCurrHornHistory] = GetHorn();
+			NewState.Clear();
+			return;
+		}
+		break;
+	}
+
+	if ( pad == 0 )
+	{
+		bOldDisplayNoControllerMessage = bDisplayNoControllerMessage;
+		if ( state == scePadStateDiscon )
+		{
+			bDisplayNoControllerMessage = true;
+			Phase = 0;
+		}
+		else
+			bDisplayNoControllerMessage = false;
+	}
+
+	if ( ++iCurrHornHistory >= HORNHISTORY_SIZE )
+		iCurrHornHistory = 0;
+
+	bHornHistory[iCurrHornHistory] = GetHorn();
+
+	if ( !bDisplayNoControllerMessage )
+		CGame::bDemoMode = false;
+#endif
+
+#if (defined GTA_PS2 || defined FIX_BUGS)
+	if (!CRecordDataForGame::IsPlayingBack() && !CRecordDataForChase::ShouldThisPadBeLeftAlone(pad))
+#endif
+	{
+		NewState = ReconcileTwoControllersInput(PCTempKeyState, PCTempJoyState);
+		NewState = ReconcileTwoControllersInput(PCTempMouseState, NewState);
+	}
+
+	PCTempJoyState.Clear();
+	PCTempKeyState.Clear();
+	PCTempMouseState.Clear();
+
+	ProcessPCSpecificStuff();
+
+	if (NewState.CheckForInput())
+		LastTimeTouched = CTimer::GetTimeInMilliseconds();
+	
+	if ( ++iCurrHornHistory >= HORNHISTORY_SIZE )
+		iCurrHornHistory = 0;
+
+	bHornHistory[iCurrHornHistory] = GetHorn();
+
+	for (int32 i = DRUNK_STEERING_BUFFER_SIZE - 2; i >= 0; i--) {
+		SteeringLeftRightBuffer[i + 1] = SteeringLeftRightBuffer[i];
+	}
+
+	if ( !bDisplayNoControllerMessage )
+		CGame::bDemoMode = false;
+
+	if ( JustOutOfFrontend != 0 )
+		--JustOutOfFrontend;
+}
+
+void CPad::DoCheats(void)
+{
+#ifdef DETECT_PAD_INPUT_SWITCH
+	if (IsAffectedByController)
+#endif
+		GetPad(0)->DoCheats(0);
+}
+
+void CPad::DoCheats(int16 unk)
+{
+#ifdef GTA_PS2_STUFF
+	if ( GetTriangleJustDown() )
+		AddToCheatString('T');
+
+	if ( GetCircleJustDown() )
+		AddToCheatString('C');
+
+	if ( GetCrossJustDown() )
+		AddToCheatString('X');
+
+	if ( GetSquareJustDown() )
+		AddToCheatString('S');
+
+	if ( GetDPadUpJustDown() )
+		AddToCheatString('U');
+
+	if ( GetDPadDownJustDown() )
+		AddToCheatString('D');
+
+	if ( GetDPadLeftJustDown() )
+		AddToCheatString('L');
+
+	if ( GetDPadRightJustDown() )
+		AddToCheatString('R');
+
+	if ( GetLeftShoulder1JustDown() )
+		AddToCheatString('1');
+
+	if ( GetLeftShoulder2JustDown() )
+		AddToCheatString('2');
+
+	if ( GetRightShoulder1JustDown() )
+		AddToCheatString('3');
+
+	if ( GetRightShoulder2JustDown() )
+		AddToCheatString('4');
+#endif
+}
+
+void CPad::StopPadsShaking(void)
+{
+	GetPad(0)->StopShaking(0);
+}
+
+void CPad::StopShaking(int16 pad)
+{
+#ifdef GTA_PS2_STUFF
+	ShakeFreq = 0;
+	ShakeDur = 0;
+
+#ifdef GTA_PS2
+	if ( Phase == 99 )
+	{
+		act_direct[0] = 0;
+		act_direct[1] = 0;
+		scePadSetActDirect(pad, 0, act_direct);
+	}
+#endif
+
+#endif
+}
+
+CPad *CPad::GetPad(int32 pad)
+{
+	return &Pads[pad];
+}
+#ifdef DETECT_PAD_INPUT_SWITCH
+#define CURMODE (IsAffectedByController ? Mode : 0)
+#else
+#define CURMODE (Mode)
+#endif
+
+int16 CPad::GetSteeringLeftRight(void)
+{
+	if ( ArePlayerControlsDisabled() )
+		return 0;
+
+	int16 value;
+	switch (CURMODE)
+	{
+		case 0:
+		case 2:
+		{
+			int16 axis = NewState.LeftStickX;
+			int16 dpad = (NewState.DPadRight - NewState.DPadLeft) / 2;
+
+			if ( Abs(axis) > Abs(dpad) )
+				value = axis;
+			else
+				value = dpad;
+
+			SteeringLeftRightBuffer[0] = value;
+			value = SteeringLeftRightBuffer[DrunkDrivingBufferUsed];
+
+			break;
+		}
+
+		case 1:
+		case 3:
+		{
+			SteeringLeftRightBuffer[0] = NewState.LeftStickX;
+			value = SteeringLeftRightBuffer[DrunkDrivingBufferUsed];
+			break;
+		}
+		default:
+		{
+			value = 0;
+			break;
+		}
+	}
+
+	return value;
+}
+
+int16 CPad::GetSteeringUpDown(void)
+{
+	if ( ArePlayerControlsDisabled() )
+		return 0;
+
+	switch (CURMODE)
+	{
+		case 0:
+		case 2:
+		{
+			int16 axis = NewState.LeftStickY;
+			int16 dpad = (NewState.DPadDown - NewState.DPadUp) / 2;
+
+			if ( Abs(axis) > Abs(dpad) )
+				return axis;
+			else
+				return dpad;
+
+			break;
+		}
+
+		case 1:
+		case 3:
+		{
+			return NewState.LeftStickY;
+
+			break;
+		}
+	}
+
+	return 0;
+}
+
+int16 CPad::GetCarGunUpDown(void)
+{
+	if ( ArePlayerControlsDisabled() )
+		return 0;
+
+	switch (CURMODE)
+	{
+		case 0:
+		case 1:
+		case 2:
+		{
+			return NewState.RightStickY;
+
+			break;
+		}
+
+		case 3:
+		{
+			return (NewState.DPadUp - NewState.DPadDown) / 2;
+
+			break;
+		}
+	}
+
+	return 0;
+}
+
+int16 CPad::GetCarGunLeftRight(void)
+{
+	if ( ArePlayerControlsDisabled() )
+		return 0;
+
+	switch (CURMODE)
+	{
+		case 0:
+		case 1:
+		case 2:
+		{
+			return NewState.RightStickX;
+
+			break;
+		}
+
+		case 3:
+		{
+			return (NewState.DPadRight - NewState.DPadLeft) / 2;
+
+			break;
+		}
+	}
+
+	return 0;
+}
+
+int16 CPad::GetPedWalkLeftRight(void)
+{
+	if ( ArePlayerControlsDisabled() )
+		return 0;
+
+	switch (CURMODE)
+	{
+		case 0:
+		case 2:
+		{
+			int16 axis = NewState.LeftStickX;
+			int16 dpad = (NewState.DPadRight - NewState.DPadLeft) / 2;
+
+			if ( Abs(axis) > Abs(dpad) )
+				return axis;
+			else
+				return dpad;
+
+			break;
+		}
+
+		case 1:
+		case 3:
+		{
+			return NewState.LeftStickX;
+
+			break;
+		}
+	}
+
+	return 0;
+}
+
+int16 CPad::GetPedWalkUpDown(void)
+{
+	if ( ArePlayerControlsDisabled() )
+		return 0;
+
+	switch (CURMODE)
+	{
+		case 0:
+		case 2:
+		{
+			int16 axis = NewState.LeftStickY;
+			int16 dpad = (NewState.DPadDown - NewState.DPadUp) / 2;
+
+			if ( Abs(axis) > Abs(dpad) )
+				return axis;
+			else
+				return dpad;
+
+			break;
+		}
+
+		case 1:
+		case 3:
+		{
+			return NewState.LeftStickY;
+
+			break;
+		}
+	}
+
+	return 0;
+}
+
+int16 CPad::GetAnalogueUpDown(void)
+{
+	switch (CURMODE)
+	{
+		case 0:
+		case 2:
+		{
+			int16 axis = NewState.LeftStickY;
+			int16 dpad = (NewState.DPadDown - NewState.DPadUp) / 2;
+
+			if ( Abs(axis) > Abs(dpad) )
+				return axis;
+			else
+				return dpad;
+
+			break;
+		}
+
+		case 1:
+		case 3:
+		{
+			return NewState.LeftStickY;
+
+			break;
+		}
+	}
+
+	return 0;
+}
+
+int16 CPad::GetAnalogueLeftRight(void)
+{
+	switch (CURMODE)
+	{
+		case 0:
+		case 2:
+		{
+			int16 axis = NewState.LeftStickX;
+			int16 dpad = (NewState.DPadRight - NewState.DPadLeft) / 2;
+
+			if ( Abs(axis) > Abs(dpad) )
+				return axis;
+			else
+				return dpad;
+
+			break;
+		}
+
+		case 1:
+		case 3:
+		{
+			return NewState.LeftStickX;
+
+			break;
+		}
+	}
+
+	return 0;
+}
+
+bool CPad::GetLookLeft(void)
+{
+	if ( ArePlayerControlsDisabled() )
+		return false;
+
+	return !!(NewState.LeftShoulder2 && !NewState.RightShoulder2);
+}
+
+bool CPad::GetLookRight(void)
+{
+	if ( ArePlayerControlsDisabled() )
+		return false;
+
+	return !!(NewState.RightShoulder2 && !NewState.LeftShoulder2);
+}
+
+
+bool CPad::GetLookBehindForCar(void)
+{
+	if ( ArePlayerControlsDisabled() )
+		return false;
+
+	return !!(NewState.RightShoulder2 && NewState.LeftShoulder2);
+}
+
+bool CPad::GetLookBehindForPed(void)
+{
+	if ( ArePlayerControlsDisabled() )
+		return false;
+
+	return !!NewState.RightShock;
+}
+
+bool CPad::GetHorn(void)
+{
+	if ( ArePlayerControlsDisabled() )
+		return false;
+
+	switch (CURMODE)
+	{
+		case 0:
+		{
+			return !!NewState.LeftShock;
+
+			break;
+		}
+
+		case 1:
+		{
+			return !!NewState.LeftShoulder1;
+
+			break;
+		}
+
+		case 2:
+		{
+			return !!NewState.RightShoulder1;
+
+			break;
+		}
+
+		case 3:
+		{
+			return !!NewState.LeftShock;
+
+			break;
+		}
+	}
+
+	return false;
+}
+
+bool CPad::HornJustDown(void)
+{
+	if ( ArePlayerControlsDisabled() )
+		return false;
+
+	switch (CURMODE)
+	{
+		case 0:
+		{
+			return !!(NewState.LeftShock && !OldState.LeftShock);
+
+			break;
+		}
+
+		case 1:
+		{
+			return !!(NewState.LeftShoulder1 && !OldState.LeftShoulder1);
+
+			break;
+		}
+
+		case 2:
+		{
+			return !!(NewState.RightShoulder1 && !OldState.RightShoulder1);
+
+			break;
+		}
+
+		case 3:
+		{
+			return !!(NewState.LeftShock && !OldState.LeftShock);
+
+			break;
+		}
+	}
+
+	return false;
+}
+
+bool CPad::GetCarGunFired(void)
+{
+	if ( ArePlayerControlsDisabled() )
+		return false;
+
+	switch (CURMODE)
+	{
+		case 0:
+		case 1:
+		case 2:
+		{
+			return !!NewState.Circle;
+
+			break;
+		}
+
+		case 3:
+		{
+			return !!NewState.RightShoulder1;
+
+			break;
+		}
+	}
+
+	return false;
+}
+
+bool CPad::CarGunJustDown(void)
+{
+	if ( ArePlayerControlsDisabled() )
+		return false;
+
+	switch (CURMODE)
+	{
+		case 0:
+		case 1:
+		case 2:
+		{
+			return !!(NewState.Circle && !OldState.Circle);
+
+			break;
+		}
+
+		case 3:
+		{
+			return !!(NewState.RightShoulder1 && !OldState.RightShoulder1);
+
+			break;
+		}
+	}
+
+	return false;
+}
+
+int16 CPad::GetHandBrake(void)
+{
+	if ( ArePlayerControlsDisabled() )
+		return 0;
+
+	switch (CURMODE)
+	{
+		case 0:
+		case 1:
+		{
+			return NewState.RightShoulder1;
+
+			break;
+		}
+
+		case 2:
+		{
+			return NewState.Triangle;
+
+			break;
+		}
+
+		case 3:
+		{
+			return NewState.LeftShoulder1;
+
+			break;
+		}
+	}
+
+	return 0;
+}
+
+int16 CPad::GetBrake(void)
+{
+	if ( ArePlayerControlsDisabled() )
+		return 0;
+
+	switch (CURMODE)
+	{
+		case 0:
+		case 2:
+		{
+			return NewState.Square;
+
+			break;
+		}
+
+		case 1:
+		{
+			return NewState.Square;
+
+			break;
+		}
+
+		case 3:
+		{
+			int16 axis = 2 * NewState.RightStickY;
+
+			if ( axis < 0 )
+				return 0;
+			else
+				return axis;
+
+			break;
+		}
+	}
+
+	return 0;
+}
+
+bool CPad::GetExitVehicle(void)
+{
+	if ( ArePlayerControlsDisabled() )
+		return false;
+
+
+	if ( JustOutOfFrontend != 0 )
+		return false;
+
+	switch (CURMODE)
+	{
+		case 0:
+		case 1:
+		case 3:
+		{
+			return !!NewState.Triangle;
+
+			break;
+		}
+
+		case 2:
+		{
+			return !!NewState.LeftShoulder1;
+
+			break;
+		}
+	}
+
+	return false;
+}
+
+bool CPad::ExitVehicleJustDown(void)
+{
+	if ( ArePlayerControlsDisabled() )
+		return false;
+
+	if ( JustOutOfFrontend != 0 )
+		return false;
+
+	switch (CURMODE)
+	{
+		case 0:
+		case 1:
+		case 3:
+		{
+			return !!(NewState.Triangle && !OldState.Triangle);
+
+			break;
+		}
+
+		case 2:
+		{
+			return !!(NewState.LeftShoulder1 && !OldState.LeftShoulder1);
+
+			break;
+		}
+	}
+
+	return false;
+}
+
+int32 CPad::GetWeapon(void)
+{
+	if ( ArePlayerControlsDisabled() )
+		return false;
+
+	switch (CURMODE)
+	{
+		case 0:
+		case 1:
+		{
+			return NewState.Circle;
+
+			break;
+		}
+
+		case 2:
+		{
+			return NewState.Cross;
+
+			break;
+		}
+
+		case 3:
+		{
+			return NewState.RightShoulder1;
+
+			break;
+		}
+	}
+
+	return false;
+}
+
+bool CPad::WeaponJustDown(void)
+{
+	if ( ArePlayerControlsDisabled() )
+		return false;
+
+	switch (CURMODE)
+	{
+		case 0:
+		case 1:
+		{
+			return !!(NewState.Circle && !OldState.Circle);
+
+			break;
+		}
+
+		case 2:
+		{
+			return !!(NewState.Cross && !OldState.Cross);
+
+			break;
+		}
+
+		case 3:
+		{
+			return !!(NewState.RightShoulder1 && !OldState.RightShoulder1);
+
+			break;
+		}
+	}
+
+	return false;
+}
+
+int16 CPad::GetAccelerate(void)
+{
+	if ( ArePlayerControlsDisabled() )
+		return 0;
+
+	switch (CURMODE)
+	{
+		case 0:
+		case 2:
+		{
+			return NewState.Cross;
+
+			break;
+		}
+
+		case 1:
+		{
+			return NewState.Cross;
+
+			break;
+		}
+
+		case 3:
+		{
+			int16 axis = -2 * NewState.RightStickY;
+
+			if ( axis < 0 )
+				return 0;
+			else
+				return axis;
+
+			break;
+		}
+	}
+
+	return 0;
+}
+
+bool CPad::CycleCameraModeJustDown(void)
+{
+	bool result;
+	switch (CURMODE)
+	{
+		case 0:
+		case 2:
+		case 3:
+		{
+			result = !!(NewState.Select && !OldState.Select);
+
+			break;
+		}
+
+		case 1:
+		{
+			result = !!(NewState.DPadUp && !OldState.DPadUp);
+
+			break;
+		}
+		default:
+		{
+			result = false;
+			break;
+		}
+	}
+
+	if (!result)
+	{
+		switch (CURMODE)
+		{
+			case 1:
+			{
+				result = !!(NewState.DPadDown && !OldState.DPadDown);
+				break;
+			}
+			default:
+			{
+				result = false;
+				break;
+			}
+		}
+	}
+
+	return result;
+}
+
+bool CPad::CycleCameraModeUpJustDown(void)
+{
+	switch (CURMODE)
+	{
+		case 0:
+		case 2:
+		case 3:
+		{
+			return !!(NewState.Select && !OldState.Select);
+
+			break;
+		}
+
+		case 1:
+		{
+			return !!(NewState.DPadUp && !OldState.DPadUp);
+
+			break;
+		}
+	}
+
+	return false;
+}
+
+bool CPad::CycleCameraModeDownJustDown(void)
+{
+	switch (CURMODE)
+	{
+		case 0:
+		case 2:
+		case 3:
+		{
+			return false;
+
+			break;
+		}
+
+		case 1:
+		{
+			return !!(NewState.DPadDown && !OldState.DPadDown);
+
+			break;
+		}
+	}
+
+	return false;
+}
+
+bool CPad::ChangeStationJustDown(void)
+{
+	if ( ArePlayerControlsDisabled() )
+		return false;
+
+	switch (CURMODE)
+	{
+		case 0:
+		{
+			return !!(NewState.LeftShoulder1 && !OldState.LeftShoulder1);
+
+			break;
+		}
+
+		case 1:
+		{
+			return !!(NewState.Select && !OldState.Select);
+
+			break;
+		}
+
+		case 2:
+		{
+			return !!(NewState.LeftShock && !OldState.LeftShock);
+
+			break;
+		}
+
+		case 3:
+		{
+			return !!(NewState.Circle && !OldState.Circle);
+
+			break;
+		}
+	}
+
+	return false;
+}
+
+bool CPad::CycleWeaponLeftJustDown(void)
+{
+	if ( ArePlayerControlsDisabled() )
+		return false;
+
+	return !!(NewState.LeftShoulder2 && !OldState.LeftShoulder2);
+}
+
+bool CPad::CycleWeaponRightJustDown(void)
+{
+	if ( ArePlayerControlsDisabled() )
+		return false;
+
+	return !!(NewState.RightShoulder2 && !OldState.RightShoulder2);
+}
+
+bool CPad::GetTarget(void)
+{
+	if ( ArePlayerControlsDisabled() )
+		return false;
+
+	switch (CURMODE)
+	{
+		case 0:
+		case 1:
+		case 2:
+		{
+			return !!NewState.RightShoulder1;
+
+			break;
+		}
+
+		case 3:
+		{
+			return !!NewState.LeftShoulder1;
+
+			break;
+		}
+	}
+
+	return false;
+}
+
+bool CPad::TargetJustDown(void)
+{
+	if ( ArePlayerControlsDisabled() )
+		return false;
+
+	switch (CURMODE)
+	{
+		case 0:
+		case 1:
+		case 2:
+		{
+			return !!(NewState.RightShoulder1 && !OldState.RightShoulder1);
+
+			break;
+		}
+
+		case 3:
+		{
+			return !!(NewState.LeftShoulder1 && !OldState.LeftShoulder1);
+
+			break;
+		}
+	}
+
+	return false;
+}
+
+bool CPad::CollectPickupJustDown(void)
+{
+	if ( ArePlayerControlsDisabled() )
+		return false;
+
+	switch (CURMODE)
+	{
+		case 0:
+		case 1:
+		{
+			return !!(NewState.LeftShoulder1 && !OldState.LeftShoulder1);
+
+			break;
+		}
+		case 2:
+		{
+			return !!(NewState.Triangle && !OldState.Triangle);
+
+			break;
+		}
+
+		case 3:
+		{
+			return !!(NewState.Circle && !OldState.Circle);
+
+			break;
+		}
+	}
+
+	return false;
+}
+
+bool CPad::DuckJustDown(void)
+{
+	if (ArePlayerControlsDisabled())
+		return false;
+
+	return !!(NewState.LeftShock && !OldState.LeftShock);
+}
+
+bool CPad::JumpJustDown(void)
+{
+	if ( ArePlayerControlsDisabled() )
+		return false;
+
+	return !!(NewState.Square && !OldState.Square);
+}
+
+bool CPad::GetSprint(void)
+{
+	if ( ArePlayerControlsDisabled() )
+		return false;
+
+	switch (CURMODE)
+	{
+		case 0:
+		case 1:
+		case 3:
+		{
+			return !!NewState.Cross;
+
+			break;
+		}
+
+		case 2:
+		{
+			return !!NewState.Circle;
+
+			break;
+		}
+	}
+
+	return false;
+}
+
+bool CPad::ShiftTargetLeftJustDown(void)
+{
+	if ( ArePlayerControlsDisabled() )
+		return false;
+
+	return !!(NewState.LeftShoulder2 && !OldState.LeftShoulder2);
+}
+
+bool CPad::ShiftTargetRightJustDown(void)
+{
+	if ( ArePlayerControlsDisabled() )
+		return false;
+
+	return !!(NewState.LeftShoulder1 && !OldState.LeftShoulder1) || !!(NewState.RightShoulder2 && !OldState.RightShoulder2);
+}
+
+bool CPad::GetAnaloguePadUp(void)
+{
+	static int16 oldfStickY = 0;
+
+	int16 leftStickY = CPad::GetPad(0)->GetLeftStickY();
+
+	if ( leftStickY < -15 && oldfStickY >= -5 )
+	{
+		oldfStickY = leftStickY;
+		return true;
+	}
+	else
+	{
+		oldfStickY = leftStickY;
+		return false;
+	}
+}
+
+bool CPad::GetAnaloguePadDown(void)
+{
+	static int16 oldfStickY = 0;
+
+	int16 leftStickY = CPad::GetPad(0)->GetLeftStickY();
+
+	if ( leftStickY > 15 && oldfStickY <= 5 )
+	{
+		oldfStickY = leftStickY;
+		return true;
+	}
+	else
+	{
+		oldfStickY = leftStickY;
+		return false;
+	}
+}
+
+bool CPad::GetAnaloguePadLeft(void)
+{
+	static int16 oldfStickX = 0;
+
+	int16 leftStickX = CPad::GetPad(0)->GetLeftStickX();
+
+	if ( leftStickX < -15 && oldfStickX >= -5 )
+	{
+		oldfStickX = leftStickX;
+		return true;
+	}
+	else
+	{
+		oldfStickX = leftStickX;
+		return false;
+	}
+}
+
+bool CPad::GetAnaloguePadRight(void)
+{
+	static int16 oldfStickX = 0;
+
+	int16 leftStickX = CPad::GetPad(0)->GetLeftStickX();
+
+	if ( leftStickX > 15 && oldfStickX <= 5 )
+	{
+		oldfStickX = leftStickX;
+		return true;
+	}
+	else
+	{
+		oldfStickX = leftStickX;
+		return false;
+	}
+}
+
+bool CPad::GetAnaloguePadLeftJustUp(void)
+{
+	static int16 oldfStickX = 0;
+
+	int16 X = GetPad(0)->GetPedWalkLeftRight();
+
+	if ( X == 0 && oldfStickX < 0 )
+	{
+		oldfStickX = 0;
+
+		return true;
+	}
+	else
+	{
+		oldfStickX = X;
+
+		return false;
+	}
+}
+
+bool CPad::GetAnaloguePadRightJustUp(void)
+{
+	static int16 oldfStickX = 0;
+
+	int16 X = GetPad(0)->GetPedWalkLeftRight();
+
+	if ( X == 0 && oldfStickX > 0 )
+	{
+		oldfStickX = 0;
+
+		return true;
+	}
+	else
+	{
+		oldfStickX = X;
+
+		return false;
+	}
+}
+
+bool CPad::ForceCameraBehindPlayer(void)
+{
+	if ( ArePlayerControlsDisabled() )
+		return false;
+
+	switch (CURMODE)
+	{
+		case 0:
+		case 1:
+		{
+			return !!NewState.LeftShoulder1;
+
+			break;
+		}
+
+		case 2:
+		{
+			return !!NewState.Triangle;
+
+			break;
+		}
+
+		case 3:
+		{
+			return !!NewState.Circle;
+
+			break;
+		}
+	}
+
+	return false;
+}
+
+bool CPad::SniperZoomIn(void)
+{
+	if ( ArePlayerControlsDisabled() )
+		return false;
+
+	switch (CURMODE)
+	{
+		case 0:
+		case 1:
+		case 3:
+		{
+			return !!NewState.Square;
+
+			break;
+		}
+
+		case 2:
+		{
+			return !!NewState.Triangle;
+
+			break;
+		}
+	}
+
+	return false;
+}
+
+bool CPad::SniperZoomOut(void)
+{
+	if ( ArePlayerControlsDisabled() )
+		return false;
+
+	switch (CURMODE)
+	{
+		case 0:
+		case 1:
+		case 3:
+		{
+			return !!NewState.Cross;
+
+			break;
+		}
+
+		case 2:
+		{
+			return !!NewState.Square;
+
+			break;
+		}
+	}
+
+	return false;
+}
+
+#undef CURMODE
+
+int16 CPad::SniperModeLookLeftRight(void)
+{
+	int16 axis = NewState.LeftStickX;
+	int16 dpad = (NewState.DPadRight - NewState.DPadLeft) / 2;
+
+	if ( Abs(axis) > Abs(dpad) ) {
+		if ( Abs(axis) > 35.0f ) {
+		  return (axis > 0.f ? axis - 35.f : axis + 35.f) * (128.f / (128 - 35));
+		} else {
+		  return 0;
+		}
+	} else
+		return dpad;
+}
+
+int16 CPad::SniperModeLookUpDown(void)
+{
+	int16 axis = NewState.LeftStickY;
+	int16 dpad;
+
+#ifdef FIX_BUGS
+	axis = -axis;
+#endif
+	if (CPad::bInvertLook4Pad) {
+		axis = -axis;
+		dpad = (NewState.DPadDown - NewState.DPadUp) / 2;
+	} else {
+		dpad = (NewState.DPadUp - NewState.DPadDown) / 2;
+	}
+
+	if ( Abs(axis) > Abs(dpad) ) {
+	    if ( Abs(axis) > 35.0f ) {
+	      return (axis > 0.f ? axis - 35.f : axis + 35.f) * (128.f / (128 - 35));
+	    } else {
+	      return 0;
+	    }
+	} else
+		return dpad;
+}
+
+int16 CPad::LookAroundLeftRight(void)
+{
+	float axis = GetPad(0)->NewState.RightStickX;
+
+	if ( Abs(axis) > 85 && !GetLookBehindForPed() )
+		return (int16) ( (axis + ( ( axis > 0 ) ? -85 : 85) )
+							* (127.0f / 32.0f) ); // 3.96875f
+
+	else if ( TheCamera.Cams[0].Using3rdPersonMouseCam() && Abs(axis) > 10 )
+		return (int16) ( (axis + ( ( axis > 0 ) ? -10 : 10) )
+							* (127.0f / 64.0f) ); // 1.984375f
+
+	return 0;
+}
+
+int16 CPad::LookAroundUpDown(void)
+{
+	int16 axis = GetPad(0)->NewState.RightStickY;
+#ifdef FIX_BUGS
+	axis = -axis;
+#endif
+	if (CPad::bInvertLook4Pad)
+		axis = -axis;
+
+	if ( Abs(axis) > 85 && !GetLookBehindForPed() )
+		return (int16) ( (axis + ( ( axis > 0 ) ? -85 : 85) )
+							* (127.0f / 32.0f) ); // 3.96875f
+
+	else if ( TheCamera.Cams[0].Using3rdPersonMouseCam() && Abs(axis) > 40 )
+		return (int16) ( (axis + ( ( axis > 0 ) ? -40 : 40) )
+							* (127.0f / 64.0f) ); // 1.984375f
+
+	return 0;
+}
+
+void CPad::ResetAverageWeapon(void)
+{
+	AverageWeapon = GetWeapon();
+	AverageEntries = 1;
+}
+
+void CPad::PrintErrorMessage(void)
+{
+	if (TheCamera.m_WideScreenOn)
+		return;
+
+	if ( bDisplayNoControllerMessage && !CGame::playingIntro && !FrontEndMenuManager.m_bMenuActive )
+	{
+		CSprite2d::DrawRect(CRect(SCREEN_STRETCH_X(20.0f), SCREEN_SCALE_FROM_BOTTOM(130.0f), SCREEN_STRETCH_FROM_RIGHT(20.0f), SCREEN_SCALE_Y(140.0f)), CRGBA(50, 50, 50, 210));
+#ifdef FIX_BUGS
+		CFont::SetScale(SCREEN_SCALE_X(0.85f), SCREEN_SCALE_Y(1.0f));
+#else
+		CFont::SetScale(0.85f, 1.0f);
+#endif
+		CFont::SetJustifyOff();
+		CFont::SetBackgroundOff();
+#ifdef FIX_BUGS
+		CFont::SetCentreSize(SCREEN_SCALE_X(DEFAULT_SCREEN_WIDTH - 20));
+#else
+		CFont::SetCentreSize(SCREEN_WIDTH - 20);
+#endif
+		CFont::SetCentreOn();
+		CFont::SetPropOn();
+		CFont::SetColor(CRGBA(255, 255, 200, 200));
+		CFont::SetFontStyle(FONT_STANDARD);
+		CFont::PrintString
+		(
+			SCREEN_WIDTH  / 2,
+			SCREEN_HEIGHT / 2 - SCREEN_SCALE_Y(40.0f),
+			TheText.Get("NOCONT") // Please reconnect an analog controller (DUALSHOCK@) or analog controller (DUALSHOCK@2). to controller port 1 to continue
+		);
+	}
+	else if ( bObsoleteControllerMessage )
+	{
+		CSprite2d::DrawRect(CRect(SCREEN_STRETCH_X(20.0f), SCREEN_SCALE_FROM_BOTTOM(130.0f), SCREEN_STRETCH_FROM_RIGHT(20.0f), SCREEN_SCALE_Y(140.0f)), CRGBA(50, 50, 50, 210));
+#ifdef FIX_BUGS
+		CFont::SetScale(SCREEN_SCALE_X(0.85f), SCREEN_SCALE_Y(1.0f));
+#else
+		CFont::SetScale(0.85f, 1.0f);
+#endif
+		CFont::SetJustifyOff();
+		CFont::SetBackgroundOff();
+#ifdef FIX_BUGS
+		CFont::SetCentreSize(SCREEN_SCALE_X(DEFAULT_SCREEN_WIDTH - 20));
+#else
+		CFont::SetCentreSize(SCREEN_WIDTH - 20);
+#endif
+		CFont::SetCentreOn();
+		CFont::SetPropOn();
+		CFont::SetColor(CRGBA(255, 255, 200, 200));
+		CFont::SetFontStyle(FONT_STANDARD);
+		CFont::PrintString
+		(
+			SCREEN_WIDTH  / 2,
+			SCREEN_HEIGHT / 2 - SCREEN_SCALE_Y(40.0f),
+			TheText.Get("WRCONT") // The controller connected to controller port 1 is an unsupported controller. Grand Theft Auto III requires an analog controller (DUALSHOCK@) or analog controller (DUALSHOCK@2).
+		);
+	}
+
+}
+
+void LittleTest(void)
+{
+	static int32 Cunt = 0;
+
+	Cunt++; // ???
+}
+
+void CPad::ResetCheats(void)
+{
+	CWeather::ReleaseWeather();
+
+	gbFastTime = false;
+	CPopulation::ms_bGivePedsWeapons = false;
+	CTimer::SetTimeScale(1.0f);
+
+	CVehicle::bWheelsOnlyCheat = false;
+	CVehicle::bAllDodosCheat = false;
+	CVehicle::bCheat3 = false;
+	CVehicle::bCheat4 = false;
+	CVehicle::bCheat5 = false;
+	CVehicle::bAllTaxisHaveNitro = false;
+	CVehicle::bHoverCheat = false;
+	CVehicle::bCheat8 = false;
+	CVehicle::bCheat9 = false;
+	CVehicle::bCheat10 = false;
+#ifdef RESTORE_ALLCARSHELI_CHEAT
+	bAllCarCheat = false;
+#endif
+	gbBlackCars = false;
+	gbPinkCars = false;
+
+	CCarCtrl::bMadDriversCheat = false;
+	CTrafficLights::bGreenLightsCheat = false;
+	CStats::ShowChaseStatOnScreen = 0;
+	CPed::bNastyLimbsCheat = false;
+	CPed::bFannyMagnetCheat = false;
+	CPed::bPedCheat3 = false;
+
+}
+
+char *CPad::EditString(char *pStr, int32 nSize)
+{
+	int32 pos = (int32)strlen(pStr);
+
+	// letters
+	for ( int32 i = 0; i < ('Z' - 'A' + 1); i++ )
+	{
+		if ( GetPad(0)->GetCharJustDown(i + 'A') && pos < nSize - 1 )
+		{
+			pStr[pos++] = i + 'A';
+			pStr[pos] = '\0';
+		}
+
+		if ( GetPad(0)->GetCharJustDown(i + 'a') && pos < nSize - 1 )
+		{
+			pStr[pos++] = i + 'a';
+			pStr[pos] = '\0';
+		}
+	}
+
+	// numbers
+	for ( int32 i = 0; i < ('9' - '0' + 1); i++ )
+	{
+		if ( GetPad(0)->GetCharJustDown(i + '0') && pos < nSize - 1 )
+		{
+			pStr[pos++] = i + '0';
+			pStr[pos] = '\0';
+		}
+	}
+
+	// space
+	if ( GetPad(0)->GetCharJustDown(' ') && pos < nSize - 1 )
+	{
+		pStr[pos++] = ' ';
+		pStr[pos] = '\0';
+	}
+
+
+	// del
+	if ( GetPad(0)->GetDeleteJustDown() || GetPad(0)->GetBackspaceJustDown() )
+	{
+		if ( pos > 0 )
+			pStr[pos - 1] = '\0';
+	}
+
+	// extenter/up/down
+	if ( GetPad(0)->GetReturnJustDown() || GetPad(0)->GetUpJustDown() || GetPad(0)->GetDownJustDown() )
+		return nil;
+
+	return pStr;
+}
+
+int32 *CPad::EditCodesForControls(int32 *pRsKeys, int32 nSize)
+{
+	*pRsKeys = rsNULL;
+
+	for ( int32 i = 0; i < 255; i++ )
+	{
+		if ( GetPad(0)->GetCharJustDown(i) )
+			*pRsKeys = i;
+	}
+
+	for ( int32 i = 0; i < 12; i++ )
+	{
+		if ( GetPad(0)->GetFJustDown(i) )
+			*pRsKeys = i + rsF1;
+	}
+
+	if ( GetPad(0)->GetEscapeJustDown() )
+		*pRsKeys = rsESC;
+
+	if ( GetPad(0)->GetInsertJustDown() )
+		*pRsKeys = rsINS;
+
+	if ( GetPad(0)->GetDeleteJustDown() )
+		*pRsKeys = rsDEL;
+
+	if ( GetPad(0)->GetHomeJustDown() )
+		*pRsKeys = rsHOME;
+
+	if ( GetPad(0)->GetEndJustDown() )
+		*pRsKeys = rsEND;
+
+	if ( GetPad(0)->GetPageUpJustDown() )
+		*pRsKeys = rsPGUP;
+
+	if ( GetPad(0)->GetPageDownJustDown() )
+		*pRsKeys = rsPGDN;
+
+	if ( GetPad(0)->GetUpJustDown() )
+		*pRsKeys = rsUP;
+
+	if ( GetPad(0)->GetDownJustDown() )
+		*pRsKeys = rsDOWN;
+
+	if ( GetPad(0)->GetLeftJustDown() )
+		*pRsKeys = rsLEFT;
+
+	if ( GetPad(0)->GetRightJustDown() )
+		*pRsKeys = rsRIGHT;
+
+	if ( GetPad(0)->GetScrollLockJustDown() )
+		*pRsKeys = rsSCROLL;
+
+	if ( GetPad(0)->GetPauseJustDown() )
+		*pRsKeys = rsPAUSE;
+
+	if ( GetPad(0)->GetNumLockJustDown() )
+		*pRsKeys = rsNUMLOCK;
+
+	if ( GetPad(0)->GetDivideJustDown() )
+		*pRsKeys = rsDIVIDE;
+
+	if ( GetPad(0)->GetTimesJustDown() )
+		*pRsKeys = rsTIMES;
+
+	if ( GetPad(0)->GetMinusJustDown() )
+		*pRsKeys = rsMINUS;
+
+	if ( GetPad(0)->GetPlusJustDown() )
+		*pRsKeys = rsPLUS;
+
+	if ( GetPad(0)->GetPadEnterJustDown() )
+		*pRsKeys = rsPADENTER;
+
+	if ( GetPad(0)->GetPadDelJustDown() )
+		*pRsKeys = rsPADDEL;
+
+	if ( GetPad(0)->GetPad1JustDown() )
+		*pRsKeys = rsPADEND;
+
+	if ( GetPad(0)->GetPad2JustDown() )
+		*pRsKeys = rsPADDOWN;
+
+	if ( GetPad(0)->GetPad3JustDown() )
+		*pRsKeys = rsPADPGDN;
+
+	if ( GetPad(0)->GetPad4JustDown() )
+		*pRsKeys = rsPADLEFT;
+
+	if ( GetPad(0)->GetPad5JustDown() )
+		*pRsKeys = rsPAD5;
+
+	if ( GetPad(0)->GetPad6JustDown() )
+		*pRsKeys = rsPADRIGHT;
+
+	if ( GetPad(0)->GetPad7JustDown() )
+		*pRsKeys = rsPADHOME;
+
+	if ( GetPad(0)->GetPad8JustDown() )
+		*pRsKeys = rsPADUP;
+
+	if ( GetPad(0)->GetPad9JustDown() )
+		*pRsKeys = rsPADPGUP;
+
+	if ( GetPad(0)->GetPad0JustDown() )
+		*pRsKeys = rsPADINS;
+
+	if ( GetPad(0)->GetBackspaceJustDown() )
+		*pRsKeys = rsBACKSP;
+
+	if ( GetPad(0)->GetTabJustDown() )
+		*pRsKeys = rsTAB;
+
+	if ( GetPad(0)->GetCapsLockJustDown() )
+		*pRsKeys = rsCAPSLK;
+
+	if ( GetPad(0)->GetReturnJustDown() )
+		*pRsKeys = rsENTER;
+
+	if ( GetPad(0)->GetLeftShiftJustDown() )
+		*pRsKeys = rsLSHIFT;
+
+	if ( GetPad(0)->GetShiftJustDown() )
+		*pRsKeys = rsSHIFT;
+
+	if ( GetPad(0)->GetRightShiftJustDown() )
+		*pRsKeys = rsRSHIFT;
+
+	if ( GetPad(0)->GetLeftCtrlJustDown() )
+		*pRsKeys = rsLCTRL;
+
+	if ( GetPad(0)->GetRightCtrlJustDown() )
+		*pRsKeys = rsRCTRL;
+
+	if ( GetPad(0)->GetLeftAltJustDown() )
+		*pRsKeys = rsLALT;
+
+	if ( GetPad(0)->GetRightAltJustDown() )
+		*pRsKeys = rsRALT;
+
+	if ( GetPad(0)->GetLeftWinJustDown() )
+		*pRsKeys = rsLWIN;
+
+	if ( GetPad(0)->GetRightWinJustDown() )
+		*pRsKeys = rsRWIN;
+
+	if ( GetPad(0)->GetAppsJustDown() )
+		*pRsKeys = rsAPPS;
+
+	return pRsKeys;
+}
+
+void CPad::FixPadsAfterSave(void)
+{
+	UpdatePads();
+	if ( bObsoleteControllerMessage )
+	{
+		bObsoleteControllerMessage = false;
+		GetPad(0)->Phase = 0;
+	}
+}
diff --git a/src/core/Pad.h b/src/core/Pad.h
new file mode 100644
index 0000000..f141ed6
--- /dev/null
+++ b/src/core/Pad.h
@@ -0,0 +1,485 @@
+#pragma once
+
+enum {
+	PLAYERCONTROL_ENABLED = 0,
+	PLAYERCONTROL_CAMERA = 1,
+	PLAYERCONTROL_UNK2 = 2,
+	PLAYERCONTROL_GARAGE = 4,
+	PLAYERCONTROL_UNK8 = 8,
+	PLAYERCONTROL_UNK10 = 16,
+	PLAYERCONTROL_PLAYERINFO = 32,
+	PLAYERCONTROL_PHONE = 64,
+	PLAYERCONTROL_CUTSCENE = 128,
+	PLAYERCONTROL_SHORTCUT_TAXI = 256,
+};
+
+class CControllerState
+{
+public:
+	int16 LeftStickX, LeftStickY;
+	int16 RightStickX, RightStickY;
+	int16 LeftShoulder1, LeftShoulder2;
+	int16 RightShoulder1, RightShoulder2;
+	int16 DPadUp, DPadDown, DPadLeft, DPadRight;
+	int16 Start, Select;
+	int16 Square, Triangle, Cross, Circle;
+	int16 LeftShock, RightShock;
+	int16 NetworkTalk;
+	float GetLeftStickX(void) { return LeftStickX/32767.0f; };
+	float GetLeftStickY(void) { return LeftStickY/32767.0f; };
+	float GetRightStickX(void) { return RightStickX/32767.0f; };
+	float GetRightStickY(void) { return RightStickY/32767.0f; };
+
+	bool CheckForInput();
+	void Clear(void);
+};
+VALIDATE_SIZE(CControllerState, 0x2A);
+
+class CMouseControllerState
+{
+public:
+	//uint32 btns;	// bit 0-2 button 1-3
+
+	bool LMB;
+	bool RMB;
+	bool MMB;
+	bool WHEELUP;
+	bool WHEELDN;
+	bool MXB1;
+	bool MXB2;
+	char _pad0;
+	
+	float x, y;
+	
+	CMouseControllerState();
+	void Clear();
+};
+
+VALIDATE_SIZE(CMouseControllerState, 0x10);
+
+class CMousePointerStateHelper
+{
+public:
+	bool bInvertHorizontally;
+	bool bInvertVertically;
+	
+	CMouseControllerState GetMouseSetUp();
+};
+
+VALIDATE_SIZE(CMousePointerStateHelper, 0x2);
+
+extern CMousePointerStateHelper MousePointerStateHelper;
+
+
+class CKeyboardState
+{
+public:
+	int16 F[12];
+	int16 VK_KEYS[256];
+	int16 ESC;
+	int16 INS;
+	int16 DEL;
+	int16 HOME;
+	int16 END;
+	int16 PGUP;
+	int16 PGDN;
+	int16 UP;
+	int16 DOWN;
+	int16 LEFT;
+	int16 RIGHT;
+	int16 SCROLLLOCK;
+	int16 PAUSE;
+	int16 NUMLOCK;
+	int16 DIV;
+	int16 MUL;
+	int16 SUB;
+	int16 ADD;
+	int16 ENTER;
+	int16 DECIMAL;
+	int16 NUM1;
+	int16 NUM2;
+	int16 NUM3;
+	int16 NUM4;
+	int16 NUM5;
+	int16 NUM6;
+	int16 NUM7;
+	int16 NUM8;
+	int16 NUM9;
+	int16 NUM0;
+	int16 BACKSP;
+	int16 TAB;
+	int16 CAPSLOCK;
+	int16 EXTENTER;
+	int16 LSHIFT;
+	int16 RSHIFT;
+	int16 SHIFT;
+	int16 LCTRL;
+	int16 RCTRL;
+	int16 LALT;
+	int16 RALT;
+	int16 LWIN;
+	int16 RWIN;
+	int16 APPS;
+	
+	void Clear();
+};
+
+VALIDATE_SIZE(CKeyboardState, 0x270);
+
+enum
+{
+	// taken from miss2
+	PAD1 = 0,
+	PAD2,
+	
+	MAX_PADS
+};
+
+class CPad
+{
+public:
+	enum
+	{
+		HORNHISTORY_SIZE = 5,
+		DRUNK_STEERING_BUFFER_SIZE = 10,
+	};
+	CControllerState NewState;
+	CControllerState OldState;
+	int16 SteeringLeftRightBuffer[DRUNK_STEERING_BUFFER_SIZE];
+	int32 DrunkDrivingBufferUsed;
+	CControllerState PCTempKeyState;
+	CControllerState PCTempJoyState;
+	CControllerState PCTempMouseState;
+	// straight out of my IDB
+	int16 Phase;
+	int16 Mode;
+	int16 ShakeDur;
+	uint16 DisablePlayerControls;
+	uint8 ShakeFreq;
+	bool bHornHistory[HORNHISTORY_SIZE];
+	uint8 iCurrHornHistory;
+	int8 JustOutOfFrontend;
+	int8 bApplyBrakes;
+	char CheatString[12];
+	int32 LastTimeTouched;
+	int32 AverageWeapon;
+	int32 AverageEntries;
+
+#ifdef DETECT_PAD_INPUT_SWITCH
+	static bool IsAffectedByController;
+#endif
+	CPad() { }
+	~CPad() { }
+
+	static bool bDisplayNoControllerMessage;
+	static bool bObsoleteControllerMessage;
+	static bool bOldDisplayNoControllerMessage;
+	static bool m_bMapPadOneToPadTwo;
+	static bool m_bDebugCamPCOn;
+	static bool bHasPlayerCheated;
+	static bool bInvertLook4Pad;
+	
+	static CKeyboardState OldKeyState;
+	static CKeyboardState NewKeyState;
+	static CKeyboardState TempKeyState;
+	static char KeyBoardCheatString[30];
+	static CMouseControllerState OldMouseControllerState;
+	static CMouseControllerState NewMouseControllerState;
+	static CMouseControllerState PCTempMouseControllerState;
+	
+	
+#ifdef GTA_PS2_STUFF
+	static void Initialise(void);
+#endif
+	void Clear(bool bResetPlayerControls);
+	void ClearMouseHistory();
+	void ClearKeyBoardHistory();
+	void UpdateMouse();
+	CControllerState ReconcileTwoControllersInput(CControllerState const &State1, CControllerState const &State2);
+	void StartShake(int16 nDur, uint8 nFreq);
+	void StartShake_Distance(int16 nDur, uint8 nFreq, float fX, float fY, float fz);
+	void StartShake_Train(float fX, float fY);
+#ifdef GTA_PS2_STUFF
+	void AddToCheatString(char c);
+#endif
+	void AddToPCCheatString(char c);
+
+	static void UpdatePads(void);
+	void ProcessPCSpecificStuff(void);
+	void Update(int16 pad);
+	
+	static void DoCheats(void);
+	void DoCheats(int16 unk);
+	
+	static void StopPadsShaking(void);
+	void StopShaking(int16 pad);
+	
+	static CPad *GetPad(int32 pad);
+	
+	int16 GetSteeringLeftRight(void);
+	int16 GetSteeringUpDown(void);
+	int16 GetCarGunUpDown(void);
+	int16 GetCarGunLeftRight(void);
+	int16 GetPedWalkLeftRight(void);
+	int16 GetPedWalkUpDown(void);
+	int16 GetAnalogueUpDown(void);
+	int16 GetAnalogueLeftRight(void);
+	bool GetLookLeft(void);
+	bool GetLookRight(void);
+	bool GetLookBehindForCar(void);
+	bool GetLookBehindForPed(void);
+	bool GetHorn(void);
+	bool HornJustDown(void);
+	bool GetCarGunFired(void);
+	bool CarGunJustDown(void);
+	int16 GetHandBrake(void);
+	int16 GetBrake(void);
+	bool GetExitVehicle(void);
+	bool ExitVehicleJustDown(void);
+	int32 GetWeapon(void);
+	bool WeaponJustDown(void);
+	int16 GetAccelerate(void);
+	bool CycleCameraModeJustDown(void);
+	bool CycleCameraModeUpJustDown(void);
+	bool CycleCameraModeDownJustDown(void);
+	bool ChangeStationJustDown(void);
+	bool CycleWeaponLeftJustDown(void);
+	bool CycleWeaponRightJustDown(void);
+	bool GetTarget(void);
+	bool TargetJustDown(void);
+	bool DuckJustDown(void);
+	bool CollectPickupJustDown(void);
+	bool JumpJustDown(void);
+	bool GetSprint(void);
+	bool ShiftTargetLeftJustDown(void);
+	bool ShiftTargetRightJustDown(void);
+	bool GetAnaloguePadUp(void);
+	bool GetAnaloguePadDown(void);
+	bool GetAnaloguePadLeft(void);
+	bool GetAnaloguePadRight(void);
+	bool GetAnaloguePadLeftJustUp(void);
+	bool GetAnaloguePadRightJustUp(void);
+	bool ForceCameraBehindPlayer(void);
+	bool SniperZoomIn(void);
+	bool SniperZoomOut(void);
+	int16 SniperModeLookLeftRight(void);
+	int16 SniperModeLookUpDown(void);
+	int16 LookAroundLeftRight(void);
+	int16 LookAroundUpDown(void);
+	void ResetAverageWeapon(void);
+	static void FixPadsAfterSave(void);
+	static void PrintErrorMessage(void);
+	static void ResetCheats(void);
+	static char *EditString(char *pStr, int32 nSize);
+	static int32 *EditCodesForControls(int32 *pRsKeys, int32 nSize);
+	uint32 InputHowLongAgo(void);
+	void SetDrunkInputDelay(int32 delay) { DrunkDrivingBufferUsed = delay; }
+
+#ifdef XINPUT
+	static int XInputJoy1;
+	static int XInputJoy2;
+	void AffectFromXinput(uint32 pad);
+#endif
+
+	// mouse
+	bool GetLeftMouseJustDown()           { return !!(NewMouseControllerState.LMB && !OldMouseControllerState.LMB); }
+	bool GetRightMouseJustDown()          { return !!(NewMouseControllerState.RMB && !OldMouseControllerState.RMB); }
+	bool GetMiddleMouseJustDown()         { return !!(NewMouseControllerState.MMB && !OldMouseControllerState.MMB); }
+	bool GetMouseWheelUpJustDown()        { return !!(NewMouseControllerState.WHEELUP && !OldMouseControllerState.WHEELUP); }
+	bool GetMouseWheelDownJustDown()      { return !!(NewMouseControllerState.WHEELDN && !OldMouseControllerState.WHEELDN);}
+	bool GetMouseX1JustDown()             { return !!(NewMouseControllerState.MXB1    && !OldMouseControllerState.MXB1); }
+	bool GetMouseX2JustDown()             { return !!(NewMouseControllerState.MXB2    && !OldMouseControllerState.MXB2); }
+
+	bool GetLeftMouseJustUp() { return !!(!NewMouseControllerState.LMB && OldMouseControllerState.LMB); }
+	bool GetRightMouseJustUp() { return !!(!NewMouseControllerState.RMB && OldMouseControllerState.RMB); }
+	bool GetMiddleMouseJustUp() { return !!(!NewMouseControllerState.MMB && OldMouseControllerState.MMB); }
+	bool GetMouseWheelUpJustUp() { return !!(!NewMouseControllerState.WHEELUP && OldMouseControllerState.WHEELUP); }
+	bool GetMouseWheelDownJustUp() { return !!(!NewMouseControllerState.WHEELDN && OldMouseControllerState.WHEELDN); }
+	bool GetMouseX1JustUp() { return !!(!NewMouseControllerState.MXB1 && OldMouseControllerState.MXB1); }
+	bool GetMouseX2JustUp() { return !!(!NewMouseControllerState.MXB2 && OldMouseControllerState.MXB2); }
+
+	bool GetLeftMouse()         { return NewMouseControllerState.LMB; }
+	bool GetRightMouse()        { return NewMouseControllerState.RMB; }
+	bool GetMiddleMouse()       { return NewMouseControllerState.MMB; }
+	bool GetMouseWheelUp()      { return NewMouseControllerState.WHEELUP; }
+	bool GetMouseWheelDown()    { return NewMouseControllerState.WHEELDN; }
+	bool GetMouseX1()           { return NewMouseControllerState.MXB1; }
+	bool GetMouseX2()           { return NewMouseControllerState.MXB2; }
+
+	bool GetLeftMouseUp()       { return !OldMouseControllerState.LMB; }
+	bool GetRightMouseUp()      { return !OldMouseControllerState.RMB; }
+	bool GetMiddleMouseUp()     { return !OldMouseControllerState.MMB; }
+	bool GetMouseWheelUpUp()    { return !OldMouseControllerState.WHEELUP; }
+	bool GetMouseWheelDownUp()  { return !OldMouseControllerState.WHEELDN; }
+	bool GetMouseX1Up()         { return !OldMouseControllerState.MXB1; }
+	bool GetMouseX2Up()         { return !OldMouseControllerState.MXB2; }
+
+
+	float GetMouseX() { return NewMouseControllerState.x; }
+	float GetMouseY() { return NewMouseControllerState.y; }
+
+	// keyboard
+	
+	bool GetCharJustDown(int32 c) { return !!(NewKeyState.VK_KEYS[c] && !OldKeyState.VK_KEYS[c]); }
+	bool GetFJustDown(int32 n)    { return !!(NewKeyState.F[n] && !OldKeyState.F[n]); }
+	bool GetEscapeJustDown()      { return !!(NewKeyState.ESC && !OldKeyState.ESC); }
+	bool GetInsertJustDown()      { return !!(NewKeyState.INS && !OldKeyState.INS); }
+	bool GetDeleteJustDown()      { return !!(NewKeyState.DEL && !OldKeyState.DEL); }
+	bool GetHomeJustDown()        { return !!(NewKeyState.HOME && !OldKeyState.HOME); }
+	bool GetEndJustDown()         { return !!(NewKeyState.END && !OldKeyState.END); }
+	bool GetPageUpJustDown()      { return !!(NewKeyState.PGUP && !OldKeyState.PGUP); }
+	bool GetPageDownJustDown()    { return !!(NewKeyState.PGDN && !OldKeyState.PGDN); }
+	bool GetUpJustDown()          { return !!(NewKeyState.UP && !OldKeyState.UP); }
+	bool GetDownJustDown()        { return !!(NewKeyState.DOWN && !OldKeyState.DOWN); }
+	bool GetLeftJustDown()        { return !!(NewKeyState.LEFT && !OldKeyState.LEFT); }
+	bool GetRightJustDown()       { return !!(NewKeyState.RIGHT && !OldKeyState.RIGHT); }
+	bool GetScrollLockJustDown()  { return !!(NewKeyState.SCROLLLOCK && !OldKeyState.SCROLLLOCK); }
+	bool GetPauseJustDown()       { return !!(NewKeyState.PAUSE && !OldKeyState.PAUSE); }
+	bool GetNumLockJustDown()     { return !!(NewKeyState.NUMLOCK && !OldKeyState.NUMLOCK); }
+	bool GetDivideJustDown()      { return !!(NewKeyState.DIV && !OldKeyState.DIV); }
+	bool GetTimesJustDown()       { return !!(NewKeyState.MUL && !OldKeyState.MUL); }
+	bool GetMinusJustDown()       { return !!(NewKeyState.SUB && !OldKeyState.SUB); }
+	bool GetPlusJustDown()        { return !!(NewKeyState.ADD && !OldKeyState.ADD); }
+	bool GetPadEnterJustDown()    { return !!(NewKeyState.ENTER && !OldKeyState.ENTER); }
+	bool GetPadDelJustDown()      { return !!(NewKeyState.DECIMAL && !OldKeyState.DECIMAL); }
+	bool GetPad1JustDown()        { return !!(NewKeyState.NUM1 && !OldKeyState.NUM1); }
+	bool GetPad2JustDown()        { return !!(NewKeyState.NUM2 && !OldKeyState.NUM2); }
+	bool GetPad3JustDown()        { return !!(NewKeyState.NUM3 && !OldKeyState.NUM3); }
+	bool GetPad4JustDown()        { return !!(NewKeyState.NUM4 && !OldKeyState.NUM4); }
+	bool GetPad5JustDown()        { return !!(NewKeyState.NUM5 && !OldKeyState.NUM5); }
+	bool GetPad6JustDown()        { return !!(NewKeyState.NUM6 && !OldKeyState.NUM6); }
+	bool GetPad7JustDown()        { return !!(NewKeyState.NUM7 && !OldKeyState.NUM7); }
+	bool GetPad8JustDown()        { return !!(NewKeyState.NUM8 && !OldKeyState.NUM8); }
+	bool GetPad9JustDown()        { return !!(NewKeyState.NUM9 && !OldKeyState.NUM9); }
+	bool GetPad0JustDown()        { return !!(NewKeyState.NUM0 && !OldKeyState.NUM0); }
+	bool GetBackspaceJustDown()   { return !!(NewKeyState.BACKSP && !OldKeyState.BACKSP); }
+	bool GetTabJustDown()         { return !!(NewKeyState.TAB && !OldKeyState.TAB); }
+	bool GetCapsLockJustDown()    { return !!(NewKeyState.CAPSLOCK && !OldKeyState.CAPSLOCK); }
+	bool GetReturnJustDown()       { return !!(NewKeyState.EXTENTER && !OldKeyState.EXTENTER); }
+	bool GetLeftShiftJustDown()   { return !!(NewKeyState.LSHIFT && !OldKeyState.LSHIFT); }
+	bool GetShiftJustDown()       { return !!(NewKeyState.SHIFT && !OldKeyState.SHIFT); }
+	bool GetRightShiftJustDown()  { return !!(NewKeyState.RSHIFT && !OldKeyState.RSHIFT); }
+	bool GetLeftCtrlJustDown()    { return !!(NewKeyState.LCTRL && !OldKeyState.LCTRL); }
+	bool GetRightCtrlJustDown()   { return !!(NewKeyState.RCTRL && !OldKeyState.RCTRL); }
+	bool GetLeftAltJustDown()     { return !!(NewKeyState.LALT && !OldKeyState.LALT); }
+	bool GetRightAltJustDown()    { return !!(NewKeyState.RALT && !OldKeyState.RALT); }
+	bool GetLeftWinJustDown()     { return !!(NewKeyState.LWIN && !OldKeyState.LWIN); }
+	bool GetRightWinJustDown()    { return !!(NewKeyState.RWIN && !OldKeyState.RWIN); }
+	bool GetAppsJustDown()        { return !!(NewKeyState.APPS && !OldKeyState.APPS); }
+	bool GetEnterJustDown()       { return GetPadEnterJustDown() || GetReturnJustDown(); }
+	bool GetAltJustDown()         { return GetLeftAltJustDown() || GetRightAltJustDown(); }
+								  
+	bool GetLeftJustUp() { return !!(!NewKeyState.LEFT && OldKeyState.LEFT); }
+	bool GetRightJustUp() { return !!(!NewKeyState.RIGHT && OldKeyState.RIGHT); }
+	bool GetEnterJustUp() { return GetPadEnterJustUp() || GetReturnJustUp(); }
+	bool GetReturnJustUp() { return !!(!NewKeyState.EXTENTER && OldKeyState.EXTENTER); }
+	bool GetPadEnterJustUp() { return !!(!NewKeyState.ENTER && OldKeyState.ENTER); }
+
+	bool GetChar(int32 c)         { return NewKeyState.VK_KEYS[c]; }
+	bool GetF(int32 n)            { return NewKeyState.F[n]; }
+	bool GetEscape()              { return NewKeyState.ESC; }
+	bool GetInsert()              { return NewKeyState.INS; }
+	bool GetDelete()              { return NewKeyState.DEL; }
+	bool GetHome()                { return NewKeyState.HOME; }
+	bool GetEnd()                 { return NewKeyState.END; }
+	bool GetPageUp()              { return NewKeyState.PGUP; }
+	bool GetPageDown()            { return NewKeyState.PGDN; }
+	bool GetUp()                  { return NewKeyState.UP; }
+	bool GetDown()                { return NewKeyState.DOWN; }
+	bool GetLeft()                { return NewKeyState.LEFT; }
+	bool GetRight()               { return NewKeyState.RIGHT; }
+	bool GetScrollLock()          { return NewKeyState.SCROLLLOCK; }
+	bool GetPause()               { return NewKeyState.PAUSE; }
+	bool GetNumLock()             { return NewKeyState.NUMLOCK; }
+	bool GetDivide()              { return NewKeyState.DIV; }
+	bool GetTimes()               { return NewKeyState.MUL; }
+	bool GetMinus()               { return NewKeyState.SUB; }
+	bool GetPlus()                { return NewKeyState.ADD; }
+	bool GetPadEnter()            { return NewKeyState.ENTER; } //  GetEnterJustDown
+	bool GetPadDel()              { return NewKeyState.DECIMAL; }
+	bool GetPad1()                { return NewKeyState.NUM1; }
+	bool GetPad2()                { return NewKeyState.NUM2; }
+	bool GetPad3()                { return NewKeyState.NUM3; }
+	bool GetPad4()                { return NewKeyState.NUM4; }
+	bool GetPad5()                { return NewKeyState.NUM5; }
+	bool GetPad6()                { return NewKeyState.NUM6; }
+	bool GetPad7()                { return NewKeyState.NUM7; }
+	bool GetPad8()                { return NewKeyState.NUM8; }
+	bool GetPad9()                { return NewKeyState.NUM9; }
+	bool GetPad0()                { return NewKeyState.NUM0; }
+	bool GetBackspace()           { return NewKeyState.BACKSP; }
+	bool GetTab()                 { return NewKeyState.TAB; }
+	bool GetCapsLock()            { return NewKeyState.CAPSLOCK; }
+	bool GetEnter()               { return NewKeyState.EXTENTER; }
+	bool GetLeftShift()           { return NewKeyState.LSHIFT; }
+	bool GetShift()               { return NewKeyState.SHIFT; }
+	bool GetRightShift()          { return NewKeyState.RSHIFT; }
+	bool GetLeftCtrl()            { return NewKeyState.LCTRL; }
+	bool GetRightCtrl()           { return NewKeyState.RCTRL; }
+	bool GetLeftAlt()             { return NewKeyState.LALT; }
+	bool GetRightAlt()            { return NewKeyState.RALT; }
+	bool GetLeftWin()             { return NewKeyState.LWIN; }
+	bool GetRightWin()            { return NewKeyState.RWIN; }
+	bool GetApps()                { return NewKeyState.APPS; }
+	// pad
+
+	bool GetTriangleJustDown()       { return !!(NewState.Triangle && !OldState.Triangle); }
+	bool GetCircleJustDown()         { return !!(NewState.Circle && !OldState.Circle); }
+	bool GetCrossJustDown()          { return !!(NewState.Cross && !OldState.Cross); }
+	bool GetSquareJustDown()         { return !!(NewState.Square && !OldState.Square); }
+	bool GetDPadUpJustDown()         { return !!(NewState.DPadUp && !OldState.DPadUp); }
+	bool GetDPadDownJustDown()       { return !!(NewState.DPadDown && !OldState.DPadDown); }
+	bool GetDPadLeftJustDown()       { return !!(NewState.DPadLeft && !OldState.DPadLeft); }
+	bool GetDPadRightJustDown()      { return !!(NewState.DPadRight && !OldState.DPadRight); }
+	bool GetLeftShoulder1JustDown()  { return !!(NewState.LeftShoulder1 && !OldState.LeftShoulder1); }
+	bool GetLeftShoulder2JustDown()  { return !!(NewState.LeftShoulder2 && !OldState.LeftShoulder2); }
+	bool GetRightShoulder1JustDown() { return !!(NewState.RightShoulder1 && !OldState.RightShoulder1); }
+	bool GetRightShoulder2JustDown() { return !!(NewState.RightShoulder2 && !OldState.RightShoulder2); }
+	bool GetLeftShockJustDown()      { return !!(NewState.LeftShock && !OldState.LeftShock); }
+	bool GetRightShockJustDown()     { return !!(NewState.RightShock && !OldState.RightShock); }
+	bool GetStartJustDown()          { return !!(NewState.Start && !OldState.Start); }
+	bool GetSelectJustDown()          { return !!(NewState.Select && !OldState.Select); }
+	bool GetLeftStickXJustDown() { return !!(NewState.LeftStickX && !OldState.LeftStickX); }
+	bool GetLeftStickYJustDown() { return !!(NewState.LeftStickY && !OldState.LeftStickY); }
+  
+	bool GetTriangleJustUp() { return !!(!NewState.Triangle && OldState.Triangle); }
+	bool GetCircleJustUp() { return !!(!NewState.Circle && OldState.Circle); }
+	bool GetCrossJustUp() { return !!(!NewState.Cross && OldState.Cross); }
+	bool GetSquareJustUp() { return !!(!NewState.Square && OldState.Square); }
+	bool GetDPadUpJustUp() { return !!(!NewState.DPadUp && OldState.DPadUp); }
+	bool GetDPadDownJustUp() { return !!(!NewState.DPadDown && OldState.DPadDown); }
+	bool GetDPadLeftJustUp() { return !!(!NewState.DPadLeft && OldState.DPadLeft); }
+	bool GetDPadRightJustUp() { return !!(!NewState.DPadRight && OldState.DPadRight); }
+
+	bool GetTriangle()           { return !!NewState.Triangle; }
+	bool GetCircle()             { return !!NewState.Circle; }
+	bool GetCross()              { return !!NewState.Cross; }
+	bool GetSquare()             { return !!NewState.Square; }
+	bool GetDPadUp()             { return !!NewState.DPadUp; }
+	bool GetDPadDown()           { return !!NewState.DPadDown; }
+	bool GetDPadLeft()           { return !!NewState.DPadLeft; }
+	bool GetDPadRight()          { return !!NewState.DPadRight; }
+	bool GetLeftShoulder1(void)  { return !!NewState.LeftShoulder1; }
+	bool GetLeftShoulder2(void)  { return !!NewState.LeftShoulder2; }
+	bool GetRightShoulder1(void) { return !!NewState.RightShoulder1; }
+	bool GetRightShoulder2(void) { return !!NewState.RightShoulder2; }
+	bool GetStart()              { return !!NewState.Start; }
+	bool GetSelect()              { return !!NewState.Select; }
+	int16 GetLeftStickX(void)    { return NewState.LeftStickX; }
+	int16 GetLeftStickY(void)    { return NewState.LeftStickY; }
+	int16 GetRightStickX(void)    { return NewState.RightStickX; }
+	int16 GetRightStickY(void)    { return NewState.RightStickY; }
+
+	bool ArePlayerControlsDisabled(void) { return DisablePlayerControls != PLAYERCONTROL_ENABLED; }
+	void SetDisablePlayerControls(uint16 who) { DisablePlayerControls |= who; }
+	void SetEnablePlayerControls(uint16 who) { DisablePlayerControls &= ~who; }
+	bool IsPlayerControlsDisabledBy(uint16 who) { return DisablePlayerControls & who; }
+	
+	int16 GetMode() { return Mode; }
+	void SetMode(int16 mode) { Mode = mode; }
+	
+	static bool IsNoOrObsolete() { return bDisplayNoControllerMessage || bObsoleteControllerMessage; }
+};
+
+VALIDATE_SIZE(CPad, 0xFC);
+extern CPad Pads[MAX_PADS];
diff --git a/src/core/Placeable.cpp b/src/core/Placeable.cpp
new file mode 100644
index 0000000..6efc154
--- /dev/null
+++ b/src/core/Placeable.cpp
@@ -0,0 +1,62 @@
+#include "common.h"
+#include "Placeable.h"
+
+
+CPlaceable::CPlaceable(void)
+{
+	m_matrix.SetScale(1.0f);
+}
+
+void
+CPlaceable::SetHeading(float angle)
+{
+	CVector pos = GetMatrix().GetPosition();
+	m_matrix.SetRotateZ(angle);
+	GetMatrix().Translate(pos);
+}
+
+bool
+CPlaceable::IsWithinArea(float x1, float y1, float x2, float y2)
+{
+	float tmp;
+
+	if(x1 > x2){
+		tmp = x1;
+		x1 = x2;
+		x2 = tmp;
+	}
+	if(y1 > y2){
+		tmp = y1;
+		y1 = y2;
+		y2 = tmp;
+	}
+
+	return x1 <= GetPosition().x && GetPosition().x <= x2 &&
+	       y1 <= GetPosition().y && GetPosition().y <= y2;
+}
+
+bool
+CPlaceable::IsWithinArea(float x1, float y1, float z1, float x2, float y2, float z2)
+{
+	float tmp;
+
+	if(x1 > x2){
+		tmp = x1;
+		x1 = x2;
+		x2 = tmp;
+	}
+	if(y1 > y2){
+		tmp = y1;
+		y1 = y2;
+		y2 = tmp;
+	}
+	if(z1 > z2){
+		tmp = z1;
+		z1 = z2;
+		z2 = tmp;
+	}
+
+	return x1 <= GetPosition().x && GetPosition().x <= x2 &&
+	       y1 <= GetPosition().y && GetPosition().y <= y2 &&
+	       z1 <= GetPosition().z && GetPosition().z <= z2;
+}
diff --git a/src/core/Placeable.h b/src/core/Placeable.h
new file mode 100644
index 0000000..b0f9a15
--- /dev/null
+++ b/src/core/Placeable.h
@@ -0,0 +1,34 @@
+#pragma once
+
+class CPlaceable
+{
+public:
+	// disable allocation
+	static void *operator new(size_t);
+
+	CMatrix m_matrix;
+
+	CPlaceable(void);
+	const CVector &GetPosition(void) { return m_matrix.GetPosition(); }
+	void SetPosition(float x, float y, float z) {
+		m_matrix.GetPosition().x = x;
+		m_matrix.GetPosition().y = y;
+		m_matrix.GetPosition().z = z;
+	}
+	void SetPosition(const CVector &pos) { m_matrix.GetPosition() = pos; }
+	CVector &GetRight(void) { return m_matrix.GetRight(); }
+	CVector &GetForward(void) { return m_matrix.GetForward(); }
+	CVector &GetUp(void) { return m_matrix.GetUp(); }
+	CMatrix &GetMatrix(void) { return m_matrix; }
+	void SetTransform(RwMatrix *m) { m_matrix = CMatrix(m, false); }
+	void SetHeading(float angle);
+	void SetOrientation(float x, float y, float z){
+		CVector pos = m_matrix.GetPosition();
+		m_matrix.SetRotate(x, y, z);
+		m_matrix.Translate(pos);
+	}
+	bool IsWithinArea(float x1, float y1, float x2, float y2);
+	bool IsWithinArea(float x1, float y1, float z1, float x2, float y2, float z2);
+};
+
+VALIDATE_SIZE(CPlaceable, 0x4C);
diff --git a/src/core/PlayerInfo.cpp b/src/core/PlayerInfo.cpp
new file mode 100644
index 0000000..a64d4cc
--- /dev/null
+++ b/src/core/PlayerInfo.cpp
@@ -0,0 +1,880 @@
+#include "common.h"
+
+#include "Automobile.h"
+#include "Bridge.h"
+#include "Camera.h"
+#include "CarCtrl.h"
+#include "Cranes.h"
+#include "Darkel.h"
+#include "Explosion.h"
+#include "Fire.h"
+#include "Frontend.h"
+#include "General.h"
+#include "HandlingMgr.h"
+#include "Messages.h"
+#include "Pad.h"
+#include "PathFind.h"
+#include "PlayerInfo.h"
+#include "PlayerPed.h"
+#include "PlayerSkin.h"
+#include "ProjectileInfo.h"
+#include "Remote.h"
+#include "Renderer.h"
+#include "Replay.h"
+#include "Script.h"
+#include "SpecialFX.h"
+#include "Stats.h"
+#include "Streaming.h"
+#include "Text.h"
+#include "Wanted.h"
+#include "WaterLevel.h"
+#include "World.h"
+#include "ZoneCull.h"
+#include "main.h"
+#include "Bike.h"
+#include "Automobile.h"
+#include "GameLogic.h"
+
+CVector lastPlayerPos;
+
+void
+CPlayerInfo::Clear(void)
+{
+	m_pPed = nil;
+	m_pRemoteVehicle = nil;
+	if (m_pVehicleEx) {
+		m_pVehicleEx->bUsingSpecialColModel = false;
+		m_pVehicleEx = nil;
+	}
+	m_nVisibleMoney = 0;
+	m_nMoney = m_nVisibleMoney;
+	m_WBState = WBSTATE_PLAYING;
+	m_nWBTime = 0;
+	m_nTrafficMultiplier = 0;
+	m_fRoadDensity = 1.0f;
+	m_bInRemoteMode = false;
+	field_D5 = false;
+	field_D6 = false;
+	m_bUnusedTaxiThing = false;
+	m_nUnusedTaxiTimer = 0;
+	m_nCollectedPackages = 0;
+	m_nTotalPackages = 3;
+	m_nTimeLastHealthLoss = 0;
+	m_nTimeLastArmourLoss = 0;
+	m_nNextSexFrequencyUpdateTime = 0;
+	m_nNextSexMoneyUpdateTime = 0;
+	m_nSexFrequency = 0;
+	m_pHooker = nil;
+	m_nTimeTankShotGun = 0;
+	field_EC = 0;
+	m_nUpsideDownCounter = 0;
+	m_nTimeCarSpentOnTwoWheels = 0;
+	m_nDistanceCarTravelledOnTwoWheels = 0;
+	m_nTimeNotFullyOnGround = 0;
+	m_nTimeSpentOnWheelie = 0;
+	m_nDistanceTravelledOnWheelie = 0.0f;
+	m_nTimeSpentOnStoppie = 0;
+	m_nDistanceTravelledOnStoppie = 0.0f;
+	m_nCancelWheelStuntTimer = 0;
+	m_nLastTimeCarSpentOnTwoWheels = 0;
+	m_nLastDistanceCarTravelledOnTwoWheels = 0;
+	m_nLastTimeSpentOnWheelie = 0;
+	m_nLastDistanceTravelledOnWheelie = 0;
+	m_nLastTimeSpentOnStoppie = 0;
+	m_nLastDistanceTravelledOnStoppie = 0;
+	m_bInfiniteSprint = false;
+	m_bFastReload = false;
+	m_bFireproof = false;
+	m_nMaxHealth = m_nMaxArmour = 100;
+	m_bGetOutOfJailFree = false;
+	m_bGetOutOfHospitalFree = false;
+	m_bDriveByAllowed = true;
+	m_nPreviousTimeRewardedForExplosion = 0;
+	m_nExplosionsSinceLastReward = 0;
+	m_nHavocLevel = 0;
+	m_fMediaAttention = 0.0f;
+	m_nCurrentBustedAudio = 1;
+	m_nBustedAudioStatus = BUSTEDAUDIO_NONE;
+}
+
+void
+CPlayerInfo::Process(void)
+{
+#ifdef FIX_BUGS
+	if (CReplay::IsPlayingBack())
+		return;
+#endif
+	// Unused taxi feature. Gives you a dollar for every second with a passenger. Can be toggled via 0x29A opcode.
+	bool startTaxiTimer = true;
+	if (m_bUnusedTaxiThing && m_pPed->bInVehicle) {
+		CVehicle *veh = m_pPed->m_pMyVehicle;
+		if (veh->IsTaxi()
+			&& veh->pDriver == m_pPed && veh->m_nNumPassengers != 0) {
+			for (uint32 timePassed = CTimer::GetTimeInMilliseconds() - m_nUnusedTaxiTimer; timePassed >= 1000; m_nUnusedTaxiTimer += 1000) {
+				timePassed -= 1000;
+				++m_nMoney;
+			}
+			startTaxiTimer = false;
+		}
+	}
+	if (startTaxiTimer)
+		m_nUnusedTaxiTimer = CTimer::GetTimeInMilliseconds();
+
+	if (!m_pPed->InVehicle()) {
+		m_nTimeCarSpentOnTwoWheels = 0;
+		m_nTimeNotFullyOnGround = 0;
+		m_nTimeSpentOnWheelie = 0;
+		m_nTimeSpentOnStoppie = 0;
+		m_nCancelWheelStuntTimer = 0;
+	} else if (m_pPed->m_pMyVehicle->IsCar()) {
+		CAutomobile *car = (CAutomobile*)m_pPed->m_pMyVehicle;
+
+		if (car->m_nWheelsOnGround < 3)
+			m_nTimeNotFullyOnGround += CTimer::GetTimeStepInMilliseconds();
+		else
+			m_nTimeNotFullyOnGround = 0;
+
+		if (car->m_aSuspensionSpringRatioPrev[2] == 1.f && car->m_aSuspensionSpringRatioPrev[3] == 1.f) {
+			if (car->m_aSuspensionSpringRatioPrev[0] < 1.0f && car->m_aSuspensionSpringRatioPrev[1] < 1.0f && car->m_fDamageImpulse == 0.0f) {
+				m_nTimeCarSpentOnTwoWheels += CTimer::GetTimeStepInMilliseconds();
+				m_nDistanceCarTravelledOnTwoWheels += car->m_fDistanceTravelled;
+				m_nCancelWheelStuntTimer = Max(0.0f, m_nCancelWheelStuntTimer - CTimer::GetTimeStepInMilliseconds() * 0.5f);
+
+			} else {
+				if (m_nTimeCarSpentOnTwoWheels != 0 && m_nCancelWheelStuntTimer < 500) {
+					m_nCancelWheelStuntTimer += CTimer::GetTimeStepInMilliseconds();
+				} else {
+					if (m_nTimeCarSpentOnTwoWheels >= 2000) {
+						m_nLastTimeCarSpentOnTwoWheels = m_nTimeCarSpentOnTwoWheels;
+						m_nLastDistanceCarTravelledOnTwoWheels = m_nDistanceCarTravelledOnTwoWheels;
+						if (CStats::Longest2Wheel < m_nTimeCarSpentOnTwoWheels / 1000)
+							CStats::Longest2Wheel = m_nTimeCarSpentOnTwoWheels / 1000;
+						if (CStats::Longest2WheelDist < m_nDistanceCarTravelledOnTwoWheels)
+							CStats::Longest2WheelDist = m_nDistanceCarTravelledOnTwoWheels;
+					}
+					m_nTimeCarSpentOnTwoWheels = 0;
+					m_nDistanceCarTravelledOnTwoWheels = 0;
+					m_nCancelWheelStuntTimer = 0;
+				}
+			}
+		} else if (car->m_aSuspensionSpringRatioPrev[0] == 1.0f && car->m_aSuspensionSpringRatioPrev[1] == 1.0f) {
+#ifdef FIX_BUGS
+			if (car->m_aSuspensionSpringRatioPrev[2] < 1.f
+#else
+			if (car->m_aSuspensionSpringRatioPrev[1] < 1.f
+#endif
+				&& car->m_aSuspensionSpringRatioPrev[3] < 1.f && 0.0f == car->m_fDamageImpulse) {
+				m_nTimeCarSpentOnTwoWheels += CTimer::GetTimeStepInMilliseconds();
+				m_nDistanceCarTravelledOnTwoWheels += car->m_fDistanceTravelled;
+				m_nCancelWheelStuntTimer = Max(0.0f, m_nCancelWheelStuntTimer - CTimer::GetTimeStepInMilliseconds() * 0.2f);
+
+			} else if (m_nTimeCarSpentOnTwoWheels != 0 && m_nCancelWheelStuntTimer < 500) {
+				m_nCancelWheelStuntTimer += CTimer::GetTimeStepInMilliseconds();
+
+			} else {
+				if (m_nTimeCarSpentOnTwoWheels >= 2000) {
+					m_nLastTimeCarSpentOnTwoWheels = m_nTimeCarSpentOnTwoWheels;
+					m_nLastDistanceCarTravelledOnTwoWheels = m_nDistanceCarTravelledOnTwoWheels;
+					if (CStats::Longest2Wheel < m_nTimeCarSpentOnTwoWheels / 1000)
+						CStats::Longest2Wheel = m_nTimeCarSpentOnTwoWheels / 1000;
+					if (CStats::Longest2WheelDist < m_nDistanceCarTravelledOnTwoWheels)
+						CStats::Longest2WheelDist = m_nDistanceCarTravelledOnTwoWheels;
+				}
+				m_nTimeCarSpentOnTwoWheels = 0;
+				m_nDistanceCarTravelledOnTwoWheels = 0;
+				m_nCancelWheelStuntTimer = 0;
+			}
+		} else if (m_nTimeCarSpentOnTwoWheels != 0) {
+			if (m_nTimeCarSpentOnTwoWheels >= 2000) {
+				m_nLastTimeCarSpentOnTwoWheels = m_nTimeCarSpentOnTwoWheels;
+				m_nLastDistanceCarTravelledOnTwoWheels = m_nDistanceCarTravelledOnTwoWheels;
+				if (CStats::Longest2Wheel < m_nTimeCarSpentOnTwoWheels / 1000)
+					CStats::Longest2Wheel = m_nTimeCarSpentOnTwoWheels / 1000;
+				if (CStats::Longest2WheelDist < m_nDistanceCarTravelledOnTwoWheels)
+					CStats::Longest2WheelDist = m_nDistanceCarTravelledOnTwoWheels;
+			}
+			m_nTimeCarSpentOnTwoWheels = 0;
+			m_nDistanceCarTravelledOnTwoWheels = 0;
+			m_nCancelWheelStuntTimer = 0;
+		}
+		m_nTimeSpentOnWheelie = 0;
+		m_nTimeSpentOnStoppie = 0;
+	} else if (m_pPed->m_pMyVehicle->IsBike()) {
+		CBike *bike = (CBike*)m_pPed->m_pMyVehicle;
+		if (bike->m_aSuspensionSpringRatioPrev[0] == 1.0f && bike->m_aSuspensionSpringRatioPrev[1] == 1.0f) {
+			if (bike->m_aSuspensionSpringRatioPrev[2] < 1.0f
+				|| (bike->m_aSuspensionSpringRatioPrev[3] < 1.0f && 0.0f == bike->m_fDamageImpulse)) {
+				m_nTimeSpentOnWheelie += CTimer::GetTimeStepInMilliseconds();
+				m_nDistanceTravelledOnWheelie += bike->m_fDistanceTravelled;
+				m_nCancelWheelStuntTimer = Max(0.0f, m_nCancelWheelStuntTimer - CTimer::GetTimeStepInMilliseconds() * 0.2f);
+
+			} else {
+				if (m_nTimeSpentOnWheelie != 0 && m_nCancelWheelStuntTimer < 500) {
+					m_nCancelWheelStuntTimer += CTimer::GetTimeStepInMilliseconds();
+				} else {
+					if (m_nTimeSpentOnWheelie >= 5000) {
+						m_nLastTimeSpentOnWheelie = m_nTimeSpentOnWheelie;
+						m_nLastDistanceTravelledOnWheelie = m_nDistanceTravelledOnWheelie;
+						if (CStats::LongestWheelie < m_nTimeSpentOnWheelie / 1000)
+							CStats::LongestWheelie = m_nTimeSpentOnWheelie / 1000;
+						if (CStats::LongestWheelieDist < m_nDistanceTravelledOnWheelie)
+							CStats::LongestWheelieDist = m_nDistanceTravelledOnWheelie;
+					}
+					m_nTimeSpentOnWheelie = 0;
+					m_nDistanceTravelledOnWheelie = 0;
+					m_nCancelWheelStuntTimer = 0;
+				}
+			}
+		} else if (m_nTimeSpentOnWheelie != 0) {
+			if (m_nTimeSpentOnWheelie >= 5000) {
+				m_nLastTimeSpentOnWheelie = m_nTimeSpentOnWheelie;
+				m_nLastDistanceTravelledOnWheelie = m_nDistanceTravelledOnWheelie;
+				if (CStats::LongestWheelie < m_nTimeSpentOnWheelie / 1000)
+					CStats::LongestWheelie = m_nTimeSpentOnWheelie / 1000;
+				if (CStats::LongestWheelieDist < m_nDistanceTravelledOnWheelie)
+					CStats::LongestWheelieDist = m_nDistanceTravelledOnWheelie;
+			}
+			m_nTimeSpentOnWheelie = 0;
+			m_nDistanceTravelledOnWheelie = 0;
+			m_nCancelWheelStuntTimer = 0;
+
+		} else if (bike->m_aSuspensionSpringRatioPrev[2] == 1.0f && bike->m_aSuspensionSpringRatioPrev[3] == 1.0f
+			&& 0.0f == bike->m_fDamageImpulse) {
+			m_nTimeSpentOnStoppie += CTimer::GetTimeStepInMilliseconds();
+			m_nDistanceTravelledOnStoppie += bike->m_fDistanceTravelled;
+			m_nCancelWheelStuntTimer = Max(0.0f, m_nCancelWheelStuntTimer - CTimer::GetTimeStepInMilliseconds() * 0.2f);
+
+		} else {
+			if (m_nTimeSpentOnStoppie != 0 && m_nCancelWheelStuntTimer < 500) {
+				m_nCancelWheelStuntTimer += CTimer::GetTimeStepInMilliseconds();
+			} else {
+				if (m_nTimeSpentOnStoppie >= 2000) {
+					m_nLastTimeSpentOnStoppie = m_nTimeSpentOnStoppie;
+					m_nLastDistanceTravelledOnStoppie = m_nDistanceTravelledOnStoppie;
+					if (CStats::LongestStoppie < m_nTimeSpentOnStoppie / 1000)
+						CStats::LongestStoppie = m_nTimeSpentOnStoppie / 1000;
+					if (CStats::LongestStoppieDist < m_nDistanceTravelledOnStoppie)
+						CStats::LongestStoppieDist = m_nDistanceTravelledOnStoppie;
+				}
+				m_nTimeSpentOnStoppie = 0;
+				m_nDistanceTravelledOnStoppie = 0;
+				m_nCancelWheelStuntTimer = 0;
+			}
+		}
+		m_nTimeCarSpentOnTwoWheels = 0;
+		m_nTimeNotFullyOnGround = 0;
+	} else {
+		m_nTimeCarSpentOnTwoWheels = 0;
+		m_nTimeNotFullyOnGround = 0;
+		m_nTimeSpentOnWheelie = 0;
+		m_nTimeSpentOnStoppie = 0;
+		m_nCancelWheelStuntTimer = 0;
+	}
+
+	// The effect that makes money counter does while earning/losing money
+	if (m_nVisibleMoney != m_nMoney) {
+		int diff = m_nMoney - m_nVisibleMoney;
+		int diffAbs = Abs(diff);
+		int changeBy;
+
+		if (diffAbs > 100000)
+			changeBy = 12345;
+		else if (diffAbs > 10000)
+			changeBy = 1234;
+		else if (diffAbs > 1000)
+			changeBy = 123;
+		else if (diffAbs > 50)
+			changeBy = 42;
+		else
+			changeBy = 1;
+
+		if (diff < 0)
+			m_nVisibleMoney -= changeBy;
+		else
+			m_nVisibleMoney += changeBy;
+	}
+
+	if (!(CTimer::GetFrameCounter() & 15)) {
+		CVector2D playerPos = m_pPed->bInVehicle ? m_pPed->m_pMyVehicle->GetPosition() : m_pPed->GetPosition();
+		m_fRoadDensity = ThePaths.CalcRoadDensity(playerPos.x, playerPos.y);
+	}
+
+	m_fRoadDensity = clamp(m_fRoadDensity, 0.5f, 1.45f);
+
+	// Because vehicle enter/exit use same key binding.
+	bool enterOrExitVeh;
+	if (m_pPed->bVehExitWillBeInstant && m_pPed->bInVehicle)
+		enterOrExitVeh = CPad::GetPad(0)->ExitVehicleJustDown();
+	else
+		enterOrExitVeh = CPad::GetPad(0)->GetExitVehicle();
+
+	if (enterOrExitVeh && m_pPed->m_nPedState != PED_ANSWER_MOBILE && m_pPed->m_nPedState != PED_SNIPER_MODE && m_pPed->m_nPedState != PED_ROCKET_MODE) {
+		if (m_pPed->bInVehicle) {
+			if (!m_pRemoteVehicle) {
+				CEntity *surfaceBelowVeh = m_pPed->m_pMyVehicle->m_pCurGroundEntity;
+				if (!surfaceBelowVeh || !CBridge::ThisIsABridgeObjectMovingUp(surfaceBelowVeh->GetModelIndex())) {
+					CVehicle *veh = m_pPed->m_pMyVehicle;
+					if (!veh->IsBoat() || veh->m_nDoorLock == CARLOCK_LOCKED_PLAYER_INSIDE) {
+						if (veh->GetStatus() != STATUS_WRECKED && veh->GetStatus() != STATUS_TRAIN_MOVING && veh->m_nDoorLock != CARLOCK_LOCKED_PLAYER_INSIDE) {
+							bool canJumpOff = false;
+							if (veh->m_vehType == VEHICLE_TYPE_BIKE) {
+								canJumpOff = veh->CanPedJumpOffBike();
+							} else if (veh->pDriver == m_pPed) {
+								canJumpOff = veh->CanPedJumpOutCar();
+							}
+
+							if (canJumpOff || veh->m_vecMoveSpeed.Magnitude() < 0.1f) {
+								if (!veh->bIsInWater)
+									m_pPed->SetObjective(OBJECTIVE_LEAVE_CAR, veh);
+
+							} else if (veh->GetStatus() != STATUS_PLAYER && veh != CGameLogic::pShortCutTaxi) {
+								veh->AutoPilot.m_nTempAction = TEMPACT_WAIT;
+								veh->AutoPilot.m_nTimeTempAction = CTimer::GetTimeInMilliseconds() + 1000;
+							}
+						}
+					} else {
+						m_pPed->SetExitBoat(veh);
+						m_pPed->bTryingToReachDryLand = true;
+					}
+				}
+			}
+		} else {
+			// Enter vehicle
+			if (CPad::GetPad(0)->ExitVehicleJustDown()) {
+				bool weAreOnBoat = false;
+				float lastCloseness = 0.0f;
+				CVehicle *carBelow = nil;
+				CEntity *surfaceBelow = m_pPed->m_pCurrentPhysSurface;
+				if (surfaceBelow && surfaceBelow->IsVehicle()) {
+					carBelow = (CVehicle*)surfaceBelow;
+					if (carBelow->IsBoat() && carBelow->m_modelIndex != MI_SKIMMER) {
+						weAreOnBoat = true;
+						m_pPed->bOnBoat = true;
+						if (carBelow->GetStatus() != STATUS_WRECKED && carBelow->GetUp().z > 0.3f)
+							m_pPed->SetSeekBoatPosition(carBelow);
+					}
+				}
+				// Find closest car
+				if (!weAreOnBoat) {
+					float minX = m_pPed->GetPosition().x - 10.0f;
+					float maxX = 10.0f + m_pPed->GetPosition().x;
+					float minY = m_pPed->GetPosition().y - 10.0f;
+					float maxY = 10.0f + m_pPed->GetPosition().y;
+
+					int minXSector = CWorld::GetSectorIndexX(minX);
+					if (minXSector < 0) minXSector = 0;
+					int minYSector = CWorld::GetSectorIndexY(minY);
+					if (minYSector < 0) minYSector = 0;
+					int maxXSector = CWorld::GetSectorIndexX(maxX);
+					if (maxXSector > NUMSECTORS_X - 1) maxXSector = NUMSECTORS_X - 1;
+					int maxYSector = CWorld::GetSectorIndexY(maxY);
+					if (maxYSector > NUMSECTORS_Y - 1) maxYSector = NUMSECTORS_Y - 1;
+
+					CWorld::AdvanceCurrentScanCode();
+
+					for (int curY = minYSector; curY <= maxYSector; curY++) {
+						for (int curX = minXSector; curX <= maxXSector; curX++) {
+							CSector *sector = CWorld::GetSector(curX, curY);
+							FindClosestCarSectorList(sector->m_lists[ENTITYLIST_VEHICLES], m_pPed,
+								minX, minY, maxX, maxY, &lastCloseness, &carBelow);
+							FindClosestCarSectorList(sector->m_lists[ENTITYLIST_VEHICLES_OVERLAP], m_pPed,
+								minX, minY, maxX, maxY, &lastCloseness, &carBelow);
+						}
+					}
+				}
+				// carBelow is now closest vehicle
+				if (carBelow && !weAreOnBoat) {
+					if (carBelow->GetStatus() == STATUS_TRAIN_NOT_MOVING) {
+						m_pPed->SetObjective(OBJECTIVE_ENTER_CAR_AS_PASSENGER, carBelow);
+					} else if (carBelow->IsBoat()) {
+						if (!carBelow->pDriver) {
+							m_pPed->m_vehDoor = 0;
+							m_pPed->SetEnterCar(carBelow, m_pPed->m_vehDoor);
+						}
+					} else {
+						m_pPed->SetObjective(OBJECTIVE_ENTER_CAR_AS_DRIVER, carBelow);
+					}
+				}
+			}
+		}
+	}
+
+	if (m_bInRemoteMode) {
+		uint32 timeWithoutRemoteCar = CTimer::GetTimeInMilliseconds() - m_nTimeLostRemoteCar;
+		if (CTimer::GetPreviousTimeInMilliseconds() - m_nTimeLostRemoteCar < 1000 && timeWithoutRemoteCar >= 1000 && m_WBState == WBSTATE_PLAYING && field_D6) {
+			TheCamera.SetFadeColour(0, 0, 0);
+			TheCamera.Fade(1.0f, FADE_OUT);
+		}
+		if (timeWithoutRemoteCar > 2000) {
+			if (m_WBState == WBSTATE_PLAYING && field_D6) {
+				TheCamera.RestoreWithJumpCut();
+				TheCamera.SetFadeColour(0, 0, 0);
+				TheCamera.Fade(1.0f, FADE_IN);
+				TheCamera.Process();
+				CTimer::Stop();
+				CCullZones::ForceCullZoneCoors(TheCamera.GetPosition());
+				CRenderer::RequestObjectsInFrustum();
+				CStreaming::LoadAllRequestedModels(false);
+				CTimer::Update();
+			}
+			m_bInRemoteMode = false;
+			CWorld::Players[CWorld::PlayerInFocus].m_pRemoteVehicle->bRemoveFromWorld = true;
+			CWorld::Players[CWorld::PlayerInFocus].m_pRemoteVehicle = nil;
+			if (FindPlayerVehicle()) {
+				FindPlayerVehicle()->SetStatus(STATUS_PLAYER);
+			}
+		}
+	}
+	if (!(CTimer::GetFrameCounter() & 31)) {
+		CVehicle *veh = FindPlayerVehicle();
+		if (veh && m_pPed->bInVehicle && veh->GetUp().z < 0.0f
+			&& veh->m_vecMoveSpeed.Magnitude() < 0.05f && (veh->IsCar() || veh->IsBoat()) && !veh->bIsInWater) {
+
+			if (veh->GetUp().z < -0.5f) {
+				m_nUpsideDownCounter += 2;
+			} else {
+				m_nUpsideDownCounter++;
+			}
+		} else {
+			m_nUpsideDownCounter = 0;
+		}
+
+		if (m_nUpsideDownCounter > 6 && veh->bCanBeDamaged) {
+			veh->m_fHealth = 249.0f < veh->m_fHealth ? 249.0f : veh->m_fHealth;
+			if (veh->IsCar()) {
+				CAutomobile* car = (CAutomobile*)veh;
+				car->Damage.SetEngineStatus(225);
+				car->m_pSetOnFireEntity = nil;
+			}
+		}
+	}
+	if (FindPlayerVehicle()) {
+		CVehicle *veh = FindPlayerVehicle();
+		veh->m_nZoneLevel = LEVEL_IGNORE;
+		for (int i = 0; i < ARRAY_SIZE(veh->pPassengers); i++) {
+			if (veh->pPassengers[i])
+				veh->pPassengers[i]->m_nZoneLevel = LEVEL_GENERIC;
+		}
+		if(veh->m_modelIndex == MI_CADDY)
+			CStats::DistanceTravelledByGolfCart += veh->m_fDistanceTravelled;
+		else {
+			if(veh->GetVehicleAppearance() == VEHICLE_APPEARANCE_HELI)
+				CStats::DistanceTravelledByHelicoptor += veh->m_fDistanceTravelled;
+			if (veh->GetVehicleAppearance() == VEHICLE_APPEARANCE_PLANE)
+				CStats::DistanceTravelledByPlane += veh->m_fDistanceTravelled;
+			if (veh->GetVehicleAppearance() == VEHICLE_APPEARANCE_CAR)
+				CStats::DistanceTravelledByCar += veh->m_fDistanceTravelled;
+			if (veh->GetVehicleAppearance() == VEHICLE_APPEARANCE_BIKE)
+				CStats::DistanceTravelledByBike += veh->m_fDistanceTravelled;
+			if (veh->GetVehicleAppearance() == VEHICLE_APPEARANCE_BOAT)
+				CStats::DistanceTravelledByBoat += veh->m_fDistanceTravelled;
+
+			if (veh->GetVehicleAppearance() == VEHICLE_APPEARANCE_PLANE) {
+				if (veh->m_vecMoveSpeed.Magnitude() > 0.2f) {
+					CStats::FlightTime += CTimer::GetTimeStep() * 16.f; // what a weird choice
+				}
+			}
+		}
+	} else {
+		CStats::DistanceTravelledOnFoot += FindPlayerPed()->m_fDistanceTravelled;
+	}
+
+	if (m_pPed->m_pWanted->GetWantedLevel() && !CTheScripts::IsPlayerOnAMission()) {
+		float maxDelta = 0.0f;
+		static bool movedSignificantly = true;
+		static bool thereIsACarPathNear = true;
+		// there was one more guard without variable's itself???
+
+		if (CTimer::GetTimeInMilliseconds() / 20000 != CTimer::GetPreviousTimeInMilliseconds() / 20000) {
+			float posChange = (lastPlayerPos - FindPlayerCoors()).Magnitude();
+			movedSignificantly = posChange >= 10.0f;
+			lastPlayerPos = FindPlayerCoors();
+			thereIsACarPathNear = ThePaths.FindNodeClosestToCoors(FindPlayerCoors(), PATH_CAR, 60.0f, true, false, false, false) != 0;
+		}
+		switch (m_pPed->m_pWanted->GetWantedLevel()) {
+			case 1:
+				maxDelta = 31.f;
+				break;
+			case 2:
+				maxDelta = 62.f;
+				break;
+			case 3:
+				maxDelta = 125.f;
+				break;
+			case 4:
+				maxDelta = 250.f;
+				break;
+			case 5:
+				maxDelta = 500.f;
+				break;
+			case 6:
+				maxDelta = 1000.f;
+				break;
+			default:
+				break;
+		}
+		float increaseDelta = maxDelta - m_fMediaAttention;
+		float increaseAttentionBy = CTimer::GetTimeStep() * 0.0001f * increaseDelta;
+		if (increaseAttentionBy < 0.0f
+			|| movedSignificantly && thereIsACarPathNear && !CCullZones::NoPolice() && !CCullZones::PoliceAbandonCars() && CGame::currArea == AREA_MAIN_MAP) {
+			m_fMediaAttention += increaseAttentionBy;
+		}
+	} else {
+		m_fMediaAttention = 0.0f;
+	}
+	CStats::HighestChaseValue = Max(m_fMediaAttention, CStats::HighestChaseValue);
+	m_nMoney = Min(999999999, m_nMoney);
+	m_nVisibleMoney = Min(999999999, m_nVisibleMoney);
+}
+
+bool
+CPlayerInfo::IsPlayerInRemoteMode()
+{
+	return m_pRemoteVehicle || m_bInRemoteMode;
+}
+
+void
+CPlayerInfo::SavePlayerInfo(uint8 *buf, uint32 *size)
+{
+	// Interesting
+	*size = sizeof(CPlayerInfo);
+
+#define CopyToBuf(buf, data) memcpy(buf, &data, sizeof(data)); buf += sizeof(data);
+	CopyToBuf(buf, CWorld::Players[CWorld::PlayerInFocus].m_nMoney);
+	CopyToBuf(buf, CWorld::Players[CWorld::PlayerInFocus].m_WBState);
+	CopyToBuf(buf, CWorld::Players[CWorld::PlayerInFocus].m_nWBTime);
+	CopyToBuf(buf, CWorld::Players[CWorld::PlayerInFocus].m_nTrafficMultiplier);
+	CopyToBuf(buf, CWorld::Players[CWorld::PlayerInFocus].m_fRoadDensity);
+	CopyToBuf(buf, CWorld::Players[CWorld::PlayerInFocus].m_nVisibleMoney);
+	CopyToBuf(buf, CWorld::Players[CWorld::PlayerInFocus].m_nCollectedPackages);
+	CopyToBuf(buf, CWorld::Players[CWorld::PlayerInFocus].m_nTotalPackages);
+	CopyToBuf(buf, CWorld::Players[CWorld::PlayerInFocus].m_bInfiniteSprint);
+	CopyToBuf(buf, CWorld::Players[CWorld::PlayerInFocus].m_bFastReload);
+	CopyToBuf(buf, CWorld::Players[CWorld::PlayerInFocus].m_bFireproof);
+	CopyToBuf(buf, CWorld::Players[CWorld::PlayerInFocus].m_nMaxHealth);
+	CopyToBuf(buf, CWorld::Players[CWorld::PlayerInFocus].m_nMaxArmour);
+	CopyToBuf(buf, CWorld::Players[CWorld::PlayerInFocus].m_bGetOutOfJailFree);
+	CopyToBuf(buf, CWorld::Players[CWorld::PlayerInFocus].m_bGetOutOfHospitalFree);
+	CopyToBuf(buf, CWorld::Players[CWorld::PlayerInFocus].m_bDriveByAllowed);
+	CopyToBuf(buf, CWorld::Players[CWorld::PlayerInFocus].m_aPlayerName);
+	CopyToBuf(buf, CWorld::Players[CWorld::PlayerInFocus].m_nBustedAudioStatus);
+	CopyToBuf(buf, CWorld::Players[CWorld::PlayerInFocus].m_nCurrentBustedAudio);
+#undef CopyToBuf
+}
+
+void
+CPlayerInfo::LoadPlayerInfo(uint8 *buf, uint32 size)
+{
+#define CopyFromBuf(buf, data) memcpy(&data, buf, sizeof(data)); buf += sizeof(data);
+	CopyFromBuf(buf, CWorld::Players[CWorld::PlayerInFocus].m_nMoney);
+	CopyFromBuf(buf, CWorld::Players[CWorld::PlayerInFocus].m_WBState);
+	CopyFromBuf(buf, CWorld::Players[CWorld::PlayerInFocus].m_nWBTime);
+	CopyFromBuf(buf, CWorld::Players[CWorld::PlayerInFocus].m_nTrafficMultiplier);
+	CopyFromBuf(buf, CWorld::Players[CWorld::PlayerInFocus].m_fRoadDensity);
+	CopyFromBuf(buf, CWorld::Players[CWorld::PlayerInFocus].m_nVisibleMoney);
+	CopyFromBuf(buf, CWorld::Players[CWorld::PlayerInFocus].m_nCollectedPackages);
+	CopyFromBuf(buf, CWorld::Players[CWorld::PlayerInFocus].m_nTotalPackages);
+	CopyFromBuf(buf, CWorld::Players[CWorld::PlayerInFocus].m_bInfiniteSprint);
+	CopyFromBuf(buf, CWorld::Players[CWorld::PlayerInFocus].m_bFastReload);
+	CopyFromBuf(buf, CWorld::Players[CWorld::PlayerInFocus].m_bFireproof);
+	CopyFromBuf(buf, CWorld::Players[CWorld::PlayerInFocus].m_nMaxHealth);
+	CopyFromBuf(buf, CWorld::Players[CWorld::PlayerInFocus].m_nMaxArmour);
+	CopyFromBuf(buf, CWorld::Players[CWorld::PlayerInFocus].m_bGetOutOfJailFree);
+	CopyFromBuf(buf, CWorld::Players[CWorld::PlayerInFocus].m_bGetOutOfHospitalFree);
+	CopyFromBuf(buf, CWorld::Players[CWorld::PlayerInFocus].m_bDriveByAllowed);
+	CopyFromBuf(buf, CWorld::Players[CWorld::PlayerInFocus].m_aPlayerName);
+	CopyFromBuf(buf, CWorld::Players[CWorld::PlayerInFocus].m_nBustedAudioStatus);
+	CopyFromBuf(buf, CWorld::Players[CWorld::PlayerInFocus].m_nCurrentBustedAudio)
+#undef CopyFromBuf
+}
+
+void
+CPlayerInfo::FindClosestCarSectorList(CPtrList& carList, CPed* ped, float unk1, float unk2, float unk3, float unk4, float* lastCloseness, CVehicle** closestCarOutput)
+{
+	for (CPtrNode* node = carList.first; node; node = node->next) {
+		CVehicle *car = (CVehicle*)node->item;
+		if(car->m_scanCode != CWorld::GetCurrentScanCode()) {
+			if (!car->bUsesCollision || !car->IsVehicle())
+				continue;
+
+			car->m_scanCode = CWorld::GetCurrentScanCode();
+			if (car->GetStatus() != STATUS_WRECKED && car->GetStatus() != STATUS_TRAIN_MOVING
+				&& (car->GetUp().z > 0.3f || (car->IsVehicle() && ((CVehicle*)car)->m_vehType == VEHICLE_TYPE_BIKE))) {
+				CVector carCentre = car->GetBoundCentre();
+
+				if (Abs(ped->GetPosition().z - carCentre.z) < 2.0f || car->IsCar() && carCentre.z < ped->GetPosition().z && ped->GetPosition().z - 4.f < carCentre.z) {
+					float dist = (ped->GetPosition() - carCentre).Magnitude2D();
+					if (dist <= 10.0f && !CCranes::IsThisCarBeingCarriedByAnyCrane(car)) {
+						EvaluateCarPosition(car, ped, dist, lastCloseness, closestCarOutput);
+					}
+				}
+			}
+		}
+	}
+}
+
+// lastCloseness is passed to other calls of this function
+void
+CPlayerInfo::EvaluateCarPosition(CEntity *carToTest, CPed *player, float carBoundCentrePedDist, float *lastCloseness, CVehicle **closestCarOutput)
+{
+	// This dist used for determining the angle to face
+	CVector2D dist(carToTest->GetPosition() - player->GetPosition());
+	float neededTurn = CGeneral::GetATanOfXY(player->GetForward().x, player->GetForward().y) - CGeneral::GetATanOfXY(dist.x, dist.y);
+	while (neededTurn >= PI) {
+		neededTurn -= 2 * PI;
+	}
+
+	while (neededTurn < -PI) {
+		neededTurn += 2 * PI;
+	}
+
+	// This dist used for evaluating cars' distances, weird...
+	// Accounts inverted needed turn (or needed turn in long way) and car dist.
+	float closeness = (1.0f - Abs(neededTurn) / TWOPI) * (10.0f - carBoundCentrePedDist);
+	if (closeness > *lastCloseness) {
+		*lastCloseness = closeness;
+		*closestCarOutput = (CVehicle*)carToTest;
+	}
+}
+
+const CVector &
+CPlayerInfo::GetPos()
+{
+#ifdef FIX_BUGS
+	if (!m_pPed)
+		return TheCamera.GetPosition();
+#endif
+	if (m_pPed->InVehicle())
+		return m_pPed->m_pMyVehicle->GetPosition();
+	return m_pPed->GetPosition();
+}
+
+CVector
+FindPlayerCoors(void)
+{
+#ifdef FIX_BUGS
+	if (CReplay::IsPlayingBack())
+		return TheCamera.GetPosition();
+#endif
+	CPlayerPed *ped = FindPlayerPed();
+	if(ped->InVehicle())
+		return ped->m_pMyVehicle->GetPosition();
+	else
+		return ped->GetPosition();
+}
+
+const CVector &
+FindPlayerSpeed(void)
+{
+#ifdef FIX_BUGS
+	static CVector vecTmpVector(0.0f, 0.0f, 0.0f);
+	if (CReplay::IsPlayingBack())
+		return vecTmpVector;
+#endif
+	CPlayerPed *ped = FindPlayerPed();
+	if(ped->InVehicle())
+		return ped->m_pMyVehicle->m_vecMoveSpeed;
+	else
+		return ped->m_vecMoveSpeed;
+}
+
+CVehicle *
+FindPlayerVehicle(void)
+{
+	CPlayerPed *ped = FindPlayerPed();
+	if(ped && ped->InVehicle()) return ped->m_pMyVehicle;
+	return nil;
+}
+
+CEntity *
+FindPlayerEntity(void)
+{
+	CPlayerPed *ped = FindPlayerPed();
+	if(ped->InVehicle())
+		return ped->m_pMyVehicle;
+	else
+		return ped;
+}
+
+CVehicle *
+FindPlayerTrain(void)
+{
+	if(FindPlayerVehicle() && FindPlayerVehicle()->IsTrain())
+		return FindPlayerVehicle();
+	else
+		return nil;
+}
+
+CPlayerPed *
+FindPlayerPed(void)
+{
+	return CWorld::Players[CWorld::PlayerInFocus].m_pPed;
+}
+
+const CVector &
+FindPlayerCentreOfWorld(int32 player)
+{
+#ifdef FIX_BUGS
+	if(CReplay::IsPlayingBack()) return TheCamera.GetPosition();
+#endif
+	if(CCarCtrl::bCarsGeneratedAroundCamera) return TheCamera.GetPosition();
+	if(CWorld::Players[player].m_pRemoteVehicle) return CWorld::Players[player].m_pRemoteVehicle->GetPosition();
+	if(FindPlayerVehicle()) return FindPlayerVehicle()->GetPosition();
+	return CWorld::Players[player].m_pPed->GetPosition();
+}
+
+const CVector &
+FindPlayerCentreOfWorld_NoSniperShift(void)
+{
+#ifdef FIX_BUGS
+	if (CReplay::IsPlayingBack()) return TheCamera.GetPosition();
+#endif
+	if(CCarCtrl::bCarsGeneratedAroundCamera) return TheCamera.GetPosition();
+	if(CWorld::Players[CWorld::PlayerInFocus].m_pRemoteVehicle)
+		return CWorld::Players[CWorld::PlayerInFocus].m_pRemoteVehicle->GetPosition();
+	if(FindPlayerVehicle()) return FindPlayerVehicle()->GetPosition();
+	return FindPlayerPed()->GetPosition();
+}
+
+float
+FindPlayerHeading(void)
+{
+	if(CWorld::Players[CWorld::PlayerInFocus].m_pRemoteVehicle)
+		return CWorld::Players[CWorld::PlayerInFocus].m_pRemoteVehicle->GetForward().Heading();
+	if(FindPlayerVehicle()) return FindPlayerVehicle()->GetForward().Heading();
+	return FindPlayerPed()->GetForward().Heading();
+}
+
+bool
+CPlayerInfo::IsRestartingAfterDeath()
+{
+	return m_WBState == WBSTATE_WASTED;
+}
+
+bool
+CPlayerInfo::IsRestartingAfterArrest()
+{
+	return m_WBState == WBSTATE_BUSTED;
+}
+
+void
+CPlayerInfo::KillPlayer()
+{
+	if (m_WBState != WBSTATE_PLAYING) return;
+
+	m_WBState = WBSTATE_WASTED;
+	m_nWBTime = CTimer::GetTimeInMilliseconds();
+	CDarkel::ResetOnPlayerDeath();
+	CMessages::AddBigMessage(TheText.Get("DEAD"), 4000, 2);
+	CStats::TimesDied++;
+}
+
+void
+CPlayerInfo::ArrestPlayer()
+{
+	if (m_WBState != WBSTATE_PLAYING) return;
+
+	m_WBState = WBSTATE_BUSTED;
+	m_nWBTime = CTimer::GetTimeInMilliseconds();
+	m_nBustedAudioStatus = BUSTEDAUDIO_NONE;
+	CDarkel::ResetOnPlayerDeath();
+	CMessages::AddBigMessage(TheText.Get("BUSTED"), 5000, 2);
+	CStats::TimesArrested++;
+}
+
+void
+CPlayerInfo::PlayerFailedCriticalMission()
+{
+	if (m_WBState != WBSTATE_PLAYING)
+		return;
+	m_WBState = WBSTATE_FAILED_CRITICAL_MISSION;
+	m_nWBTime = CTimer::GetTimeInMilliseconds();
+	CDarkel::ResetOnPlayerDeath();
+}
+
+void
+CPlayerInfo::CancelPlayerEnteringCars(CVehicle *car)
+{
+	if (!car || car == m_pPed->m_pMyVehicle) {
+		if (m_pPed->EnteringCar())
+			m_pPed->QuitEnteringCar();
+	}
+	if (m_pPed->m_objective == OBJECTIVE_ENTER_CAR_AS_PASSENGER || m_pPed->m_objective == OBJECTIVE_ENTER_CAR_AS_DRIVER)
+		m_pPed->ClearObjective();
+}
+
+void
+CPlayerInfo::MakePlayerSafe(bool toggle)
+{
+	if (toggle) {
+		m_pPed->m_pWanted->m_bIgnoredByEveryone = true;
+		CWorld::StopAllLawEnforcersInTheirTracks();
+		CPad::GetPad(0)->SetDisablePlayerControls(PLAYERCONTROL_PLAYERINFO);
+		CPad::StopPadsShaking();
+		m_pPed->bBulletProof = true;
+		m_pPed->bFireProof = true;
+		m_pPed->bCollisionProof = true;
+		m_pPed->bMeleeProof = true;
+		m_pPed->bOnlyDamagedByPlayer = true;
+		m_pPed->bExplosionProof = true;
+		m_pPed->m_bCanBeDamaged = false;
+		((CPlayerPed*)m_pPed)->ClearAdrenaline();
+		CancelPlayerEnteringCars(nil);
+		gFireManager.ExtinguishPoint(GetPos(), 4000.0f);
+		CExplosion::RemoveAllExplosionsInArea(GetPos(), 4000.0f);
+		CProjectileInfo::RemoveAllProjectiles();
+		CWorld::SetAllCarsCanBeDamaged(false);
+		CWorld::ExtinguishAllCarFiresInArea(GetPos(), 4000.0f);
+		CReplay::DisableReplays();
+
+	} else {
+		m_pPed->m_pWanted->m_bIgnoredByEveryone = false;
+		CPad::GetPad(0)->SetEnablePlayerControls(PLAYERCONTROL_PLAYERINFO);
+		m_pPed->bBulletProof = false;
+		m_pPed->bFireProof = false;
+		m_pPed->bCollisionProof = false;
+		m_pPed->bMeleeProof = false;
+		m_pPed->bOnlyDamagedByPlayer = false;
+		m_pPed->bExplosionProof = false;
+		m_pPed->m_bCanBeDamaged = true;
+		CWorld::SetAllCarsCanBeDamaged(true);
+		CReplay::EnableReplays();
+	}
+}
+
+void
+CPlayerInfo::BlowUpRCBuggy(bool actually)
+{
+	if (!m_pRemoteVehicle || m_pRemoteVehicle->bRemoveFromWorld)
+		return;
+
+	CRemote::TakeRemoteControlledCarFromPlayer(actually);
+	if (actually)
+		m_pRemoteVehicle->BlowUpCar(FindPlayerPed());
+}
+
+#ifdef GTA_PC
+void
+CPlayerInfo::SetPlayerSkin(const char *skin)
+{
+	strncpy(m_aSkinName, skin, 32);
+	LoadPlayerSkin();
+}
+
+void
+CPlayerInfo::LoadPlayerSkin()
+{
+	DeletePlayerSkin();
+
+	m_pSkinTexture = CPlayerSkin::GetSkinTexture(m_aSkinName);
+}
+
+void
+CPlayerInfo::DeletePlayerSkin()
+{
+	if (m_pSkinTexture) {
+		RwTextureDestroy(m_pSkinTexture);
+		m_pSkinTexture = nil;
+	}
+}
+#endif
diff --git a/src/core/PlayerInfo.h b/src/core/PlayerInfo.h
new file mode 100644
index 0000000..a24185f
--- /dev/null
+++ b/src/core/PlayerInfo.h
@@ -0,0 +1,124 @@
+#pragma once
+
+#include "ColModel.h"
+
+enum eWastedBustedState
+{
+	WBSTATE_PLAYING,
+	WBSTATE_WASTED,
+	WBSTATE_BUSTED,
+	WBSTATE_FAILED_CRITICAL_MISSION,
+};
+
+enum eBustedAudioState
+{
+	BUSTEDAUDIO_NONE,
+	BUSTEDAUDIO_LOADING,
+	BUSTEDAUDIO_DONE
+};
+
+class CEntity;
+class CPed;
+class CVehicle;
+class CPlayerPed;
+class CCivilianPed;
+
+class CPlayerInfo
+{
+public:
+	CPlayerPed *m_pPed;
+	CVehicle *m_pRemoteVehicle;
+	CColModel m_ColModel;
+	CVehicle *m_pVehicleEx;	// vehicle using the col model above
+	char m_aPlayerName[70];
+	int32 m_nMoney;
+	int32 m_nVisibleMoney;
+	int32 m_nCollectedPackages;
+	int32 m_nTotalPackages;
+	uint32 m_nLastBumpPlayerCarTimer;
+	uint32 m_nUnusedTaxiTimer;
+	bool m_bUnusedTaxiThing;
+	uint32 m_nNextSexFrequencyUpdateTime;
+	uint32 m_nNextSexMoneyUpdateTime;
+	int32 m_nSexFrequency;
+	CCivilianPed *m_pHooker;
+	int8 m_WBState; // eWastedBustedState
+	uint32 m_nWBTime;
+	bool m_bInRemoteMode;
+	bool field_D5;
+	bool field_D6;
+	uint32 m_nTimeLostRemoteCar;
+	uint32 m_nTimeLastHealthLoss;
+	uint32 m_nTimeLastArmourLoss;
+	uint32 m_nTimeTankShotGun;
+	int32 m_nUpsideDownCounter;
+	int32 field_EC;
+	int32 m_nTimeCarSpentOnTwoWheels;
+	int32 m_nDistanceCarTravelledOnTwoWheels;
+	int32 m_nTimeNotFullyOnGround;
+	int32 m_nTimeSpentOnWheelie;
+	float m_nDistanceTravelledOnWheelie;
+	int32 m_nTimeSpentOnStoppie;
+	float m_nDistanceTravelledOnStoppie;
+	int32 m_nCancelWheelStuntTimer;
+	int32 m_nLastTimeCarSpentOnTwoWheels;
+	int32 m_nLastDistanceCarTravelledOnTwoWheels;
+	int32 m_nLastTimeSpentOnWheelie;
+	int32 m_nLastDistanceTravelledOnWheelie;
+	int32 m_nLastTimeSpentOnStoppie;
+	int32 m_nLastDistanceTravelledOnStoppie;
+	int16 m_nTrafficMultiplier;
+	int16 field_12A;
+	float m_fRoadDensity;
+	uint32 m_nPreviousTimeRewardedForExplosion;
+	uint32 m_nExplosionsSinceLastReward;
+	uint32 m_nHavocLevel;
+	float m_fMediaAttention;
+	bool m_bInfiniteSprint;
+	bool m_bFastReload;
+	bool m_bFireproof;
+	uint8 m_nMaxHealth;
+	uint8 m_nMaxArmour;
+	bool m_bGetOutOfJailFree;
+	bool m_bGetOutOfHospitalFree;
+	bool m_bDriveByAllowed;
+	uint8 m_nBustedAudioStatus;
+	int16 m_nCurrentBustedAudio;
+#ifdef GTA_PC
+	char m_aSkinName[32];
+	RwTexture *m_pSkinTexture;
+#endif
+
+	void MakePlayerSafe(bool);
+	const CVector &GetPos();
+	void Process(void);
+	void KillPlayer(void);
+	void ArrestPlayer(void);
+	bool IsPlayerInRemoteMode(void);
+	void PlayerFailedCriticalMission(void);
+	void Clear(void);
+	void BlowUpRCBuggy(bool);
+	void CancelPlayerEnteringCars(CVehicle*);
+	bool IsRestartingAfterDeath(void);
+	bool IsRestartingAfterArrest(void);
+	void EvaluateCarPosition(CEntity*, CPed*, float, float*, CVehicle**);
+	void LoadPlayerInfo(uint8 *buf, uint32 size);
+	void SavePlayerInfo(uint8 *buf, uint32* size);
+	void FindClosestCarSectorList(CPtrList&, CPed*, float, float, float, float, float*, CVehicle**);
+
+#ifdef GTA_PC
+	void LoadPlayerSkin();
+	void SetPlayerSkin(const char *skin);
+	void DeletePlayerSkin();
+#endif
+};
+
+CPlayerPed *FindPlayerPed(void);
+CVehicle *FindPlayerVehicle(void);
+CVehicle *FindPlayerTrain(void);
+CEntity *FindPlayerEntity(void);
+CVector FindPlayerCoors(void);
+const CVector &FindPlayerSpeed(void);
+const CVector &FindPlayerCentreOfWorld(int32 player);
+const CVector &FindPlayerCentreOfWorld_NoSniperShift(void);
+float FindPlayerHeading(void);
\ No newline at end of file
diff --git a/src/core/Pools.cpp b/src/core/Pools.cpp
new file mode 100644
index 0000000..bf35f8e
--- /dev/null
+++ b/src/core/Pools.cpp
@@ -0,0 +1,640 @@
+#include "common.h"
+
+#include "Pools.h"
+
+#include "Bike.h"
+#include "Boat.h"
+#include "CarCtrl.h"
+#ifdef MISSION_REPLAY
+#include "GenericGameStorage.h"
+#endif
+#include "Population.h"
+#include "ProjectileInfo.h"
+#include "Streaming.h"
+#include "Wanted.h"
+#include "World.h"
+#include "MemoryHeap.h"
+
+CCPtrNodePool *CPools::ms_pPtrNodePool;
+CEntryInfoNodePool *CPools::ms_pEntryInfoNodePool;
+CPedPool *CPools::ms_pPedPool;
+CVehiclePool *CPools::ms_pVehiclePool;
+CBuildingPool *CPools::ms_pBuildingPool;
+CTreadablePool *CPools::ms_pTreadablePool;
+CObjectPool *CPools::ms_pObjectPool;
+CDummyPool *CPools::ms_pDummyPool;
+CAudioScriptObjectPool *CPools::ms_pAudioScriptObjectPool;
+CColModelPool *CPools::ms_pColModelPool;
+
+#if defined GTA_PS2 && !defined MASTER	// or USE_CUSTOM_ALLOCATOR
+// not in VC. perhaps ifdef'ed away
+#define CHECKMEM(msg) CMemCheck::AllocateMemCheckBlock(msg)
+#else
+#define CHECKMEM(msg)
+#endif
+
+void
+CPools::Initialise(void)
+{
+	PUSH_MEMID(MEMID_POOLS);
+	CHECKMEM("before pools");
+	ms_pPtrNodePool = new CCPtrNodePool(NUMPTRNODES, "PtrNode");
+	CHECKMEM("after CPtrNodePool");
+	ms_pEntryInfoNodePool = new CEntryInfoNodePool(NUMENTRYINFOS, "EntryInfoNode");
+	CHECKMEM("after CEntryInfoNodePool");
+	ms_pPedPool = new CPedPool(NUMPEDS, "Peds");
+	CHECKMEM("after CPedPool");
+	ms_pVehiclePool = new CVehiclePool(NUMVEHICLES, "Vehicles");
+	CHECKMEM("after CVehiclePool");
+	ms_pBuildingPool = new CBuildingPool(NUMBUILDINGS, "Buildings");
+	CHECKMEM("after CBuildingPool");
+	ms_pTreadablePool = new CTreadablePool(NUMTREADABLES, "Treadables");
+	CHECKMEM("after CTreadablePool");
+	ms_pObjectPool = new CObjectPool(NUMOBJECTS, "Objects");
+	CHECKMEM("after CObjectPool");
+	ms_pDummyPool = new CDummyPool(NUMDUMMIES, "Dummys");
+	CHECKMEM("after CDummyPool");
+	ms_pAudioScriptObjectPool = new CAudioScriptObjectPool(NUMAUDIOSCRIPTOBJECTS, "AudioScriptObj");
+	CHECKMEM("after cAudioScriptObjectPool");
+	ms_pColModelPool = new CColModelPool(NUMCOLMODELS, "ColModel");
+	CHECKMEM("after pools");
+	POP_MEMID();
+}
+
+void
+CPools::ShutDown(void)
+{
+	debug("PtrNodes left %d\n", ms_pPtrNodePool->GetNoOfUsedSpaces());
+	debug("EntryInfoNodes left %d\n", ms_pEntryInfoNodePool->GetNoOfUsedSpaces());
+	debug("Peds left %d\n", ms_pPedPool->GetNoOfUsedSpaces());
+	debug("Vehicles left %d\n", ms_pVehiclePool->GetNoOfUsedSpaces());
+	debug("Buildings left %d\n", ms_pBuildingPool->GetNoOfUsedSpaces());
+	debug("Treadables left %d\n", ms_pTreadablePool->GetNoOfUsedSpaces());
+	debug("Objects left %d\n", ms_pObjectPool->GetNoOfUsedSpaces());
+	debug("Dummys left %d\n", ms_pDummyPool->GetNoOfUsedSpaces());
+	debug("AudioScriptObjects left %d\n", ms_pAudioScriptObjectPool->GetNoOfUsedSpaces());
+	debug("ColModels left %d\n", ms_pColModelPool->GetNoOfUsedSpaces());
+	printf("Shutdown pool started\n");
+
+	delete ms_pPtrNodePool;
+	delete ms_pEntryInfoNodePool;
+	delete ms_pPedPool;
+	delete ms_pVehiclePool;
+	delete ms_pBuildingPool;
+	delete ms_pTreadablePool;
+	delete ms_pObjectPool;
+	delete ms_pDummyPool;
+	delete ms_pAudioScriptObjectPool;
+	delete ms_pColModelPool;
+
+	printf("Shutdown pool done\n");
+}
+
+int32 CPools::GetPedRef(CPed *ped) { return ms_pPedPool->GetIndex(ped); }
+CPed *CPools::GetPed(int32 handle) { return ms_pPedPool->GetAt(handle); }
+int32 CPools::GetVehicleRef(CVehicle *vehicle) { return ms_pVehiclePool->GetIndex(vehicle); }
+CVehicle *CPools::GetVehicle(int32 handle) { return ms_pVehiclePool->GetAt(handle); }
+int32 CPools::GetObjectRef(CObject *object) { return ms_pObjectPool->GetIndex(object); }
+CObject *CPools::GetObject(int32 handle) { return ms_pObjectPool->GetAt(handle); }
+
+void
+CPools::CheckPoolsEmpty()
+{
+	assert(ms_pPedPool->GetNoOfUsedSpaces() == 0);
+	assert(ms_pVehiclePool->GetNoOfUsedSpaces() == 0);
+	printf("pools have been cleared\n");
+}
+
+
+void
+CPools::MakeSureSlotInObjectPoolIsEmpty(int32 slot)
+{
+	if (ms_pObjectPool->GetIsFree(slot)) return;
+
+	CObject *object = ms_pObjectPool->GetSlot(slot);
+	if (object->ObjectCreatedBy == TEMP_OBJECT) {
+		CWorld::Remove(object);
+		delete object;
+	} else if (!CProjectileInfo::RemoveIfThisIsAProjectile(object)) {
+		// relocate to another slot??
+		CObject *newObject = new CObject(object->GetModelIndex(), false);
+		CWorld::Remove(object);
+#if 0 // todo better
+		*newObject = *object;
+#else
+		memcpy(newObject, object, ms_pObjectPool->GetMaxEntrySize());
+#endif
+		CWorld::Add(newObject);
+		object->m_rwObject = nil;
+		delete object;
+		newObject->m_pFirstReference = nil;
+	}
+}
+
+#define CopyFromBuf(buf, data) memcpy(&data, buf, sizeof(data)); SkipSaveBuf(buf, sizeof(data));
+#define CopyToBuf(buf, data) memcpy(buf, &data, sizeof(data)); SkipSaveBuf(buf, sizeof(data));
+
+void CPools::LoadVehiclePool(uint8* buf, uint32 size)
+{
+INITSAVEBUF
+	int nNumCars = ReadSaveBuf<int>(buf);
+	int nNumBoats = ReadSaveBuf<int>(buf);
+	int nNumBikes = ReadSaveBuf<int>(buf);
+	for (int i = 0; i < nNumCars + nNumBoats + nNumBikes; i++) {
+		uint32 type = ReadSaveBuf<uint32>(buf);
+		int16 model = ReadSaveBuf<int16>(buf);
+		CStreaming::RequestModel(model, STREAMFLAGS_DEPENDENCY);
+		CStreaming::LoadAllRequestedModels(false);
+		int32 slot = ReadSaveBuf<int32>(buf);
+		CVehicle* pVehicle;
+#ifdef COMPATIBLE_SAVES
+		if (type == VEHICLE_TYPE_BOAT)
+			pVehicle = new(slot) CBoat(model, RANDOM_VEHICLE);
+		else if (type == VEHICLE_TYPE_CAR)
+			pVehicle = new(slot) CAutomobile(model, RANDOM_VEHICLE);
+		else if (type == VEHICLE_TYPE_BIKE)
+			pVehicle = new(slot) CBike(model, RANDOM_VEHICLE);
+		else
+			assert(0);
+		--CCarCtrl::NumRandomCars;
+		pVehicle->Load(buf);
+		CWorld::Add(pVehicle);
+#else
+		char* vbuf = new char[Max(CBike::nSaveStructSize, Max(CAutomobile::nSaveStructSize, CBoat::nSaveStructSize))];
+		if (type == VEHICLE_TYPE_BOAT) {
+			memcpy(vbuf, buf, sizeof(CBoat));
+			SkipSaveBuf(buf, sizeof(CBoat));
+			CBoat* pBoat = new(slot) CBoat(model, RANDOM_VEHICLE);
+			pVehicle = pBoat;
+			--CCarCtrl::NumRandomCars;
+		}
+		else if (type == VEHICLE_TYPE_CAR) {
+			memcpy(vbuf, buf, sizeof(CAutomobile));
+			SkipSaveBuf(buf, sizeof(CAutomobile));
+			CStreaming::RequestModel(model, 0); // is it needed?
+			CStreaming::LoadAllRequestedModels(false);
+			CAutomobile* pAutomobile = new(slot) CAutomobile(model, RANDOM_VEHICLE);
+			pVehicle = pAutomobile;
+			CCarCtrl::NumRandomCars--; // why?
+			pAutomobile->Damage = ((CAutomobile*)vbuf)->Damage;
+			pAutomobile->SetupDamageAfterLoad();
+		}
+		else if (type == VEHICLE_TYPE_BIKE) {
+#ifdef FIX_BUGS
+			memcpy(vbuf, buf, sizeof(CBike));
+#else
+			memcpy(vbuf, buf, sizeof(CAutomobile));
+#endif
+			SkipSaveBuf(buf, sizeof(CBike));
+			CBike* pBike = new(slot) CBike(model, RANDOM_VEHICLE);
+			pVehicle = pBike;
+			--CCarCtrl::NumRandomCars;
+		}
+		else
+			assert(0);
+		CVehicle* pBufferVehicle = (CVehicle*)vbuf;
+		pVehicle->GetMatrix() = pBufferVehicle->GetMatrix();
+		pVehicle->VehicleCreatedBy = pBufferVehicle->VehicleCreatedBy;
+		pVehicle->m_currentColour1 = pBufferVehicle->m_currentColour1;
+		pVehicle->m_currentColour2 = pBufferVehicle->m_currentColour2;
+		pVehicle->m_nAlarmState = pBufferVehicle->m_nAlarmState;
+		pVehicle->m_nNumMaxPassengers = pBufferVehicle->m_nNumMaxPassengers;
+		pVehicle->field_1D0[0] = pBufferVehicle->field_1D0[0];
+		pVehicle->field_1D0[1] = pBufferVehicle->field_1D0[1];
+		pVehicle->field_1D0[2] = pBufferVehicle->field_1D0[2];
+		pVehicle->field_1D0[3] = pBufferVehicle->field_1D0[3];
+		pVehicle->m_fSteerAngle = pBufferVehicle->m_fSteerAngle;
+		pVehicle->m_fGasPedal = pBufferVehicle->m_fGasPedal;
+		pVehicle->m_fBrakePedal = pBufferVehicle->m_fBrakePedal;
+		pVehicle->bIsLawEnforcer = pBufferVehicle->bIsLawEnforcer;
+		pVehicle->bIsLocked = pBufferVehicle->bIsLocked;
+		pVehicle->bEngineOn = pBufferVehicle->bEngineOn;
+		pVehicle->bIsHandbrakeOn = pBufferVehicle->bIsHandbrakeOn;
+		pVehicle->bLightsOn = pBufferVehicle->bLightsOn;
+		pVehicle->bFreebies = pBufferVehicle->bFreebies;
+		pVehicle->m_fHealth = pBufferVehicle->m_fHealth;
+		pVehicle->m_nCurrentGear = pBufferVehicle->m_nCurrentGear;
+		pVehicle->m_fChangeGearTime = pBufferVehicle->m_fChangeGearTime;
+		pVehicle->m_nTimeOfDeath = pBufferVehicle->m_nTimeOfDeath;
+#ifdef FIX_BUGS //must be copypaste
+		pVehicle->m_nBombTimer = pBufferVehicle->m_nBombTimer;
+#else
+		pVehicle->m_nTimeOfDeath = pBufferVehicle->m_nTimeOfDeath;
+#endif
+		pVehicle->m_nDoorLock = pBufferVehicle->m_nDoorLock;
+		pVehicle->SetStatus(pBufferVehicle->GetStatus());
+		pVehicle->SetType(pBufferVehicle->GetType());
+		(pVehicle->GetAddressOfEntityProperties())[0] = (pBufferVehicle->GetAddressOfEntityProperties())[0];
+		(pVehicle->GetAddressOfEntityProperties())[1] = (pBufferVehicle->GetAddressOfEntityProperties())[1];
+		pVehicle->AutoPilot = pBufferVehicle->AutoPilot;
+		CCarCtrl::UpdateCarCount(pVehicle, false);
+		CWorld::Add(pVehicle);
+		delete[] vbuf;
+#endif
+	}
+VALIDATESAVEBUF(size)
+}
+
+void CPools::SaveVehiclePool(uint8* buf, uint32* size)
+{
+INITSAVEBUF
+	int nNumCars = 0;
+	int nNumBoats = 0;
+	int nNumBikes = 0;
+	int nPoolSize = GetVehiclePool()->GetSize();
+	for (int i = 0; i < nPoolSize; i++) {
+		CVehicle* pVehicle = GetVehiclePool()->GetSlot(i);
+		if (!pVehicle)
+			continue;
+		bool bHasPassenger = false;
+		for (int j = 0; j < ARRAY_SIZE(pVehicle->pPassengers); j++) {
+			if (pVehicle->pPassengers[j])
+				bHasPassenger = true;
+		}
+#ifdef MISSION_REPLAY
+		bool bForceSaving = CWorld::Players[CWorld::PlayerInFocus].m_pPed->m_pMyVehicle == pVehicle && IsQuickSave;
+#ifdef FIX_BUGS
+		if ((!pVehicle->pDriver && !bHasPassenger) || bForceSaving) {
+#else
+		if (!pVehicle->pDriver && !bHasPassenger) {
+#endif
+			if (pVehicle->IsCar() && (pVehicle->VehicleCreatedBy == MISSION_VEHICLE || bForceSaving))
+				++nNumCars;
+			if (pVehicle->IsBoat() && (pVehicle->VehicleCreatedBy == MISSION_VEHICLE || bForceSaving))
+				++nNumBoats;
+			if (pVehicle->IsBike() && (pVehicle->VehicleCreatedBy == MISSION_VEHICLE || bForceSaving))
+				++nNumBoats;
+#else
+		if (!pVehicle->pDriver && !bHasPassenger) {
+			if (pVehicle->IsCar() && pVehicle->VehicleCreatedBy == MISSION_VEHICLE)
+				++nNumCars;
+			if (pVehicle->IsBoat() && pVehicle->VehicleCreatedBy == MISSION_VEHICLE)
+				++nNumBoats;
+			if (pVehicle->IsBike() && pVehicle->VehicleCreatedBy == MISSION_VEHICLE)
+				++nNumBoats;
+#endif
+		}
+	}
+	*size = nNumCars * (sizeof(uint32) + sizeof(int16) + sizeof(int32) + CAutomobile::nSaveStructSize) + sizeof(int) +
+		nNumBoats * (sizeof(uint32) + sizeof(int16) + sizeof(int32) + CBoat::nSaveStructSize) + sizeof(int) +
+		nNumBikes * (sizeof(uint32) + sizeof(int16) + sizeof(int32) + CBike::nSaveStructSize) + sizeof(int);
+	WriteSaveBuf(buf, nNumCars);
+	WriteSaveBuf(buf, nNumBoats);
+	WriteSaveBuf(buf, nNumBikes);
+	for (int i = 0; i < nPoolSize; i++) {
+		CVehicle* pVehicle = GetVehiclePool()->GetSlot(i);
+		if (!pVehicle)
+			continue;
+		bool bHasPassenger = false;
+		for (int j = 0; j < ARRAY_SIZE(pVehicle->pPassengers); j++) {
+			if (pVehicle->pPassengers[j])
+				bHasPassenger = true;
+		}
+#ifdef MISSION_REPLAY
+		bool bForceSaving = CWorld::Players[CWorld::PlayerInFocus].m_pPed->m_pMyVehicle == pVehicle && IsQuickSave;
+#endif
+#if defined FIX_BUGS && defined MISSION_REPLAY
+		if ((!pVehicle->pDriver && !bHasPassenger) || bForceSaving) {
+#else
+		if (!pVehicle->pDriver && !bHasPassenger) {
+#endif
+#ifdef COMPATIBLE_SAVES
+#ifdef MISSION_REPLAY
+			if ((pVehicle->IsCar() || pVehicle->IsBoat() || pVehicle->IsBike()) && (pVehicle->VehicleCreatedBy == MISSION_VEHICLE || bForceSaving)) {
+#else
+			if ((pVehicle->IsCar() || pVehicle->IsBoat() || pVehicle->IsBike()) && pVehicle->VehicleCreatedBy == MISSION_VEHICLE) {
+#endif
+				WriteSaveBuf<uint32>(buf, pVehicle->m_vehType);
+				WriteSaveBuf<int16>(buf, pVehicle->GetModelIndex());
+				WriteSaveBuf<int32>(buf, GetVehicleRef(pVehicle));
+				pVehicle->Save(buf);
+			}
+#else
+#ifdef MISSION_REPLAY
+			if (pVehicle->IsCar() && (pVehicle->VehicleCreatedBy == MISSION_VEHICLE || bForceSaving)) {
+#else
+			if (pVehicle->IsCar() && pVehicle->VehicleCreatedBy == MISSION_VEHICLE) {
+#endif
+				WriteSaveBuf(buf, (uint32)pVehicle->m_vehType);
+				WriteSaveBuf(buf, pVehicle->GetModelIndex());
+				WriteSaveBuf(buf, GetVehicleRef(pVehicle));
+				memcpy(buf, pVehicle, sizeof(CAutomobile));
+				SkipSaveBuf(buf, sizeof(CAutomobile));
+			}
+#ifdef MISSION_REPLAY
+			if (pVehicle->IsBoat() && (pVehicle->VehicleCreatedBy == MISSION_VEHICLE || bForceSaving)) {
+#else
+			if (pVehicle->IsBoat() && pVehicle->VehicleCreatedBy == MISSION_VEHICLE) {
+#endif
+				WriteSaveBuf(buf, (uint32)pVehicle->m_vehType);
+				WriteSaveBuf(buf, pVehicle->GetModelIndex());
+				WriteSaveBuf(buf, GetVehicleRef(pVehicle));
+				memcpy(buf, pVehicle, sizeof(CBoat));
+				SkipSaveBuf(buf, sizeof(CBoat));
+			}
+#ifdef MISSION_REPLAY
+			if (pVehicle->IsBike() && (pVehicle->VehicleCreatedBy == MISSION_VEHICLE || bForceSaving)) {
+#else
+			if (pVehicle->IsBike() && pVehicle->VehicleCreatedBy == MISSION_VEHICLE) {
+#endif
+				WriteSaveBuf(buf, (uint32)pVehicle->m_vehType);
+				WriteSaveBuf(buf, pVehicle->GetModelIndex());
+				WriteSaveBuf(buf, GetVehicleRef(pVehicle));
+				memcpy(buf, pVehicle, sizeof(CBike));
+				SkipSaveBuf(buf, sizeof(CBike));
+			}
+#endif
+		}
+	}
+VALIDATESAVEBUF(*size)
+}
+
+void CPools::SaveObjectPool(uint8* buf, uint32* size)
+{
+INITSAVEBUF
+	CProjectileInfo::RemoveAllProjectiles();
+	CObject::DeleteAllTempObjects();
+	int nObjects = 0;
+	int nPoolSize = GetObjectPool()->GetSize();
+	for (int i = 0; i < nPoolSize; i++) {
+		CObject* pObject = GetObjectPool()->GetSlot(i);
+		if (!pObject)
+			continue;
+		if (pObject->ObjectCreatedBy == MISSION_OBJECT)
+			++nObjects;
+	}
+	*size = nObjects * (sizeof(int16) + sizeof(int) + sizeof(CCompressedMatrix) +
+		sizeof(float) + sizeof(CCompressedMatrix) + sizeof(int8) + 7 * sizeof(bool) + sizeof(int16) +
+		+ sizeof(int8) * 2 + sizeof(float) + sizeof(int8) + sizeof(int8) +
+		sizeof(uint32) + 2 * sizeof(uint32)) + sizeof(int);
+	CopyToBuf(buf, nObjects);
+	for (int i = 0; i < nPoolSize; i++) {
+		CObject* pObject = GetObjectPool()->GetSlot(i);
+		if (!pObject)
+			continue;
+		if (pObject->ObjectCreatedBy == MISSION_OBJECT) {
+			bool bIsPickup = pObject->bIsPickup;
+			bool bPickupObjWithMessage = pObject->bPickupObjWithMessage;
+			bool bOutOfStock = pObject->bOutOfStock;
+			bool bGlassCracked = pObject->bGlassCracked;
+			bool bGlassBroken = pObject->bGlassBroken;
+			bool bHasBeenDamaged = pObject->bHasBeenDamaged;
+			bool bUseVehicleColours = pObject->bUseVehicleColours;
+			CCompressedMatrix tmp;
+			CopyToBuf(buf, pObject->m_modelIndex);
+			int32 ref = GetObjectRef(pObject);
+			CopyToBuf(buf, ref);
+			tmp.CompressFromFullMatrix(pObject->GetMatrix());
+			CopyToBuf(buf, tmp);
+			CopyToBuf(buf, pObject->m_fUprootLimit);
+			tmp.CompressFromFullMatrix(pObject->m_objectMatrix);
+			CopyToBuf(buf, tmp);
+			CopyToBuf(buf, pObject->ObjectCreatedBy);
+			CopyToBuf(buf, bIsPickup);
+			CopyToBuf(buf, bPickupObjWithMessage);
+			CopyToBuf(buf, bOutOfStock);
+			CopyToBuf(buf, bGlassCracked);
+			CopyToBuf(buf, bGlassBroken);
+			CopyToBuf(buf, bHasBeenDamaged);
+			CopyToBuf(buf, bUseVehicleColours);
+			CopyToBuf(buf, pObject->m_nCostValue);
+			CopyToBuf(buf, pObject->m_nBonusValue);
+			SkipSaveBuf(buf, 1);
+			CopyToBuf(buf, pObject->m_fCollisionDamageMultiplier);
+			CopyToBuf(buf, pObject->m_nCollisionDamageEffect);
+			CopyToBuf(buf, pObject->m_nSpecialCollisionResponseCases);
+			CopyToBuf(buf, pObject->m_nEndOfLifeTime);
+#ifdef COMPATIBLE_SAVES
+			pObject->SaveEntityFlags(buf);
+#else
+			CopyToBuf(buf, (pObject->GetAddressOfEntityProperties())[0]);
+			CopyToBuf(buf, (pObject->GetAddressOfEntityProperties())[1]);
+#endif
+		}
+	}
+VALIDATESAVEBUF(*size)
+}
+
+void CPools::LoadObjectPool(uint8* buf, uint32 size)
+{
+INITSAVEBUF
+	int nObjects;
+	CopyFromBuf(buf, nObjects);
+	for (int i = 0; i < nObjects; i++) {
+		int16 mi;
+		CopyFromBuf(buf, mi);
+		int ref;
+		CopyFromBuf(buf, ref);
+		char* obuf = new char[sizeof(CObject)];
+		CObject* pBufferObject = (CObject*)obuf;
+		CCompressedMatrix tmp;
+		CopyFromBuf(buf, tmp);
+		tmp.DecompressIntoFullMatrix(pBufferObject->GetMatrix());
+		CopyFromBuf(buf, pBufferObject->m_fUprootLimit);
+		CopyFromBuf(buf, tmp);
+		tmp.DecompressIntoFullMatrix(pBufferObject->m_objectMatrix);
+		CopyFromBuf(buf, pBufferObject->ObjectCreatedBy);
+		int8 bitFlag;
+		CopyFromBuf(buf, bitFlag);
+		pBufferObject->bIsPickup = bitFlag;
+		CopyFromBuf(buf, bitFlag);
+		pBufferObject->bPickupObjWithMessage = bitFlag;
+		CopyFromBuf(buf, bitFlag);
+		pBufferObject->bOutOfStock = bitFlag;
+		CopyFromBuf(buf, bitFlag);
+		pBufferObject->bGlassCracked = bitFlag;
+		CopyFromBuf(buf, bitFlag);
+		pBufferObject->bGlassBroken = bitFlag;
+		CopyFromBuf(buf, bitFlag);
+		pBufferObject->bHasBeenDamaged = bitFlag;
+		CopyFromBuf(buf, bitFlag);
+		pBufferObject->bUseVehicleColours = bitFlag;
+		CopyFromBuf(buf, pBufferObject->m_nCostValue);
+		CopyFromBuf(buf, pBufferObject->m_nBonusValue);
+		SkipSaveBuf(buf, 1);
+		CopyFromBuf(buf, pBufferObject->m_fCollisionDamageMultiplier);
+		CopyFromBuf(buf, pBufferObject->m_nCollisionDamageEffect);
+		CopyFromBuf(buf, pBufferObject->m_nSpecialCollisionResponseCases);
+		CopyFromBuf(buf, pBufferObject->m_nEndOfLifeTime);
+#ifndef COMPATIBLE_SAVES
+		CopyFromBuf(buf, (pBufferObject->GetAddressOfEntityProperties())[0]);
+		CopyFromBuf(buf, (pBufferObject->GetAddressOfEntityProperties())[1]);
+#endif
+		if (GetObjectPool()->GetSlot(ref >> 8))
+			CPopulation::ConvertToDummyObject(GetObjectPool()->GetSlot(ref >> 8));
+		CObject* pObject = new(ref) CObject(mi, false);
+		pObject->GetMatrix() = pBufferObject->GetMatrix();
+#ifdef COMPATIBLE_SAVES
+		pObject->LoadEntityFlags(buf);
+#endif
+		pObject->m_fUprootLimit = pBufferObject->m_fUprootLimit;
+		pObject->m_objectMatrix = pBufferObject->m_objectMatrix;
+		pObject->ObjectCreatedBy = pBufferObject->ObjectCreatedBy;
+		pObject->bIsPickup = pBufferObject->bIsPickup;
+		pObject->bPickupObjWithMessage = pBufferObject->bPickupObjWithMessage;
+		pObject->bOutOfStock = pBufferObject->bOutOfStock;
+		pObject->bGlassCracked = pBufferObject->bGlassCracked;
+		pObject->bGlassBroken = pBufferObject->bGlassBroken;
+		pObject->bHasBeenDamaged = pBufferObject->bHasBeenDamaged;
+		pObject->bUseVehicleColours = pBufferObject->bUseVehicleColours;
+		pObject->m_fCollisionDamageMultiplier = pBufferObject->m_fCollisionDamageMultiplier;
+		pObject->m_nCollisionDamageEffect = pBufferObject->m_nCollisionDamageEffect;
+		pObject->m_nSpecialCollisionResponseCases = pBufferObject->m_nSpecialCollisionResponseCases;
+		pObject->m_nEndOfLifeTime = pBufferObject->m_nEndOfLifeTime;
+#ifndef COMPATIBLE_SAVES
+		(pObject->GetAddressOfEntityProperties())[0] = (pBufferObject->GetAddressOfEntityProperties())[0];
+		(pObject->GetAddressOfEntityProperties())[1] = (pBufferObject->GetAddressOfEntityProperties())[1];
+#endif
+		pObject->bHasCollided = false;
+		pObject->m_nCostValue = pBufferObject->m_nCostValue;
+		pObject->m_nBonusValue = pBufferObject->m_nBonusValue;
+		CWorld::Add(pObject);
+		delete[] obuf;
+	}
+VALIDATESAVEBUF(size)
+}
+
+void CPools::SavePedPool(uint8* buf, uint32* size)
+{
+INITSAVEBUF
+	int nNumPeds = 0;
+	int nPoolSize = GetPedPool()->GetSize();
+	for (int i = 0; i < nPoolSize; i++) {
+		CPed* pPed = GetPedPool()->GetSlot(i);
+		if (!pPed)
+			continue;
+#ifdef MISSION_REPLAY
+		if ((!pPed->bInVehicle || (pPed == CWorld::Players[CWorld::PlayerInFocus].m_pPed && IsQuickSave)) && pPed->m_nPedType == PEDTYPE_PLAYER1)
+#else
+		if (!pPed->bInVehicle && pPed->m_nPedType == PEDTYPE_PLAYER1)
+#endif
+			nNumPeds++;
+	}
+	*size = sizeof(int) + nNumPeds * (sizeof(uint32) + sizeof(int16) + sizeof(int) + CPlayerPed::nSaveStructSize +
+		sizeof(CWanted::MaximumWantedLevel) + sizeof(CWanted::nMaximumWantedLevel) + MAX_MODEL_NAME);
+	CopyToBuf(buf, nNumPeds);
+	for (int i = 0; i < nPoolSize; i++) {
+		CPed* pPed = GetPedPool()->GetSlot(i);
+		if (!pPed)
+			continue;
+#ifdef MISSION_REPLAY
+		if ((!pPed->bInVehicle || (pPed == CWorld::Players[CWorld::PlayerInFocus].m_pPed && IsQuickSave)) && pPed->m_nPedType == PEDTYPE_PLAYER1) {
+#else
+		if (!pPed->bInVehicle && pPed->m_nPedType == PEDTYPE_PLAYER1) {
+#endif
+			CopyToBuf(buf, pPed->m_nPedType);
+			CopyToBuf(buf, pPed->m_modelIndex);
+			int32 ref = GetPedRef(pPed);
+			CopyToBuf(buf, ref);
+#ifdef COMPATIBLE_SAVES
+			pPed->Save(buf);
+#else
+			memcpy(buf, pPed, sizeof(CPlayerPed));
+			SkipSaveBuf(buf, sizeof(CPlayerPed));
+#endif
+			CopyToBuf(buf, CWanted::MaximumWantedLevel);
+			CopyToBuf(buf, CWanted::nMaximumWantedLevel);
+			memcpy(buf, CModelInfo::GetModelInfo(pPed->GetModelIndex())->GetModelName(), MAX_MODEL_NAME);
+			SkipSaveBuf(buf, MAX_MODEL_NAME);
+		}
+	}
+VALIDATESAVEBUF(*size);
+#undef CopyToBuf
+}
+
+void CPools::LoadPedPool(uint8* buf, uint32 size)
+{
+INITSAVEBUF
+	int nPeds;
+	CopyFromBuf(buf, nPeds);
+	for (int i = 0; i < nPeds; i++) {
+		uint32 pedtype;
+		int16 model;
+		int ref;
+
+		CopyFromBuf(buf, pedtype);
+		CopyFromBuf(buf, model);
+		CopyFromBuf(buf, ref);
+#ifdef COMPATIBLE_SAVES
+		CPed* pPed;
+
+		char name[MAX_MODEL_NAME];
+		// Unfortunate hack: player model is stored after ped structure.
+		// It could be avoided by just using "player" because in practice it is always true.
+		memcpy(name, buf + CPlayerPed::nSaveStructSize + 2 * sizeof(int32), MAX_MODEL_NAME);
+		CStreaming::RequestSpecialModel(model, name, STREAMFLAGS_DONT_REMOVE);
+		CStreaming::LoadAllRequestedModels(false);
+
+		if (pedtype == PEDTYPE_PLAYER1)
+			pPed = new(ref) CPlayerPed();
+		else
+			assert(0);
+
+		pPed->Load(buf);
+		if (pedtype == PEDTYPE_PLAYER1) {
+			CopyFromBuf(buf, CWanted::MaximumWantedLevel);
+			CopyFromBuf(buf, CWanted::nMaximumWantedLevel);
+			SkipSaveBuf(buf, MAX_MODEL_NAME);
+		}
+
+		if (pedtype == PEDTYPE_PLAYER1) {
+			pPed->m_wepAccuracy = 100;
+			CWorld::Players[0].m_pPed = (CPlayerPed*)pPed;
+		}
+		CWorld::Add(pPed);
+#else
+		char* pbuf = new char[sizeof(CPlayerPed)];
+		CPlayerPed* pBufferPlayer = (CPlayerPed*)pbuf;
+		CPed* pPed;
+		char name[MAX_MODEL_NAME];
+		// the code implies that there was idea to load non-player ped
+		if (pedtype == PEDTYPE_PLAYER1) { // always true
+			memcpy(pbuf, buf, sizeof(CPlayerPed));
+			SkipSaveBuf(buf, sizeof(CPlayerPed));
+			CopyFromBuf(buf, CWanted::MaximumWantedLevel);
+			CopyFromBuf(buf, CWanted::nMaximumWantedLevel);
+			CopyFromBuf(buf, name);
+		}
+		CStreaming::RequestSpecialModel(model, name, STREAMFLAGS_DONT_REMOVE);
+		CStreaming::LoadAllRequestedModels(false);
+		if (pedtype == PEDTYPE_PLAYER1) {
+			CPlayerPed* pPlayerPed = new(ref) CPlayerPed();
+			for (int i = 0; i < ARRAY_SIZE(pPlayerPed->m_nTargettableObjects); i++)
+				pPlayerPed->m_nTargettableObjects[i] = pBufferPlayer->m_nTargettableObjects[i];
+			pPlayerPed->m_fMaxStamina = pBufferPlayer->m_fMaxStamina;
+			pPed = pPlayerPed;
+		}
+		pPed->SetPosition(pBufferPlayer->GetPosition());
+		pPed->m_fHealth = pBufferPlayer->m_fHealth;
+		pPed->m_fArmour = pBufferPlayer->m_fArmour;
+		pPed->CharCreatedBy = pBufferPlayer->CharCreatedBy;
+		pPed->m_currentWeapon = 0;
+		pPed->m_maxWeaponTypeAllowed = pBufferPlayer->m_maxWeaponTypeAllowed;
+		for (int i = 0; i < TOTAL_WEAPON_SLOTS; i++) {
+			if (pBufferPlayer->HasWeaponSlot(i)) {
+				int modelId = CWeaponInfo::GetWeaponInfo(pBufferPlayer->GetWeapon(i).m_eWeaponType)->m_nModelId;
+				if (modelId != -1) {
+					CStreaming::RequestModel(modelId, STREAMFLAGS_DEPENDENCY);
+					int modelId2 = CWeaponInfo::GetWeaponInfo(pBufferPlayer->GetWeapon(i).m_eWeaponType)->m_nModel2Id;
+					if (modelId2 != -1)
+						CStreaming::RequestModel(modelId2, STREAMFLAGS_DEPENDENCY);
+
+					CStreaming::LoadAllRequestedModels(false);
+				}
+				pPed->GiveWeapon(pBufferPlayer->GetWeapon(i).m_eWeaponType, pBufferPlayer->GetWeapon(i).m_nAmmoTotal, false);
+			}
+		}
+
+		if (pedtype == PEDTYPE_PLAYER1) {
+			pPed->m_wepAccuracy = 100;
+			CWorld::Players[0].m_pPed = (CPlayerPed*)pPed;
+		}
+		CWorld::Add(pPed);
+		delete[] pbuf;
+#endif
+	}
+VALIDATESAVEBUF(size)
+}
+
+#undef CopyFromBuf
+#undef CopyToBuf
\ No newline at end of file
diff --git a/src/core/Pools.h b/src/core/Pools.h
new file mode 100644
index 0000000..afef1b8
--- /dev/null
+++ b/src/core/Pools.h
@@ -0,0 +1,64 @@
+#pragma once
+
+#include "templates.h"
+#include "Lists.h"
+#include "Treadable.h"
+#include "Object.h"
+#include "CutsceneObject.h"
+#include "PlayerPed.h"
+#include "Automobile.h"
+#include "DummyPed.h"
+#include "AudioScriptObject.h"
+
+typedef CPool<CPtrNode> CCPtrNodePool;
+typedef CPool<CEntryInfoNode> CEntryInfoNodePool;
+typedef CPool<CPed,CPlayerPed> CPedPool;
+typedef CPool<CVehicle,CAutomobile> CVehiclePool;
+typedef CPool<CBuilding> CBuildingPool;
+typedef CPool<CTreadable> CTreadablePool;
+typedef CPool<CObject, CCutsceneObject> CObjectPool;
+typedef CPool<CDummy, CDummyPed> CDummyPool;
+typedef CPool<cAudioScriptObject> CAudioScriptObjectPool;
+typedef CPool<CColModel> CColModelPool;
+
+class CPools
+{
+	static CCPtrNodePool *ms_pPtrNodePool;
+	static CEntryInfoNodePool *ms_pEntryInfoNodePool;
+	static CPedPool *ms_pPedPool;
+	static CVehiclePool *ms_pVehiclePool;
+	static CBuildingPool *ms_pBuildingPool;
+	static CTreadablePool *ms_pTreadablePool;
+	static CObjectPool *ms_pObjectPool;
+	static CDummyPool *ms_pDummyPool;
+	static CAudioScriptObjectPool *ms_pAudioScriptObjectPool;
+	static CColModelPool *ms_pColModelPool;
+public:
+	static CCPtrNodePool *GetPtrNodePool(void) { return ms_pPtrNodePool; }
+	static CEntryInfoNodePool *GetEntryInfoNodePool(void) { return ms_pEntryInfoNodePool; }
+	static CPedPool *GetPedPool(void) { return ms_pPedPool; }
+	static CVehiclePool *GetVehiclePool(void) { return ms_pVehiclePool; }
+	static CBuildingPool *GetBuildingPool(void) { return ms_pBuildingPool; }
+	static CTreadablePool *GetTreadablePool(void) { return ms_pTreadablePool; }
+	static CObjectPool *GetObjectPool(void) { return ms_pObjectPool; }
+	static CDummyPool *GetDummyPool(void) { return ms_pDummyPool; }
+	static CAudioScriptObjectPool *GetAudioScriptObjectPool(void) { return ms_pAudioScriptObjectPool; }
+	static CColModelPool *GetColModelPool(void) { return ms_pColModelPool; }
+
+	static void Initialise(void);
+	static void ShutDown(void);
+	static int32 GetPedRef(CPed *ped);
+	static CPed *GetPed(int32 handle);
+	static int32 GetVehicleRef(CVehicle *vehicle);
+	static CVehicle *GetVehicle(int32 handle);
+	static int32 GetObjectRef(CObject *object);
+	static CObject *GetObject(int32 handle);
+	static void CheckPoolsEmpty();
+	static void MakeSureSlotInObjectPoolIsEmpty(int32 slot);
+	static void LoadObjectPool(uint8 *buf, uint32 size);
+	static void LoadPedPool(uint8 *buf, uint32 size);
+	static void LoadVehiclePool(uint8 *buf, uint32 size);
+	static void SaveObjectPool(uint8 *buf, uint32 *size);
+	static void SavePedPool(uint8 *buf, uint32 *size);
+	static void SaveVehiclePool(uint8 *buf, uint32 *size);
+};
diff --git a/src/core/Profile.cpp b/src/core/Profile.cpp
new file mode 100644
index 0000000..0aa18ab
--- /dev/null
+++ b/src/core/Profile.cpp
@@ -0,0 +1,71 @@
+#include "common.h"
+#include "Profile.h"
+
+#ifndef MASTER
+float CProfile::ms_afStartTime[NUM_PROFILES];
+float CProfile::ms_afCumulativeTime[NUM_PROFILES];
+float CProfile::ms_afEndTime[NUM_PROFILES];
+float CProfile::ms_afMaxEndTime[NUM_PROFILES];
+float CProfile::ms_afMaxCumulativeTime[NUM_PROFILES];
+Const char *CProfile::ms_pProfileString[NUM_PROFILES];
+RwRGBA CProfile::ms_aBarColours[NUM_PROFILES];
+
+void CProfile::Initialise()
+{
+	ms_afMaxEndTime[PROFILE_FRAME_RATE] = 0.0f;
+	ms_afMaxEndTime[PROFILE_PHYSICS] = 0.0f;
+	ms_afMaxEndTime[PROFILE_COLLISION] = 0.0f;
+	ms_afMaxEndTime[PROFILE_PED_AI] = 0.0f;
+	ms_afMaxEndTime[PROFILE_PROCESSING_TIME] = 0.0f;
+	ms_afMaxEndTime[PROFILE_RENDERING_TIME] = 0.0f;
+	ms_afMaxEndTime[PROFILE_TOTAL] = 0.0f;
+
+	ms_pProfileString[PROFILE_FRAME_RATE] = "Frame rate";
+	ms_pProfileString[PROFILE_PHYSICS] = "Physics";
+	ms_pProfileString[PROFILE_COLLISION] = "Collision";
+	ms_pProfileString[PROFILE_PED_AI] = "Ped AI";
+	ms_pProfileString[PROFILE_PROCESSING_TIME] = "Processing time";
+	ms_pProfileString[PROFILE_RENDERING_TIME] = "Rendering time";
+	ms_pProfileString[PROFILE_TOTAL] = "Total";
+
+	ms_afMaxCumulativeTime[PROFILE_FRAME_RATE] = 0.0f;
+	ms_afMaxCumulativeTime[PROFILE_PHYSICS] = 0.0f;
+	ms_afMaxCumulativeTime[PROFILE_COLLISION] = 0.0f;
+	ms_afMaxCumulativeTime[PROFILE_PED_AI] = 0.0f;
+	ms_afMaxCumulativeTime[PROFILE_PROCESSING_TIME] = 0.0f;
+	ms_afMaxCumulativeTime[PROFILE_RENDERING_TIME] = 0.0f;
+	ms_afMaxCumulativeTime[PROFILE_TOTAL] = 0.0f;
+
+	ms_aBarColours[PROFILE_PHYSICS] = { 0, 127, 255, 255 };
+	ms_aBarColours[PROFILE_COLLISION] = { 0, 255, 255, 255 };
+	ms_aBarColours[PROFILE_PED_AI] = { 255, 0, 0, 255 };
+	ms_aBarColours[PROFILE_PROCESSING_TIME] = { 0, 255, 0, 255 };
+	ms_aBarColours[PROFILE_RENDERING_TIME] = { 0, 0, 255, 255 };
+	ms_aBarColours[PROFILE_TOTAL] = { 255, 255, 255, 255 };
+}
+
+void CProfile::SuspendProfile(eProfile profile)
+{
+	ms_afEndTime[profile] = -ms_afStartTime[profile];
+	ms_afCumulativeTime[profile] -= ms_afStartTime[profile];
+}
+
+void CProfile::ShowResults()
+{
+	ms_afMaxEndTime[PROFILE_FRAME_RATE] = Max(ms_afMaxEndTime[PROFILE_FRAME_RATE], ms_afEndTime[PROFILE_FRAME_RATE]);
+	ms_afMaxEndTime[PROFILE_PHYSICS] = Max(ms_afMaxEndTime[PROFILE_PHYSICS], ms_afEndTime[PROFILE_PHYSICS]);
+	ms_afMaxEndTime[PROFILE_COLLISION] = Max(ms_afMaxEndTime[PROFILE_COLLISION], ms_afEndTime[PROFILE_COLLISION]);
+	ms_afMaxEndTime[PROFILE_PED_AI] = Max(ms_afMaxEndTime[PROFILE_PED_AI], ms_afEndTime[PROFILE_PED_AI]);
+	ms_afMaxEndTime[PROFILE_PROCESSING_TIME] = Max(ms_afMaxEndTime[PROFILE_PROCESSING_TIME], ms_afEndTime[PROFILE_PROCESSING_TIME]);
+	ms_afMaxEndTime[PROFILE_RENDERING_TIME] = Max(ms_afMaxEndTime[PROFILE_RENDERING_TIME], ms_afEndTime[PROFILE_RENDERING_TIME]);
+	ms_afMaxEndTime[PROFILE_TOTAL] = Max(ms_afMaxEndTime[PROFILE_TOTAL], ms_afEndTime[PROFILE_TOTAL]);
+
+	ms_afMaxCumulativeTime[PROFILE_FRAME_RATE] = Max(ms_afMaxCumulativeTime[PROFILE_FRAME_RATE], ms_afCumulativeTime[PROFILE_FRAME_RATE]);
+	ms_afMaxCumulativeTime[PROFILE_PHYSICS] = Max(ms_afMaxCumulativeTime[PROFILE_PHYSICS], ms_afCumulativeTime[PROFILE_PHYSICS]);
+	ms_afMaxCumulativeTime[PROFILE_COLLISION] = Max(ms_afMaxCumulativeTime[PROFILE_COLLISION], ms_afCumulativeTime[PROFILE_COLLISION]);
+	ms_afMaxCumulativeTime[PROFILE_PED_AI] = Max(ms_afMaxCumulativeTime[PROFILE_PED_AI], ms_afCumulativeTime[PROFILE_PED_AI]);
+	ms_afMaxCumulativeTime[PROFILE_PROCESSING_TIME] = Max(ms_afMaxCumulativeTime[PROFILE_PROCESSING_TIME], ms_afCumulativeTime[PROFILE_PROCESSING_TIME]);
+	ms_afMaxCumulativeTime[PROFILE_RENDERING_TIME] = Max(ms_afMaxCumulativeTime[PROFILE_RENDERING_TIME], ms_afCumulativeTime[PROFILE_RENDERING_TIME]);
+	ms_afMaxCumulativeTime[PROFILE_TOTAL] = Max(ms_afMaxCumulativeTime[PROFILE_TOTAL], ms_afCumulativeTime[PROFILE_TOTAL]);
+}
+#endif
diff --git a/src/core/Profile.h b/src/core/Profile.h
new file mode 100644
index 0000000..4fe693a
--- /dev/null
+++ b/src/core/Profile.h
@@ -0,0 +1,28 @@
+#pragma once
+
+enum eProfile
+{
+	PROFILE_FRAME_RATE,
+	PROFILE_PHYSICS,
+	PROFILE_COLLISION,
+	PROFILE_PED_AI,
+	PROFILE_PROCESSING_TIME,
+	PROFILE_RENDERING_TIME,
+	PROFILE_TOTAL,
+	NUM_PROFILES,
+};
+
+class CProfile
+{
+	static float ms_afStartTime[NUM_PROFILES];
+	static float ms_afCumulativeTime[NUM_PROFILES];
+	static float ms_afEndTime[NUM_PROFILES];
+	static float ms_afMaxEndTime[NUM_PROFILES];
+	static float ms_afMaxCumulativeTime[NUM_PROFILES];
+	static Const char *ms_pProfileString[NUM_PROFILES];
+	static RwRGBA ms_aBarColours[NUM_PROFILES];
+public:
+	static void Initialise();
+	static void SuspendProfile(eProfile profile);
+	static void ShowResults();
+};
diff --git a/src/core/Radar.cpp b/src/core/Radar.cpp
new file mode 100644
index 0000000..4bb9c96
--- /dev/null
+++ b/src/core/Radar.cpp
@@ -0,0 +1,1700 @@
+#if (!defined(GTA_PS2_STUFF) && defined(RWLIBS)) || defined(__MWERKS__)
+#define WITHD3D
+#endif
+#include "config.h"
+#include "common.h"
+
+#include "RwHelper.h"
+#include "Radar.h"
+#include "Camera.h"
+#include "Hud.h"
+#include "World.h"
+#include "Frontend.h"
+#include "General.h"
+#include "Vehicle.h"
+#include "Pools.h"
+#include "Script.h"
+#include "TxdStore.h"
+#include "World.h"
+#include "Streaming.h"
+#include "SpecialFX.h"
+#include "Font.h"
+
+float CRadar::m_radarRange;
+sRadarTrace CRadar::ms_RadarTrace[NUMRADARBLIPS];
+CVector2D vec2DRadarOrigin;
+int32 gRadarTxdIds[64];
+
+CSprite2d CRadar::CentreSprite;
+CSprite2d CRadar::MapHereSprite;
+CSprite2d CRadar::NorthSprite;
+CSprite2d CRadar::AverySprite;
+CSprite2d CRadar::BikerSprite;
+CSprite2d CRadar::CortezSprite;
+CSprite2d CRadar::DiazSprite;
+CSprite2d CRadar::KentSprite;
+CSprite2d CRadar::LawyerSprite;
+CSprite2d CRadar::PhilSprite;
+CSprite2d CRadar::BikersSprite;
+CSprite2d CRadar::BoatyardSprite;
+CSprite2d CRadar::MalibuClubSprite;
+CSprite2d CRadar::CubansSprite;
+CSprite2d CRadar::FilmSprite;
+CSprite2d CRadar::GunSprite;
+CSprite2d CRadar::HaitiansSprite;
+CSprite2d CRadar::HardwareSprite;
+CSprite2d CRadar::SaveHouseSprite;
+CSprite2d CRadar::StripSprite;
+CSprite2d CRadar::IceSprite;
+CSprite2d CRadar::KCabsSprite;
+CSprite2d CRadar::LovefistSprite;
+CSprite2d CRadar::PrintworksSprite;
+CSprite2d CRadar::PropertySprite;
+CSprite2d CRadar::SunYardSprite;
+CSprite2d CRadar::SpraySprite;
+CSprite2d CRadar::TShirtSprite;
+CSprite2d CRadar::TommySprite;
+CSprite2d CRadar::PhoneSprite;
+CSprite2d CRadar::RadioWildstyleSprite;
+CSprite2d CRadar::RadioFlashSprite;
+CSprite2d CRadar::RadioKChatSprite;
+CSprite2d CRadar::RadioFeverSprite;
+CSprite2d CRadar::RadioVRockSprite;
+CSprite2d CRadar::RadioVCPRSprite;
+CSprite2d CRadar::RadioEspantosoSprite;
+CSprite2d CRadar::RadioEmotionSprite;
+CSprite2d CRadar::RadioWaveSprite;
+
+CSprite2d *CRadar::RadarSprites[RADAR_SPRITE_COUNT] = { 
+	nil,
+	&CentreSprite,
+	&MapHereSprite,
+	&NorthSprite,
+	&AverySprite,
+	&BikerSprite,
+	&CortezSprite,
+	&DiazSprite,
+	&KentSprite,
+	&LawyerSprite,
+	&PhilSprite,
+	&BikersSprite,
+	&BoatyardSprite,
+	&MalibuClubSprite,
+	&CubansSprite,
+	&FilmSprite,
+	&GunSprite,
+	&HaitiansSprite,
+	&HardwareSprite,
+	&SaveHouseSprite,
+	&StripSprite,
+	&IceSprite,
+	&KCabsSprite,
+	&LovefistSprite,
+	&PrintworksSprite,
+	&PropertySprite,
+	&SunYardSprite,
+	&SpraySprite,
+	&TShirtSprite,
+	&TommySprite,
+	&PhoneSprite,
+	&RadioWildstyleSprite,
+	&RadioFlashSprite,
+	&RadioKChatSprite,
+	&RadioFeverSprite,
+	&RadioVRockSprite,
+	&RadioVCPRSprite,
+	&RadioEspantosoSprite,
+	&RadioEmotionSprite,
+	&RadioWaveSprite
+};
+
+// Why this doesn't coincide with world coordinates i don't know
+#define RADAR_MIN_X (-2000.0f)
+#define RADAR_MIN_Y (-2000.0f)
+#define RADAR_MAX_X (2000.0f)
+#define RADAR_MAX_Y (2000.0f)
+#define RADAR_SIZE_X (RADAR_MAX_X - RADAR_MIN_X)
+#define RADAR_SIZE_Y (RADAR_MAX_Y - RADAR_MIN_Y)
+
+#define RADAR_NUM_TILES (8)
+#define RADAR_TILE_SIZE (RADAR_SIZE_X / RADAR_NUM_TILES)
+static_assert(RADAR_TILE_SIZE == (RADAR_SIZE_Y / RADAR_NUM_TILES), "CRadar: not a square");
+
+#define RADAR_MIN_RANGE (120.0f)
+#define RADAR_MAX_RANGE (350.0f)
+#define RADAR_MIN_SPEED (0.3f)
+#define RADAR_MAX_SPEED (0.9f)
+
+CRGBA CRadar::ArrowBlipColour1;
+CRGBA CRadar::ArrowBlipColour2;
+int16 CRadar::MapLegendCounter;
+int16 CRadar::MapLegendList[NUM_MAP_LEGENDS];
+#ifdef MAP_ENHANCEMENTS
+int CRadar::TargetMarkerId = -1;
+CVector CRadar::TargetMarkerPos;
+#endif
+
+float CRadar::cachedCos;
+float CRadar::cachedSin;
+
+void ClipRadarTileCoords(int32 &x, int32 &y)
+{
+	if (x < 0)
+		x = 0;
+	if (x > RADAR_NUM_TILES-1)
+		x = RADAR_NUM_TILES-1;
+	if (y < 0)
+		y = 0;
+	if (y > RADAR_NUM_TILES-1)
+		y = RADAR_NUM_TILES-1;
+}
+
+void RequestMapSection(int32 x, int32 y)
+{
+	ClipRadarTileCoords(x, y);
+	CStreaming::RequestTxd(gRadarTxdIds[x + RADAR_NUM_TILES * y], STREAMFLAGS_DONT_REMOVE | STREAMFLAGS_DEPENDENCY);
+}
+
+void RemoveMapSection(int32 x, int32 y)
+{
+	if (x >= 0 && x <= RADAR_NUM_TILES - 1 && y >= 0 && y <= RADAR_NUM_TILES - 1)
+		CStreaming::RemoveTxd(gRadarTxdIds[x + RADAR_NUM_TILES * y]);
+}
+
+// Transform from section indices to world coordinates
+void GetTextureCorners(int32 x, int32 y, CVector2D *out)
+{
+	x =   x - RADAR_NUM_TILES/2;
+	y = -(y - RADAR_NUM_TILES/2);
+
+	// bottom left
+	out[0].x = RADAR_TILE_SIZE * (x);
+	out[0].y = RADAR_TILE_SIZE * (y - 1);
+
+	// bottom right
+	out[1].x = RADAR_TILE_SIZE * (x + 1);
+	out[1].y = RADAR_TILE_SIZE * (y - 1);
+
+	// top right
+	out[2].x = RADAR_TILE_SIZE * (x + 1);
+	out[2].y = RADAR_TILE_SIZE * (y);
+
+	// top left
+	out[3].x = RADAR_TILE_SIZE * (x);
+	out[3].y = RADAR_TILE_SIZE * (y);
+}
+
+
+bool 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;
+}
+
+// clip line p1,p2 against (-1.0, 1.0) in x and y, set out to clipped point closest to p1
+int LineRadarBoxCollision(CVector2D &out, const CVector2D &p1, const CVector2D &p2)
+{
+	float d1, d2;
+	float t;
+	float x, y;
+	float shortest = 1.0f;
+	int edge = -1;
+
+	// clip against left edge, x = -1.0
+	d1 = -1.0f - p1.x;
+	d2 = -1.0f - p2.x;
+	if (d1 * d2 < 0.0f) {
+		// they are on opposite sides, get point of intersection
+		t = d1 / (d1 - d2);
+		y = (p2.y - p1.y)*t + p1.y;
+		if (y >= -1.0f && y <= 1.0f && t <= shortest) {
+			out.x = -1.0f;
+			out.y = y;
+			edge = 3;
+			shortest = t;
+		}
+	}
+
+	// clip against right edge, x = 1.0
+	d1 = p1.x - 1.0f;
+	d2 = p2.x - 1.0f;
+	if (d1 * d2 < 0.0f) {
+		// they are on opposite sides, get point of intersection
+		t = d1 / (d1 - d2);
+		y = (p2.y - p1.y)*t + p1.y;
+		if (y >= -1.0f && y <= 1.0f && t <= shortest) {
+			out.x = 1.0f;
+			out.y = y;
+			edge = 1;
+			shortest = t;
+		}
+	}
+
+	// clip against top edge, y = -1.0
+	d1 = -1.0f - p1.y;
+	d2 = -1.0f - p2.y;
+	if (d1 * d2 < 0.0f) {
+		// they are on opposite sides, get point of intersection
+		t = d1 / (d1 - d2);
+		x = (p2.x - p1.x)*t + p1.x;
+		if (x >= -1.0f && x <= 1.0f && t <= shortest) {
+			out.y = -1.0f;
+			out.x = x;
+			edge = 0;
+			shortest = t;
+		}
+	}
+
+	// clip against bottom edge, y = 1.0
+	d1 = p1.y - 1.0f;
+	d2 = p2.y - 1.0f;
+	if (d1 * d2 < 0.0f) {
+		// they are on opposite sides, get point of intersection
+		t = d1 / (d1 - d2);
+		x = (p2.x - p1.x)*t + p1.x;
+		if (x >= -1.0f && x <= 1.0f && t <= shortest) {
+			out.y = 1.0f;
+			out.x = x;
+			edge = 2;
+			shortest = t;
+		}
+	}
+
+	return edge;
+}
+
+uint8 CRadar::CalculateBlipAlpha(float dist)
+{
+	if (FrontEndMenuManager.m_bMenuMapActive)
+		return 255;
+
+	if (dist <= 1.0f)
+		return 255;
+
+	if (dist <= 10.0f)
+		return (128.0f * ((dist - 1.0f) / 9.0f)) + ((1.0f - (dist - 1.0f) / 9.0f) * 255.0f);
+
+	return 128;
+}
+
+void CRadar::ChangeBlipBrightness(int32 i, int32 bright)
+{
+	int index = GetActualBlipArrayIndex(i);
+	if (index != -1)
+		ms_RadarTrace[index].m_bDim = bright != 1;
+}
+
+void CRadar::ChangeBlipColour(int32 i, int32 color)
+{
+	int index = GetActualBlipArrayIndex(i);
+	if (index != -1)
+		ms_RadarTrace[index].m_nColor = color;
+}
+
+void CRadar::ChangeBlipDisplay(int32 i, eBlipDisplay display)
+{
+	int index = GetActualBlipArrayIndex(i);
+	if (index != -1)
+		ms_RadarTrace[index].m_eBlipDisplay = display;
+}
+
+void CRadar::ChangeBlipScale(int32 i, int32 scale)
+{
+	int index = GetActualBlipArrayIndex(i);
+	if (index != -1)
+		ms_RadarTrace[index].m_wScale = scale;
+}
+
+void CRadar::ClearBlip(int32 i)
+{
+	int index = GetActualBlipArrayIndex(i);
+	if (index != -1) {
+		SetRadarMarkerState(index, false);
+		ms_RadarTrace[index].m_bInUse = false;
+		ms_RadarTrace[index].m_eBlipType = BLIP_NONE;
+		ms_RadarTrace[index].m_eBlipDisplay = BLIP_DISPLAY_NEITHER;
+		ms_RadarTrace[index].m_eRadarSprite = RADAR_SPRITE_NONE;
+	}
+}
+
+void CRadar::ClearBlipForEntity(eBlipType type, int32 id)
+{
+	for (int i = 0; i < NUMRADARBLIPS; i++) {
+		if (type == ms_RadarTrace[i].m_eBlipType && id == ms_RadarTrace[i].m_nEntityHandle) {
+			SetRadarMarkerState(i, false);
+			ms_RadarTrace[i].m_bInUse = false;
+			ms_RadarTrace[i].m_eBlipType = BLIP_NONE;
+			ms_RadarTrace[i].m_eBlipDisplay = BLIP_DISPLAY_NEITHER;
+			ms_RadarTrace[i].m_eRadarSprite = RADAR_SPRITE_NONE;
+		}
+	};
+}
+
+// Why not a proper clipping algorithm?
+int CRadar::ClipRadarPoly(CVector2D *poly, const CVector2D *rect)
+{
+	CVector2D corners[4] = {
+		CVector2D(  1.0f, -1.0f ),	// top right
+		CVector2D(  1.0f,  1.0f ),	// bottom right
+		CVector2D( -1.0f,  1.0f ),	// bottom left
+		CVector2D( -1.0f, -1.0f ),	// top left
+	};
+	CVector2D tmp;
+	int i, j, n;
+	int laste, e, e1, e2;;
+	bool inside[4];
+
+	for (i = 0; i < 4; i++)
+		inside[i] = IsPointInsideRadar(rect[i]);
+
+	laste = -1;
+	n = 0;
+	for (i = 0; i < 4; i++)
+		if (inside[i]) {
+			// point is inside, just add
+			poly[n++] = rect[i];
+		}
+		else {
+			// point is outside but line to this point might be clipped
+			e1 = LineRadarBoxCollision(poly[n], rect[i], rect[(i + 4 - 1) % 4]);
+			if (e1 != -1) {
+				laste = e1;
+				n++;
+			}
+			// and line from this point might be clipped as well
+			e2 = LineRadarBoxCollision(poly[n], rect[i], rect[(i + 1) % 4]);
+			if (e2 != -1) {
+				if (e1 == -1) {
+					// if other line wasn't clipped, i.e. it was complete outside,
+					// we may have to insert another vertex if last clipped line
+					// was on a different edge
+
+					// find the last intersection if we haven't seen it yet
+					if (laste == -1)
+						for (j = 3; j >= i; j--) {
+							// game uses an if here for j == 0
+							e = LineRadarBoxCollision(tmp, rect[j], rect[(j + 4 - 1) % 4]);
+							if (e != -1) {
+								laste = e;
+								break;
+							}
+						}
+					assert(laste != -1);
+
+					// insert corners that were skipped
+					tmp = poly[n];
+					for (e = laste; e != e2; e = (e + 1) % 4)
+						poly[n++] = corners[e];
+					poly[n] = tmp;
+				}
+				n++;
+			}
+		}
+
+	if (n == 0) {
+		// If no points, either the rectangle is completely outside or completely surrounds the radar
+		// no idea what's going on here...
+		float m = (rect[0].y - rect[1].y) / (rect[0].x - rect[1].x);
+		if ((m*rect[3].x - rect[3].y) * (m*rect[0].x - rect[0].y) < 0.0f) {
+			m = (rect[0].y - rect[3].y) / (rect[0].x - rect[3].x);
+			if ((m*rect[1].x - rect[1].y) * (m*rect[0].x - rect[0].y) < 0.0f) {
+				poly[0] = corners[0];
+				poly[1] = corners[1];
+				poly[2] = corners[2];
+				poly[3] = corners[3];
+				n = 4;
+			}
+		}
+	}
+
+	return n;
+}
+
+bool CRadar::DisplayThisBlip(int32 counter)
+{
+	switch (ms_RadarTrace[counter].m_eRadarSprite) {
+	case RADAR_SPRITE_SPRAY:
+	case RADAR_SPRITE_GUN:
+		return true;
+	default:
+		return false;
+	}
+}
+
+void CRadar::Draw3dMarkers()
+{
+	for (int i = 0; i < NUMRADARBLIPS; i++) {
+		if (ms_RadarTrace[i].m_bInUse) {
+			switch (ms_RadarTrace[i].m_eBlipType) {
+			case BLIP_CAR:
+			{
+				CEntity *entity = CPools::GetVehiclePool()->GetAt(ms_RadarTrace[i].m_nEntityHandle);
+				if (ms_RadarTrace[i].m_eBlipDisplay == BLIP_DISPLAY_BOTH || ms_RadarTrace[i].m_eBlipDisplay == BLIP_DISPLAY_MARKER_ONLY) {
+					CVector pos = entity->GetPosition();
+					pos.z += 1.2f * CModelInfo::GetModelInfo(entity->GetModelIndex())->GetColModel()->boundingBox.max.z + 2.5f;
+					C3dMarkers::PlaceMarker(i | (ms_RadarTrace[i].m_BlipIndex << 16), 1, pos, 2.5f, CARBLIP_MARKER_COLOR_R, CARBLIP_MARKER_COLOR_G, CARBLIP_MARKER_COLOR_B, CARBLIP_MARKER_COLOR_A, 1024, 0.2f, 5);
+				}
+				break;
+			}
+			case BLIP_CHAR:
+			{
+				CEntity *entity = CPools::GetPedPool()->GetAt(ms_RadarTrace[i].m_nEntityHandle);
+				if (entity != nil) {
+					if (((CPed*)entity)->InVehicle())
+						entity = ((CPed * )entity)->m_pMyVehicle;
+				}
+				if (ms_RadarTrace[i].m_eBlipDisplay == BLIP_DISPLAY_BOTH || ms_RadarTrace[i].m_eBlipDisplay == BLIP_DISPLAY_MARKER_ONLY) {
+					CVector pos = entity->GetPosition();
+					pos.z += 3.0f;
+					C3dMarkers::PlaceMarker(i | (ms_RadarTrace[i].m_BlipIndex << 16), 1, pos, 1.5f, CHARBLIP_MARKER_COLOR_R, CHARBLIP_MARKER_COLOR_G, CHARBLIP_MARKER_COLOR_B, CHARBLIP_MARKER_COLOR_A, 1024, 0.2f, 5);
+				}
+				break;
+			}
+			case BLIP_OBJECT:
+			{
+				CEntity *entity = CPools::GetObjectPool()->GetAt(ms_RadarTrace[i].m_nEntityHandle);
+				if (ms_RadarTrace[i].m_eBlipDisplay == BLIP_DISPLAY_BOTH || ms_RadarTrace[i].m_eBlipDisplay == BLIP_DISPLAY_MARKER_ONLY) {
+					CVector pos = entity->GetPosition();
+					pos.z += CModelInfo::GetModelInfo(entity->GetModelIndex())->GetColModel()->boundingBox.max.z + 1.0f + 1.0f;
+					C3dMarkers::PlaceMarker(i | (ms_RadarTrace[i].m_BlipIndex << 16), 1, pos, 1.0f, OBJECTBLIP_MARKER_COLOR_R, OBJECTBLIP_MARKER_COLOR_G, OBJECTBLIP_MARKER_COLOR_B, OBJECTBLIP_MARKER_COLOR_A, 1024, 0.2f, 5);
+				}
+				break;
+			}
+			case BLIP_COORD:
+				break;
+			case BLIP_CONTACT_POINT:
+				if (!CTheScripts::IsPlayerOnAMission()) {
+					if (ms_RadarTrace[i].m_eBlipDisplay == BLIP_DISPLAY_BOTH || ms_RadarTrace[i].m_eBlipDisplay == BLIP_DISPLAY_MARKER_ONLY)
+						C3dMarkers::PlaceMarkerSet(i | (ms_RadarTrace[i].m_BlipIndex << 16), 4, ms_RadarTrace[i].m_vecPos, 2.0f, COORDBLIP_MARKER_COLOR_R, COORDBLIP_MARKER_COLOR_G, COORDBLIP_MARKER_COLOR_B, COORDBLIP_MARKER_COLOR_A, 2048, 0.2f, 0);
+				}
+				break;
+			}
+		}
+	}
+}
+
+void CRadar::DrawBlips()
+{
+	if (!TheCamera.m_WideScreenOn && CHud::m_Wants_To_Draw_Hud) {
+#ifdef SECUROM
+		extern uint8 roadBlocksPirateCheck;
+		if (roadBlocksPirateCheck == 2) return;
+#endif
+		RwRenderStateSet(rwRENDERSTATEZWRITEENABLE, (void*)FALSE);
+		RwRenderStateSet(rwRENDERSTATEZTESTENABLE, (void*)FALSE);
+		RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void*)TRUE);
+		RwRenderStateSet(rwRENDERSTATESRCBLEND, (void*)rwBLENDSRCALPHA);
+		RwRenderStateSet(rwRENDERSTATEDESTBLEND, (void*)rwBLENDINVSRCALPHA);
+		RwRenderStateSet(rwRENDERSTATEFOGENABLE, (void*)FALSE);
+
+		CVector2D out;
+		CVector2D in = CVector2D(0.0f, 0.0f);
+		TransformRadarPointToScreenSpace(out, in);
+
+		if (!FrontEndMenuManager.m_bMenuMapActive) {
+			float angle;
+			if (TheCamera.Cams[TheCamera.ActiveCam].Mode == CCam::MODE_TOPDOWN)
+				angle = PI + FindPlayerHeading();
+#ifdef FIX_BUGS
+			else if (TheCamera.GetLookDirection() != LOOKING_FORWARD)
+				angle = FindPlayerHeading() - (PI + (TheCamera.Cams[TheCamera.ActiveCam].CamTargetEntity->GetPosition() - TheCamera.Cams[TheCamera.ActiveCam].SourceBeforeLookBehind).Heading());
+#endif
+			else
+				angle = FindPlayerHeading() - (PI + TheCamera.GetForward().Heading());
+
+			DrawRotatingRadarSprite(&CentreSprite, out.x, out.y, angle, 255);
+
+			CVector2D vec2d;
+			vec2d.x = vec2DRadarOrigin.x;
+			vec2d.y = M_SQRT2 * m_radarRange + vec2DRadarOrigin.y;
+			TransformRealWorldPointToRadarSpace(in, vec2d);
+			LimitRadarPoint(in);
+			TransformRadarPointToScreenSpace(out, in);
+			DrawRadarSprite(RADAR_SPRITE_NORTH, out.x, out.y, 255);
+		}
+
+		for(int blipId = 0; blipId < NUMRADARBLIPS; blipId++) {
+			if (!ms_RadarTrace[blipId].m_bInUse)
+				continue;
+
+			switch (ms_RadarTrace[blipId].m_eBlipType) {
+				case BLIP_CAR:
+				case BLIP_CHAR:
+				case BLIP_OBJECT:
+					if (ms_RadarTrace[blipId].m_eRadarSprite == RADAR_SPRITE_PROPERTY
+						&& (!CTheScripts::bPlayerIsInTheStatium || !FrontEndMenuManager.m_bMenuMapActive))
+						DrawEntityBlip(blipId);
+
+					break;
+				case BLIP_COORD:
+				case BLIP_CONTACT_POINT:
+					if (ms_RadarTrace[blipId].m_eRadarSprite == RADAR_SPRITE_PHONE
+						&& (!CTheScripts::bPlayerIsInTheStatium || !FrontEndMenuManager.m_bMenuMapActive))
+						DrawCoordBlip(blipId);
+					
+					break;
+				default:
+					break;
+			}
+		}
+
+		// New in VC: Always draw Hardware/gun/pay'n spray/save blips
+		for(int blipId = 0; blipId < NUMRADARBLIPS; blipId++) {
+			if (!ms_RadarTrace[blipId].m_bInUse)
+				continue;
+
+			if (ms_RadarTrace[blipId].m_eRadarSprite != RADAR_SPRITE_SAVE && ms_RadarTrace[blipId].m_eRadarSprite != RADAR_SPRITE_HARDWARE
+					&& ms_RadarTrace[blipId].m_eRadarSprite != RADAR_SPRITE_SPRAY && ms_RadarTrace[blipId].m_eRadarSprite != RADAR_SPRITE_GUN)
+				continue;
+
+			switch (ms_RadarTrace[blipId].m_eBlipType) {
+				case BLIP_CAR:
+				case BLIP_CHAR:
+				case BLIP_OBJECT:
+					if (!CTheScripts::bPlayerIsInTheStatium || !FrontEndMenuManager.m_bMenuMapActive)
+						DrawEntityBlip(blipId);
+
+					break;
+				case BLIP_COORD:
+				case BLIP_CONTACT_POINT:
+					if (!CTheScripts::bPlayerIsInTheStatium || !FrontEndMenuManager.m_bMenuMapActive)
+						DrawCoordBlip(blipId);
+					
+					break;
+				default:
+					break;
+			}
+		}
+
+		for(int blipId = 0; blipId < NUMRADARBLIPS; blipId++) {
+			if (!ms_RadarTrace[blipId].m_bInUse)
+				continue;
+
+			switch (ms_RadarTrace[blipId].m_eBlipType) {
+				case BLIP_CAR:
+				case BLIP_CHAR:
+				case BLIP_OBJECT:
+					if (ms_RadarTrace[blipId].m_eRadarSprite != RADAR_SPRITE_SAVE && ms_RadarTrace[blipId].m_eRadarSprite != RADAR_SPRITE_HARDWARE
+						&& ms_RadarTrace[blipId].m_eRadarSprite != RADAR_SPRITE_SPRAY && ms_RadarTrace[blipId].m_eRadarSprite != RADAR_SPRITE_PROPERTY
+						&& ms_RadarTrace[blipId].m_eRadarSprite != RADAR_SPRITE_GUN
+						&& (!CTheScripts::bPlayerIsInTheStatium || !FrontEndMenuManager.m_bMenuMapActive))
+
+						DrawEntityBlip(blipId);
+					break;
+				default:
+					break;
+			}
+		}
+		for (int blipId = 0; blipId < NUMRADARBLIPS; blipId++) {
+			if (!ms_RadarTrace[blipId].m_bInUse)
+				continue;
+
+			switch (ms_RadarTrace[blipId].m_eBlipType) {
+				case BLIP_COORD:
+				case BLIP_CONTACT_POINT:
+					if (ms_RadarTrace[blipId].m_eRadarSprite != RADAR_SPRITE_SAVE && ms_RadarTrace[blipId].m_eRadarSprite != RADAR_SPRITE_HARDWARE
+						&& ms_RadarTrace[blipId].m_eRadarSprite != RADAR_SPRITE_SPRAY && ms_RadarTrace[blipId].m_eRadarSprite != RADAR_SPRITE_PROPERTY
+						&& ms_RadarTrace[blipId].m_eRadarSprite != RADAR_SPRITE_GUN && ms_RadarTrace[blipId].m_eRadarSprite != RADAR_SPRITE_PHONE
+						&& (!CTheScripts::bPlayerIsInTheStatium || !FrontEndMenuManager.m_bMenuMapActive))
+
+						DrawCoordBlip(blipId);
+					break;
+				default:
+					break;
+			}
+		}
+		if (FrontEndMenuManager.m_bMenuMapActive) {
+			CVector2D in, out;
+			if (!CTheScripts::bPlayerIsInTheStatium)
+				TransformRealWorldPointToRadarSpace(in, FindPlayerCentreOfWorld_NoSniperShift());
+			else
+				TransformRealWorldPointToRadarSpace(in, CVector2D(-1302.5f, 1332.8f));
+
+			LimitRadarPoint(in);
+			TransformRadarPointToScreenSpace(out, in);
+			DrawYouAreHereSprite(out.x, out.y);
+		}
+	}
+}
+
+void CRadar::DrawMap()
+{
+	if (!TheCamera.m_WideScreenOn && CHud::m_Wants_To_Draw_Hud) {
+		CalculateCachedSinCos();
+		if (FindPlayerVehicle()) {
+			float speed = FindPlayerSpeed().Magnitude();
+			if (speed < RADAR_MIN_SPEED)
+				m_radarRange = RADAR_MIN_RANGE;
+			else if (speed < RADAR_MAX_SPEED)
+				m_radarRange = (speed - RADAR_MIN_SPEED)/(RADAR_MAX_SPEED-RADAR_MIN_SPEED) * (RADAR_MAX_RANGE-RADAR_MIN_RANGE) + RADAR_MIN_RANGE;
+			else
+				m_radarRange = RADAR_MAX_RANGE;
+		}
+		else
+			m_radarRange = RADAR_MIN_RANGE;
+
+		vec2DRadarOrigin = CVector2D(FindPlayerCentreOfWorld_NoSniperShift());
+		if (FrontEndMenuManager.m_PrefsRadarMode != 1)
+			DrawRadarMap();
+	}
+}
+
+void CRadar::DrawRadarMap()
+{
+	DrawRadarMask();
+
+	// top left ist (0, 0)
+	int x = Floor((vec2DRadarOrigin.x - RADAR_MIN_X) / RADAR_TILE_SIZE);
+	int y = Ceil((RADAR_NUM_TILES - 1) - (vec2DRadarOrigin.y - RADAR_MIN_Y) / RADAR_TILE_SIZE);
+	StreamRadarSections(x, y);
+
+	RwRenderStateSet(rwRENDERSTATEFOGENABLE, (void*)FALSE);
+	RwRenderStateSet(rwRENDERSTATESRCBLEND, (void*)rwBLENDSRCALPHA);
+	RwRenderStateSet(rwRENDERSTATEDESTBLEND, (void*)rwBLENDINVSRCALPHA);
+	RwRenderStateSet(rwRENDERSTATETEXTUREFILTER, (void*)rwFILTERLINEAR);
+	RwRenderStateSet(rwRENDERSTATESHADEMODE, (void*)rwSHADEMODEFLAT);
+	RwRenderStateSet(rwRENDERSTATEZTESTENABLE, (void*)TRUE);
+	RwRenderStateSet(rwRENDERSTATEZWRITEENABLE, (void*)FALSE);
+	RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void*)FALSE);
+	RwRenderStateSet(rwRENDERSTATETEXTUREADDRESS, (void*)rwTEXTUREADDRESSCLAMP);
+	RwRenderStateSet(rwRENDERSTATETEXTUREPERSPECTIVE, (void*)FALSE);
+
+	DrawRadarSection(x - 1, y - 1);
+	DrawRadarSection(x, y - 1);
+	DrawRadarSection(x + 1, y - 1);
+	DrawRadarSection(x - 1, y);
+	DrawRadarSection(x, y);
+	DrawRadarSection(x + 1, y);
+	DrawRadarSection(x - 1, y + 1);
+	DrawRadarSection(x, y + 1);
+	DrawRadarSection(x + 1, y + 1);
+}
+
+void CRadar::DrawRadarMask() 
+{ 
+	CVector2D corners[4] = {
+		CVector2D(1.0f, -1.0f),
+		CVector2D(1.0f, 1.0f),
+		CVector2D(-1.0f, 1.0f),
+		CVector2D(-1.0, -1.0f)
+	};
+
+	RwRenderStateSet(rwRENDERSTATETEXTURERASTER, (void*)nil);
+	RwRenderStateSet(rwRENDERSTATEFOGENABLE, (void*)FALSE);
+	RwRenderStateSet(rwRENDERSTATETEXTUREFILTER, (void*)rwFILTERLINEAR);
+	RwRenderStateSet(rwRENDERSTATESHADEMODE, (void*)rwSHADEMODEFLAT);
+	RwRenderStateSet(rwRENDERSTATEZTESTENABLE, (void*)FALSE);
+	RwRenderStateSet(rwRENDERSTATEZWRITEENABLE, (void*)TRUE);
+	RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void*)TRUE);
+#if !defined(GTA_PS2_STUFF) && defined(RWLIBS)
+	RwRenderStateSet(rwRENDERSTATESRCBLEND, (void*)rwBLENDSRCALPHA);
+	RwRenderStateSet(rwRENDERSTATEDESTBLEND, (void*)rwBLENDINVSRCALPHA);
+	RwD3D8SetRenderState(D3DRS_ALPHAFUNC, D3DCMP_ALWAYS);
+#else
+	RwRenderStateSet(rwRENDERSTATESRCBLEND, (void*)rwBLENDZERO);
+	RwRenderStateSet(rwRENDERSTATEDESTBLEND, (void*)rwBLENDONE);
+#endif
+
+	CVector2D out[8];
+	CVector2D in;
+
+	// Draw the shape we want to mask out from the radar in four segments
+	for (int i = 0; i < 4; i++) {
+		// First point is always the corner itself
+		in.x = corners[i].x;
+		in.y = corners[i].y;
+		TransformRadarPointToScreenSpace(out[0], in);
+
+		// Then generate a quarter of the circle
+		for (int j = 0; j < 7; j++) {
+			in.x = corners[i].x * Cos(j * (PI / 2.0f / 6.0f));
+			in.y = corners[i].y * Sin(j * (PI / 2.0f / 6.0f));
+			TransformRadarPointToScreenSpace(out[j + 1], in);
+		};
+
+		CSprite2d::SetMaskVertices(8, (float *)out);
+		RwIm2DRenderPrimitive(rwPRIMTYPETRIFAN, CSprite2d::GetVertices(), 8);
+	}
+#if !defined(GTA_PS2_STUFF) && defined(RWLIBS)
+	RwD3D8SetRenderState(D3DRS_ALPHAFUNC, D3DCMP_GREATER);
+#endif
+
+}
+
+void CRadar::DrawRadarSection(int32 x, int32 y)
+{
+	int i;
+	RwTexDictionary *txd;
+	CVector2D worldPoly[8];
+	CVector2D radarCorners[4];
+	CVector2D radarPoly[8];
+	CVector2D texCoords[8];
+	CVector2D screenPoly[8];
+	int numVertices;
+	RwTexture *texture = nil;
+
+	GetTextureCorners(x, y, worldPoly);
+	ClipRadarTileCoords(x, y);
+
+	if (!CTheScripts::bPlayerIsInTheStatium &&
+		(!(txd = CTxdStore::GetSlot(gRadarTxdIds[x + RADAR_NUM_TILES * y])->texDict) || !(texture = GetFirstTexture(txd))))
+		return;
+
+	for (i = 0; i < 4; i++)
+		TransformRealWorldPointToRadarSpace(radarCorners[i], worldPoly[i]);
+
+	numVertices = ClipRadarPoly(radarPoly, radarCorners);
+
+	// FIX: can return earlier here
+//	if(numVertices == 0)
+	if (numVertices < 3)
+		return;
+
+	for (i = 0; i < numVertices; i++) {
+		TransformRadarPointToRealWorldSpace(worldPoly[i], radarPoly[i]);
+		TransformRealWorldToTexCoordSpace(texCoords[i], worldPoly[i], x, y);
+		TransformRadarPointToScreenSpace(screenPoly[i], radarPoly[i]);
+	}
+
+	if (CTheScripts::bPlayerIsInTheStatium) {
+		RwRenderStateSet(rwRENDERSTATETEXTURERASTER, nil);
+		CSprite2d::SetVertices(numVertices, (float*)screenPoly, (float*)texCoords, CRGBA(204, 204, 204, 255));
+	} else {
+		RwRenderStateSet(rwRENDERSTATETEXTURERASTER, RwTextureGetRaster(texture));
+		CSprite2d::SetVertices(numVertices, (float*)screenPoly, (float*)texCoords, CRGBA(255, 255, 255, 255));
+	}
+
+	// check done above now
+//	if(numVertices > 2)
+	RwIm2DRenderPrimitive(rwPRIMTYPETRIFAN, CSprite2d::GetVertices(), numVertices);
+}
+
+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));
+
+	if (FrontEndMenuManager.m_bMenuMapActive) {
+		bool alreadyThere = false;
+		for (int i = 0; i < NUM_MAP_LEGENDS; i++) {
+			if (MapLegendList[i] == sprite)
+				alreadyThere = true;
+		}
+		if (!alreadyThere) {
+			MapLegendList[MapLegendCounter] = sprite;
+			MapLegendCounter++;
+		}
+	}
+}
+
+void CRadar::DrawRotatingRadarSprite(CSprite2d* sprite, float x, float y, float angle, int32 alpha)
+{
+	CVector curPosn[4];
+	const float sizeX = SCREEN_SCALE_X(8.0f);
+	const float correctedAngle = angle - PI / 4.f;
+	const float sizeY = SCREEN_SCALE_Y(8.0f);
+
+	for (uint32 i = 0; i < 4; i++) {
+		const float cornerAngle = i * HALFPI + correctedAngle;
+		curPosn[i].x = x + (0.0f * Cos(cornerAngle) + 1.0f * Sin(cornerAngle)) * sizeX;
+		curPosn[i].y = y - (0.0f * Sin(cornerAngle) - 1.0f * Cos(cornerAngle)) * sizeY;
+	}
+
+	sprite->Draw(curPosn[3].x, curPosn[3].y, curPosn[2].x, curPosn[2].y, curPosn[0].x, curPosn[0].y, curPosn[1].x, curPosn[1].y, CRGBA(255, 255, 255, alpha));
+}
+
+int32 CRadar::GetActualBlipArrayIndex(int32 i)
+{
+	if (i == -1)
+		return -1;
+	else if ((i & 0xFFFF0000) >> 16 != ms_RadarTrace[(uint16)i].m_BlipIndex)
+		return -1;
+	else
+		return (uint16)i;
+}
+
+int32 CRadar::GetNewUniqueBlipIndex(int32 i)
+{
+	if (ms_RadarTrace[i].m_BlipIndex >= UINT16_MAX - 1)
+		ms_RadarTrace[i].m_BlipIndex = 1;
+	else
+		ms_RadarTrace[i].m_BlipIndex++;
+	return i | (ms_RadarTrace[i].m_BlipIndex << 16);
+}
+
+uint32 CRadar::GetRadarTraceColour(uint32 color, bool bright)
+{
+	uint32 c;
+	switch (color) {
+	case RADAR_TRACE_RED:
+		if (bright)
+			c = 0x712B49FF;
+		else
+			c = 0x7F0000FF;
+		break;
+	case RADAR_TRACE_GREEN:
+		if (bright)
+			c = 0x5FA06AFF;
+		else
+			c = 0x007F00FF;
+		break;
+	case RADAR_TRACE_LIGHT_BLUE:
+		if (bright)
+			c = 0x80A7F3FF;
+		else
+			c = 0x00007FFF;
+		break;
+	case RADAR_TRACE_GRAY:
+		if (bright)
+			c = 0xE1E1E1FF;
+		else
+			c = 0x7F7F7FFF;
+		break;
+	case RADAR_TRACE_YELLOW:
+		if (bright)
+			c = 0xFFFF00FF;
+		else
+			c = 0x7F7F00FF;
+		break;
+	case RADAR_TRACE_MAGENTA:
+		if (bright)
+			c = 0xFF00FFFF;
+		else
+			c = 0x7F007FFF;
+		break;
+	case RADAR_TRACE_CYAN:
+		if (bright)
+			c = 0x00FFFFFF;
+		else
+			c = 0x007F7FFF;
+		break;
+	default:
+		c = color;
+		break;
+	};
+	return c;
+}
+
+const char* gRadarTexNames[] = {
+	"radar00", "radar01", "radar02", "radar03", "radar04", "radar05", "radar06", "radar07",
+	"radar08", "radar09", "radar10", "radar11", "radar12", "radar13", "radar14", "radar15",
+	"radar16", "radar17", "radar18", "radar19", "radar20", "radar21", "radar22", "radar23",
+	"radar24", "radar25", "radar26", "radar27", "radar28", "radar29", "radar30", "radar31",
+	"radar32", "radar33", "radar34", "radar35", "radar36", "radar37", "radar38", "radar39",
+	"radar40", "radar41", "radar42", "radar43", "radar44", "radar45", "radar46", "radar47",
+	"radar48", "radar49", "radar50", "radar51", "radar52", "radar53", "radar54", "radar55",
+	"radar56", "radar57", "radar58", "radar59", "radar60", "radar61", "radar62", "radar63",
+};
+
+void
+CRadar::Initialise()
+{
+	for (int i = 0; i < NUMRADARBLIPS; i++) {
+		ms_RadarTrace[i].m_BlipIndex = 1;
+		SetRadarMarkerState(i, false);
+		ms_RadarTrace[i].m_bInUse = false;
+		ms_RadarTrace[i].m_bShortRange = false;
+		ms_RadarTrace[i].m_eBlipType = BLIP_NONE;
+		ms_RadarTrace[i].m_eBlipDisplay = BLIP_DISPLAY_NEITHER;
+		ms_RadarTrace[i].m_eRadarSprite = RADAR_SPRITE_NONE;
+	}
+
+	m_radarRange = 350.0f;
+	for (int i = 0; i < 64; i++) 
+		gRadarTxdIds[i] = CTxdStore::FindTxdSlot(gRadarTexNames[i]);
+}
+
+float CRadar::LimitRadarPoint(CVector2D &point)
+{
+	float dist, invdist;
+
+	dist = point.Magnitude();
+
+	if (FrontEndMenuManager.m_bMenuMapActive)
+		return dist;
+
+	if (dist > 1.0f) {
+		invdist = 1.0f / dist;
+		point.x *= invdist;
+		point.y *= invdist;
+	}
+	return dist;
+}
+
+void CRadar::LoadAllRadarBlips(uint8 *buf, uint32 size)
+{
+	Initialise();
+INITSAVEBUF
+	CheckSaveHeader(buf, 'R', 'D', 'R', '\0', size - SAVE_HEADER_SIZE);
+
+	for (int i = 0; i < NUMRADARBLIPS; i++) {
+		ms_RadarTrace[i].m_nColor = ReadSaveBuf<uint32>(buf);
+		ms_RadarTrace[i].m_Radius = ReadSaveBuf<float>(buf);
+		ms_RadarTrace[i].m_eBlipType = ReadSaveBuf<uint32>(buf);
+		ms_RadarTrace[i].m_nEntityHandle = ReadSaveBuf<int32>(buf);
+		ms_RadarTrace[i].m_vec2DPos.x = ReadSaveBuf<float>(buf); // CVector2D
+		ms_RadarTrace[i].m_vec2DPos.y = ReadSaveBuf<float>(buf);
+		ms_RadarTrace[i].m_vecPos = ReadSaveBuf<CVector>(buf);
+		ms_RadarTrace[i].m_BlipIndex = ReadSaveBuf<uint16>(buf);
+		ms_RadarTrace[i].m_bDim = ReadSaveBuf<bool>(buf);
+		ms_RadarTrace[i].m_bInUse = ReadSaveBuf<bool>(buf);
+		ms_RadarTrace[i].m_bShortRange = ReadSaveBuf<bool>(buf);
+		ms_RadarTrace[i].m_unused = ReadSaveBuf<bool>(buf);
+		ms_RadarTrace[i].m_wScale = ReadSaveBuf<int16>(buf);
+		ms_RadarTrace[i].m_eBlipDisplay = ReadSaveBuf<uint16>(buf);
+		ms_RadarTrace[i].m_eRadarSprite = ReadSaveBuf<uint16>(buf);
+	}
+
+VALIDATESAVEBUF(size);
+}
+
+void CRadar::SaveAllRadarBlips(uint8 *buf, uint32 *size)
+{
+	*size = SAVE_HEADER_SIZE + NUMRADARBLIPS * sizeof(sRadarTraceSave);
+
+INITSAVEBUF
+	WriteSaveHeader(buf, 'R', 'D', 'R', '\0', *size - SAVE_HEADER_SIZE);
+
+#ifdef MAP_ENHANCEMENTS
+	if (TargetMarkerId != -1) {
+		ClearBlip(TargetMarkerId);
+		TargetMarkerId = -1;
+	}
+#endif
+
+	for (int i = 0; i < NUMRADARBLIPS; i++) {
+		sRadarTraceSave *saveStruct = (sRadarTraceSave*) buf;
+
+		saveStruct->m_nColor = ms_RadarTrace[i].m_nColor;
+		saveStruct->m_Radius = ms_RadarTrace[i].m_Radius;
+		saveStruct->m_eBlipType = ms_RadarTrace[i].m_eBlipType;
+		saveStruct->m_nEntityHandle = ms_RadarTrace[i].m_nEntityHandle;
+		saveStruct->m_vec2DPos = ms_RadarTrace[i].m_vec2DPos;
+		saveStruct->m_vecPos = ms_RadarTrace[i].m_vecPos;
+		saveStruct->m_BlipIndex = ms_RadarTrace[i].m_BlipIndex;
+		saveStruct->m_bDim = ms_RadarTrace[i].m_bDim;
+		saveStruct->m_bInUse = ms_RadarTrace[i].m_bInUse;
+		saveStruct->m_bShortRange = ms_RadarTrace[i].m_bShortRange;
+		saveStruct->m_unused = ms_RadarTrace[i].m_unused;
+		saveStruct->m_wScale = ms_RadarTrace[i].m_wScale;
+		saveStruct->m_eBlipDisplay = ms_RadarTrace[i].m_eBlipDisplay;
+		saveStruct->m_eRadarSprite = ms_RadarTrace[i].m_eRadarSprite;
+
+		SkipSaveBuf(buf, sizeof(sRadarTraceSave));
+	}
+
+VALIDATESAVEBUF(*size);
+}
+
+void
+CRadar::LoadTextures()
+{
+	CTxdStore::PushCurrentTxd();
+	CTxdStore::SetCurrentTxd(CTxdStore::FindTxdSlot("hud"));
+	CentreSprite.SetTexture("radar_centre");
+	MapHereSprite.SetTexture("arrow");
+	NorthSprite.SetTexture("radar_north");
+	AverySprite.SetTexture("radar_avery");
+	BikerSprite.SetTexture("radar_biker");
+	CortezSprite.SetTexture("radar_cortez");
+	DiazSprite.SetTexture("radar_diaz");
+	KentSprite.SetTexture("radar_kent");
+	LawyerSprite.SetTexture("radar_lawyer");
+	PhilSprite.SetTexture("radar_phil");
+	BikersSprite.SetTexture("bikers");
+	BoatyardSprite.SetTexture("boatyard");
+	MalibuClubSprite.SetTexture("club");
+	CubansSprite.SetTexture("cubans");
+	FilmSprite.SetTexture("filmstudio");
+	GunSprite.SetTexture("gun");
+	HaitiansSprite.SetTexture("haitians");
+	HardwareSprite.SetTexture("hardware");
+	SaveHouseSprite.SetTexture("radar_save");
+	StripSprite.SetTexture("radar_strip");
+	IceSprite.SetTexture("icecream");
+	KCabsSprite.SetTexture("kcabs");
+	LovefistSprite.SetTexture("lovefist");
+	PrintworksSprite.SetTexture("printworks");
+	PropertySprite.SetTexture("property");
+	SunYardSprite.SetTexture("SunYard");
+	SpraySprite.SetTexture("spray");
+	TShirtSprite.SetTexture("tshirt");
+	TommySprite.SetTexture("tommy");
+	PhoneSprite.SetTexture("phone");
+	RadioWildstyleSprite.SetTexture("RWildstyle");
+	RadioFlashSprite.SetTexture("RFlash");
+	RadioKChatSprite.SetTexture("RKchat");
+	RadioFeverSprite.SetTexture("RFever");
+	RadioVRockSprite.SetTexture("RVRock");
+	RadioVCPRSprite.SetTexture("RVCPR");
+	RadioEspantosoSprite.SetTexture("REspantoso");
+	RadioEmotionSprite.SetTexture("REmotion");
+	RadioWaveSprite.SetTexture("RWave");
+	CTxdStore::PopCurrentTxd();
+}
+
+void CRadar::RemoveRadarSections()
+{
+	for (int i = 0; i < 8; i++)
+		for (int j = 0; j < 8; j++)
+			RemoveMapSection(i, j);
+}
+
+void CRadar::SetBlipSprite(int32 i, int32 icon)
+{
+	int index = CRadar::GetActualBlipArrayIndex(i);
+	if (index != -1) {
+		ms_RadarTrace[index].m_eRadarSprite = icon;
+	}
+}
+
+int CRadar::SetCoordBlip(eBlipType type, CVector pos, uint32 color, eBlipDisplay display)
+{
+	int nextBlip;
+	for (nextBlip = 0; nextBlip < NUMRADARBLIPS; nextBlip++) {
+		if (!ms_RadarTrace[nextBlip].m_bInUse)
+			break;
+	}
+#ifdef FIX_BUGS
+	if (nextBlip == NUMRADARBLIPS)
+		return -1;
+#endif
+	ms_RadarTrace[nextBlip].m_eBlipType = type;
+	ms_RadarTrace[nextBlip].m_nColor = RADAR_TRACE_MAGENTA;
+	ms_RadarTrace[nextBlip].m_bDim = true;
+	ms_RadarTrace[nextBlip].m_bInUse = true;
+	ms_RadarTrace[nextBlip].m_bShortRange = false;
+	ms_RadarTrace[nextBlip].m_Radius = 1.0f;
+	ms_RadarTrace[nextBlip].m_vec2DPos = pos;
+	ms_RadarTrace[nextBlip].m_vecPos = pos;
+	ms_RadarTrace[nextBlip].m_nEntityHandle = 0;
+	ms_RadarTrace[nextBlip].m_wScale = 1;
+	ms_RadarTrace[nextBlip].m_eBlipDisplay = display;
+	ms_RadarTrace[nextBlip].m_eRadarSprite = RADAR_SPRITE_NONE;
+	return CRadar::GetNewUniqueBlipIndex(nextBlip);
+}
+
+int CRadar::SetShortRangeCoordBlip(eBlipType type, CVector pos, uint32 color, eBlipDisplay display)
+{
+	int index = SetCoordBlip(type, pos, color, display);
+	if (index == -1)
+		return -1;
+	ms_RadarTrace[GetActualBlipArrayIndex(index)].m_bShortRange = true;
+	return index;
+}
+
+int CRadar::SetEntityBlip(eBlipType type, int32 handle, uint32 color, eBlipDisplay display)
+{
+	int nextBlip;
+	for (nextBlip = 0; nextBlip < NUMRADARBLIPS; nextBlip++) {
+		if (!ms_RadarTrace[nextBlip].m_bInUse)
+			break;
+	}
+#ifdef FIX_BUGS
+	if (nextBlip == NUMRADARBLIPS)
+		return -1;
+#endif
+	ms_RadarTrace[nextBlip].m_eBlipType = type;
+	ms_RadarTrace[nextBlip].m_nColor = RADAR_TRACE_YELLOW;
+	ms_RadarTrace[nextBlip].m_bDim = true;
+	ms_RadarTrace[nextBlip].m_bInUse = true;
+	ms_RadarTrace[nextBlip].m_bShortRange = false;
+	ms_RadarTrace[nextBlip].m_Radius = 1.0f;
+	ms_RadarTrace[nextBlip].m_nEntityHandle = handle;
+	ms_RadarTrace[nextBlip].m_wScale = 1;
+	ms_RadarTrace[nextBlip].m_eBlipDisplay = display;
+	ms_RadarTrace[nextBlip].m_eRadarSprite = RADAR_SPRITE_NONE;
+	return GetNewUniqueBlipIndex(nextBlip);
+}
+
+void CRadar::SetRadarMarkerState(int32 counter, bool flag)
+{
+	CEntity *e;
+	switch (ms_RadarTrace[counter].m_eBlipType) {
+	case BLIP_CAR:
+		e = CPools::GetVehiclePool()->GetAt(ms_RadarTrace[counter].m_nEntityHandle);
+		break;
+	case BLIP_CHAR:
+		e = CPools::GetPedPool()->GetAt(ms_RadarTrace[counter].m_nEntityHandle);
+		break;
+	case BLIP_OBJECT:
+		e = CPools::GetObjectPool()->GetAt(ms_RadarTrace[counter].m_nEntityHandle);
+		break;
+	default:
+		return;
+	}
+
+	if (e)
+		e->bHasBlip = flag;
+}
+
+void CRadar::ShowRadarMarker(CVector pos, uint32 color, float radius) {
+	float f1 = radius * 1.4f;
+	float f2 = radius * 0.5f;
+	CVector p1, p2;
+
+	p1 = pos + TheCamera.GetUp()*f1;
+	p2 = pos + TheCamera.GetUp()*f2;
+	CTheScripts::ScriptDebugLine3D(p1.x, p1.y, p1.z, p2.x, p2.y, p2.z, color, color);
+
+	p1 = pos - TheCamera.GetUp()*f1;
+	p2 = pos - TheCamera.GetUp()*f2;
+	CTheScripts::ScriptDebugLine3D(p1.x, p1.y, p1.z, p2.x, p2.y, p2.z, color, color);
+
+	p1 = pos + TheCamera.GetRight()*f1;
+	p2 = pos + TheCamera.GetRight()*f2;
+	CTheScripts::ScriptDebugLine3D(p1.x, p1.y, p1.z, p2.x, p2.y, p2.z, color, color);
+
+	p1 = pos - TheCamera.GetRight()*f1;
+	p2 = pos - TheCamera.GetRight()*f2;
+	CTheScripts::ScriptDebugLine3D(p1.x, p1.y, p1.z, p2.x, p2.y, p2.z, color, color);
+}
+
+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)
+		return;
+
+	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));
+}
+
+void CRadar::ShowRadarTraceWithHeight(float x, float y, uint32 size, uint8 red, uint8 green, uint8 blue, uint8 alpha, uint8 mode)
+{
+	if (!CHud::m_Wants_To_Draw_Hud || TheCamera.m_WideScreenOn)
+		return;
+
+	switch (mode)
+	{
+	case BLIP_MODE_TRIANGULAR_UP:
+		size++;
+		CSprite2d::Draw2DPolygon(x + SCREEN_SCALE_X(size + 3.0f), y + SCREEN_SCALE_Y(size + 2.0f), x - (SCREEN_SCALE_X(size + 3.0f)), y + SCREEN_SCALE_Y(size + 2.0f), x, y - (SCREEN_SCALE_Y(size + 3.0f)), x, y - (SCREEN_SCALE_Y(size + 3.0f)), CRGBA(0, 0, 0, alpha));
+		CSprite2d::Draw2DPolygon(x + SCREEN_SCALE_X(size + 1.0f), y + SCREEN_SCALE_Y(size + 1.0f), x - (SCREEN_SCALE_X(size + 1.0f)), y + SCREEN_SCALE_Y(size + 1.0f), x, y - (SCREEN_SCALE_Y(size + 1.0f)), x, y - (SCREEN_SCALE_Y(size + 1.0f)), CRGBA(red, green, blue, alpha));
+		break;
+	case BLIP_MODE_TRIANGULAR_DOWN:
+		size++;
+		CSprite2d::Draw2DPolygon(x, y + SCREEN_SCALE_Y(size + 2.0f), x, y + SCREEN_SCALE_Y(size + 3.0f), x + SCREEN_SCALE_X(size + 3.0f), y - (SCREEN_SCALE_Y(size + 2.0f)), x - (SCREEN_SCALE_X(size + 3.0f)), y - (SCREEN_SCALE_Y(size + 2.0f)), CRGBA(0, 0, 0, alpha));
+		CSprite2d::Draw2DPolygon(x, y + SCREEN_SCALE_Y(size + 1.0f), x, y + SCREEN_SCALE_Y(size + 1.0f), x + SCREEN_SCALE_X(size + 1.0f), y - (SCREEN_SCALE_Y(size + 1.0f)), x - (SCREEN_SCALE_X(size + 1.0f)), y - (SCREEN_SCALE_Y(size + 1.0f)), CRGBA(red, green, blue, alpha));
+		break;
+	case BLIP_MODE_SQUARE:
+		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));
+		break;
+	}
+}
+
+void CRadar::Shutdown()
+{
+	CentreSprite.Delete();
+	MapHereSprite.Delete();
+	NorthSprite.Delete();
+	AverySprite.Delete();
+	BikerSprite.Delete();
+	CortezSprite.Delete();
+	DiazSprite.Delete();
+	KentSprite.Delete();
+	LawyerSprite.Delete();
+	PhilSprite.Delete();
+	BikersSprite.Delete();
+	BoatyardSprite.Delete();
+	MalibuClubSprite.Delete();
+	CubansSprite.Delete();
+	FilmSprite.Delete();
+	GunSprite.Delete();
+	HaitiansSprite.Delete();
+	HardwareSprite.Delete();
+	SaveHouseSprite.Delete();
+	StripSprite.Delete();
+	IceSprite.Delete();
+	KCabsSprite.Delete();
+	LovefistSprite.Delete();
+	PrintworksSprite.Delete();
+	PropertySprite.Delete();
+	SunYardSprite.Delete();
+	SpraySprite.Delete();
+	TShirtSprite.Delete();
+	TommySprite.Delete();
+	PhoneSprite.Delete();
+	RadioWildstyleSprite.Delete();
+	RadioFlashSprite.Delete();
+	RadioKChatSprite.Delete();
+	RadioFeverSprite.Delete();
+	RadioVRockSprite.Delete();
+	RadioVCPRSprite.Delete();
+	RadioEspantosoSprite.Delete();
+	RadioEmotionSprite.Delete();
+	RadioWaveSprite.Delete();
+	RemoveRadarSections();
+}
+
+void CRadar::StreamRadarSections(const CVector &posn)
+{
+	if (!CStreaming::ms_disableStreaming)
+		StreamRadarSections(Floor((RADAR_MAX_X + posn.x) / RADAR_TILE_SIZE), Ceil((RADAR_NUM_TILES - 1) - (RADAR_MAX_Y + posn.y) / RADAR_TILE_SIZE));
+}
+
+void CRadar::StreamRadarSections(int32 x, int32 y)
+{
+	for (int i = 0; i < RADAR_NUM_TILES; ++i) {
+		for (int j = 0; j < RADAR_NUM_TILES; ++j) {
+			if ((i >= x - 1 && i <= x + 1) && (j >= y - 1 && j <= y + 1))
+				RequestMapSection(i, j);
+			else
+				RemoveMapSection(i, j);
+		};
+	};
+}
+
+void CRadar::TransformRealWorldToTexCoordSpace(CVector2D &out, const CVector2D &in, int32 x, int32 y)
+{
+	out.x = in.x - (x * RADAR_TILE_SIZE + RADAR_MIN_X);
+	out.y = -(in.y - ((RADAR_NUM_TILES - y) * RADAR_TILE_SIZE + RADAR_MIN_Y));
+	out.x /= RADAR_TILE_SIZE;
+	out.y /= RADAR_TILE_SIZE;
+}
+
+void CRadar::TransformRadarPointToRealWorldSpace(CVector2D &out, const CVector2D &in)
+{
+	float s, c;
+	s = -cachedSin;
+	c = cachedCos;
+
+	out.x = s * in.y + c * in.x;
+	out.y = c * in.y - s * in.x;
+
+	out = out * m_radarRange + vec2DRadarOrigin;
+}
+
+// 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)
+{
+	if (FrontEndMenuManager.m_bMenuMapActive) {
+		out.x = (FrontEndMenuManager.m_fMapCenterX - FrontEndMenuManager.m_fMapSize) + (MENU_MAP_LENGTH / 2 + MENU_MAP_LEFT_OFFSET + in.x) * FrontEndMenuManager.m_fMapSize * MENU_MAP_WIDTH_SCALE * 2.0f / MENU_MAP_LENGTH;
+		out.y = (FrontEndMenuManager.m_fMapCenterY - FrontEndMenuManager.m_fMapSize) + (MENU_MAP_LENGTH / 2 - MENU_MAP_TOP_OFFSET - in.y) * FrontEndMenuManager.m_fMapSize * MENU_MAP_HEIGHT_SCALE * 2.0f / MENU_MAP_LENGTH;
+	} else {
+#ifdef FIX_BUGS
+		out.x = (in.x + 1.0f) * 0.5f * SCREEN_SCALE_X(RADAR_WIDTH) + SCREEN_SCALE_X(RADAR_LEFT);
+#else
+		out.x = (in.x + 1.0f) * 0.5f * SCREEN_SCALE_X(RADAR_WIDTH) + RADAR_LEFT;
+#endif
+		out.y = (1.0f - in.y) * 0.5f * SCREEN_SCALE_Y(RADAR_HEIGHT) + SCREEN_SCALE_FROM_BOTTOM(RADAR_BOTTOM + RADAR_HEIGHT);
+	}
+}
+
+void CRadar::TransformRealWorldPointToRadarSpace(CVector2D &out, const CVector2D &in)
+{
+	float s, c;
+	s = cachedSin;
+	c = cachedCos;
+
+	float x = (in.x - vec2DRadarOrigin.x) * (1.0f / m_radarRange);
+	float y = (in.y - vec2DRadarOrigin.y) * (1.0f / m_radarRange);
+
+	out.x = s * y + c * x;
+	out.y = c * y - s * x;
+}
+
+void
+CRadar::CalculateCachedSinCos()
+{
+	if (/*TheCamera.Cams[TheCamera.ActiveCam].Mode == CCam::MODE_TOPDOWN || TheCamera.Cams[TheCamera.ActiveCam].Mode == CCam::MODE_TOP_DOWN_PED || */
+		FrontEndMenuManager.m_bMenuMapActive ) {
+		cachedSin = 0.0f;
+		cachedCos = 1.0f;
+	} else if (TheCamera.GetLookDirection() == LOOKING_FORWARD) {
+		cachedSin = Sin(TheCamera.GetForward().Heading());
+		cachedCos = Cos(TheCamera.GetForward().Heading());
+	} else {
+		CVector forward;
+
+		if (TheCamera.Cams[TheCamera.ActiveCam].Mode == CCam::MODE_1STPERSON) {
+			forward = TheCamera.Cams[TheCamera.ActiveCam].CamTargetEntity->GetForward();
+			forward.Normalise();	// a bit useless...
+		}
+		else
+			forward = TheCamera.Cams[TheCamera.ActiveCam].CamTargetEntity->GetPosition() - TheCamera.Cams[TheCamera.ActiveCam].SourceBeforeLookBehind;
+
+		cachedSin = Sin(forward.Heading());
+		cachedCos = Cos(forward.Heading());
+	}
+}
+
+void
+CRadar::InitFrontEndMap()
+{
+	CalculateCachedSinCos();
+	vec2DRadarOrigin.x = 0.0f;
+	vec2DRadarOrigin.y = 0.0f;
+	m_radarRange = MENU_MAP_LENGTH_UNIT; // just affects the multiplier in TransformRadarPointToScreenSpace
+	for (int i = 0; i < NUM_MAP_LEGENDS; i++) {
+		MapLegendList[i] = RADAR_SPRITE_NONE;
+	}
+	MapLegendCounter = 0;
+	ArrowBlipColour1 = CRGBA(0, 0, 0, 0);
+	ArrowBlipColour2 = CRGBA(0, 0, 0, 0);
+}
+
+void
+CRadar::DrawYouAreHereSprite(float x, float y)
+{
+	static PauseModeTime lastChange = 0;
+	static bool show = true;
+
+	if (show) {
+		if (CTimer::GetTimeInMillisecondsPauseMode() - lastChange > 500) {
+			lastChange = CTimer::GetTimeInMillisecondsPauseMode();
+			show = !show;
+		}
+	} else {
+		if (CTimer::GetTimeInMillisecondsPauseMode() - lastChange > 200) {
+			lastChange = CTimer::GetTimeInMillisecondsPauseMode();
+			show = !show;
+		}
+	}
+
+	if (show) {
+		const float left = x - SCREEN_SCALE_X(8.0f);
+		const float top = y - SCREEN_SCALE_Y(40.0f);
+		const float right = x + SCREEN_SCALE_X(40.0);
+		const float bottom = y + SCREEN_SCALE_Y(8.0f);
+		MapHereSprite.Draw(CRect(left + SCREEN_SCALE_X(2.f), top + SCREEN_SCALE_Y(2.f), right + SCREEN_SCALE_X(2.f), bottom + SCREEN_SCALE_Y(2.f)),
+			CRGBA(0, 0, 0, 255));
+
+		MapHereSprite.Draw(CRect(left, top, right, bottom), CRGBA(255, 255, 255, 255));
+
+		CFont::SetWrapx(right + SCREEN_SCALE_X(28.0f));
+		CFont::SetRightJustifyWrap(right);
+		CFont::SetBackGroundOnlyTextOff();
+		CFont::SetColor(CRGBA(255, 150, 225, 255));
+		CFont::SetDropShadowPosition(2);
+		CFont::SetDropColor(CRGBA(0, 0, 0, 255));
+		CFont::SetCentreOff();
+		CFont::SetRightJustifyOff();
+		CFont::SetFontStyle(FONT_LOCALE(FONT_HEADING));
+		CFont::SetScale(SCREEN_SCALE_X(0.65f), SCREEN_SCALE_Y(0.95f));
+		CFont::PrintString(right, top, TheText.Get("MAP_YAH"));
+		CFont::SetDropShadowPosition(0);
+		CFont::DrawFonts();
+	}
+	MapLegendList[MapLegendCounter++] = RADAR_SPRITE_MAP_HERE;
+}
+
+#ifdef MAP_ENHANCEMENTS
+void
+CRadar::ToggleTargetMarker(float x, float y)
+{
+	if (TargetMarkerId == -1) {
+		int nextBlip;
+		for (nextBlip = 0; nextBlip < NUMRADARBLIPS; nextBlip++) {
+			if (!ms_RadarTrace[nextBlip].m_bInUse)
+				break;
+		}
+		
+		if (nextBlip == NUMRADARBLIPS)
+			return;
+			
+		ms_RadarTrace[nextBlip].m_eBlipType = BLIP_COORD;
+		ms_RadarTrace[nextBlip].m_nColor = RADAR_TRACE_GRAY;
+		ms_RadarTrace[nextBlip].m_bDim = 0;
+		ms_RadarTrace[nextBlip].m_bInUse = 1;
+		ms_RadarTrace[nextBlip].m_Radius = 1.0f;
+		CVector pos(x, y, CWorld::FindGroundZForCoord(x,y));
+		TargetMarkerPos = pos;
+		ms_RadarTrace[nextBlip].m_vec2DPos = pos;
+		ms_RadarTrace[nextBlip].m_vecPos = pos;
+		ms_RadarTrace[nextBlip].m_nEntityHandle = 0;
+		ms_RadarTrace[nextBlip].m_wScale = 5;
+		ms_RadarTrace[nextBlip].m_eBlipDisplay = BLIP_DISPLAY_BLIP_ONLY;
+		ms_RadarTrace[nextBlip].m_eRadarSprite = RADAR_SPRITE_NONE;
+		TargetMarkerId = CRadar::GetNewUniqueBlipIndex(nextBlip);
+	} else {
+		ClearBlip(TargetMarkerId);
+		TargetMarkerId = -1;
+	}
+}
+#endif
+
+void
+CRadar::DrawEntityBlip(int32 blipId)
+{
+	CVector2D out;
+	CVector2D in;
+	CEntity *blipEntity;
+	switch (ms_RadarTrace[blipId].m_eBlipType) {
+		case BLIP_CAR:
+			blipEntity = CPools::GetVehiclePool()->GetAt(ms_RadarTrace[blipId].m_nEntityHandle);
+			break;
+		case BLIP_CHAR:
+			blipEntity = CPools::GetPedPool()->GetAt(ms_RadarTrace[blipId].m_nEntityHandle);
+			if (blipEntity != nil) {
+				if (((CPed*)blipEntity)->InVehicle())
+					blipEntity = ((CPed*)blipEntity)->m_pMyVehicle;
+			}
+			break;
+		case BLIP_OBJECT:
+			blipEntity = CPools::GetObjectPool()->GetAt(ms_RadarTrace[blipId].m_nEntityHandle);
+			break;
+		default:
+			break;
+	}
+	if (blipEntity) {
+		uint32 color = GetRadarTraceColour(ms_RadarTrace[blipId].m_nColor, ms_RadarTrace[blipId].m_bDim);
+		if (ms_RadarTrace[blipId].m_eBlipDisplay == BLIP_DISPLAY_BOTH || ms_RadarTrace[blipId].m_eBlipDisplay == BLIP_DISPLAY_MARKER_ONLY) {
+			if (CTheScripts::IsDebugOn()) {
+				ShowRadarMarker(blipEntity->GetPosition(), color, ms_RadarTrace[blipId].m_Radius);
+				ms_RadarTrace[blipId].m_Radius = ms_RadarTrace[blipId].m_Radius - 0.1f;
+				if (ms_RadarTrace[blipId].m_Radius < 1.0f)
+					ms_RadarTrace[blipId].m_Radius = 5.0f;
+			}
+		}
+		if (ms_RadarTrace[blipId].m_eBlipDisplay == BLIP_DISPLAY_BOTH || ms_RadarTrace[blipId].m_eBlipDisplay == BLIP_DISPLAY_BLIP_ONLY) {
+			TransformRealWorldPointToRadarSpace(in, blipEntity->GetPosition());
+			float dist = LimitRadarPoint(in);
+			TransformRadarPointToScreenSpace(out, in);
+			if (!ms_RadarTrace[blipId].m_bShortRange || dist <= 1.0f || FrontEndMenuManager.m_bMenuMapActive) {
+				if (ms_RadarTrace[blipId].m_eRadarSprite != RADAR_SPRITE_NONE) {
+					DrawRadarSprite(ms_RadarTrace[blipId].m_eRadarSprite, out.x, out.y, CalculateBlipAlpha(dist));
+				} else {
+					const CVector& pos = FindPlayerCentreOfWorld_NoSniperShift();
+					const CVector& blipPos = blipEntity->GetPosition();
+					uint8 mode = BLIP_MODE_TRIANGULAR_UP;
+					if (blipPos.z - pos.z <= 2.0f) {
+						if (blipPos.z - pos.z < -4.0f) mode = BLIP_MODE_TRIANGULAR_DOWN;
+						else mode = BLIP_MODE_SQUARE;
+					}
+					ShowRadarTraceWithHeight(out.x, out.y, ms_RadarTrace[blipId].m_wScale, (uint8)(color >> 24), (uint8)(color >> 16), (uint8)(color >> 8), 255, mode);
+
+					if (FrontEndMenuManager.m_bMenuMapActive) {
+						bool alreadyThere = false;
+						for (int i = 0; i < NUM_MAP_LEGENDS; i++) {
+							if (MapLegendList[i] == -2)
+								alreadyThere = true;
+						}
+						if (!alreadyThere) {
+							MapLegendList[MapLegendCounter] = -2;
+							MapLegendCounter++;
+							ArrowBlipColour2 = CRGBA((uint8)(color >> 24), (uint8)(color >> 16), (uint8)(color >> 8), 255);
+						}
+					}
+				}
+			}
+		}
+	}
+}
+
+void
+CRadar::DrawCoordBlip(int32 blipId)
+{
+	CVector2D out;
+	CVector2D in;
+	if (ms_RadarTrace[blipId].m_eBlipType != BLIP_CONTACT_POINT || !CTheScripts::IsPlayerOnAMission()) {
+
+		uint32 color = GetRadarTraceColour(ms_RadarTrace[blipId].m_nColor, ms_RadarTrace[blipId].m_bDim);
+		if (ms_RadarTrace[blipId].m_eBlipDisplay == BLIP_DISPLAY_BOTH || ms_RadarTrace[blipId].m_eBlipDisplay == BLIP_DISPLAY_MARKER_ONLY) {
+			if (CTheScripts::IsDebugOn()) {
+				ShowRadarMarker(ms_RadarTrace[blipId].m_vecPos, color, ms_RadarTrace[blipId].m_Radius);
+				ms_RadarTrace[blipId].m_Radius = ms_RadarTrace[blipId].m_Radius - 0.1f;
+				if (ms_RadarTrace[blipId].m_Radius < 1.0f)
+					ms_RadarTrace[blipId].m_Radius = 5.0f;
+			}
+		}
+		if (ms_RadarTrace[blipId].m_eBlipDisplay == BLIP_DISPLAY_BOTH || ms_RadarTrace[blipId].m_eBlipDisplay == BLIP_DISPLAY_BLIP_ONLY) {
+			TransformRealWorldPointToRadarSpace(in, ms_RadarTrace[blipId].m_vec2DPos);
+			float dist = LimitRadarPoint(in);
+			TransformRadarPointToScreenSpace(out, in);
+			if (!ms_RadarTrace[blipId].m_bShortRange || dist <= 1.0f || FrontEndMenuManager.m_bMenuMapActive) {
+				if (ms_RadarTrace[blipId].m_eRadarSprite != RADAR_SPRITE_NONE) {
+					DrawRadarSprite(ms_RadarTrace[blipId].m_eRadarSprite, out.x, out.y, CalculateBlipAlpha(dist));
+				} else {
+					const CVector& pos = FindPlayerCentreOfWorld_NoSniperShift();
+					const CVector& blipPos = ms_RadarTrace[blipId].m_vecPos;
+					uint8 mode = BLIP_MODE_TRIANGULAR_UP;
+					if (blipPos.z - pos.z <= 2.0f) {
+						if (blipPos.z - pos.z < -4.0f) mode = BLIP_MODE_TRIANGULAR_DOWN;
+						else mode = BLIP_MODE_SQUARE;
+					}
+					ShowRadarTraceWithHeight(out.x, out.y, ms_RadarTrace[blipId].m_wScale, (uint8)(color >> 24), (uint8)(color >> 16), (uint8)(color >> 8), 255, mode);
+
+					if (FrontEndMenuManager.m_bMenuMapActive) {
+						bool alreadyThere = false;
+						for (int i = 0; i < NUM_MAP_LEGENDS; i++) {
+							if (MapLegendList[i] == -1)
+								alreadyThere = true;
+						}
+						if (!alreadyThere) {
+							MapLegendList[MapLegendCounter] = -1;
+							MapLegendCounter++;
+							ArrowBlipColour1 = CRGBA((uint8)(color >> 24), (uint8)(color >> 16), (uint8)(color >> 8), 255);
+						}
+					}
+				}
+			}
+		}
+	}
+}
+
+void
+CRadar::DrawLegend(int32 x, int32 y, int32 sprite)
+{
+	if (sprite < 0) {
+		static PauseModeTime lastChange = 0;
+		static int8 blipMode = 0;
+
+		CRGBA color;
+		if (sprite == -1) {
+			color = ArrowBlipColour1;
+		} else {
+			color = ArrowBlipColour2;
+		}
+
+		if (CTimer::GetTimeInMillisecondsPauseMode() - lastChange > 600) {
+			lastChange = CTimer::GetTimeInMillisecondsPauseMode();
+			if ( blipMode == 2 )
+				blipMode = 0;
+			else
+				++blipMode;
+		}
+
+		switch (blipMode) {
+			case BLIP_MODE_TRIANGULAR_UP:
+				CSprite2d::Draw2DPolygon(x + SCREEN_SCALE_X(14.0f), y + SCREEN_SCALE_Y(13.0f), x + SCREEN_SCALE_X(2.0f), y + SCREEN_SCALE_Y(13.0f), x + SCREEN_SCALE_X(8.f), y + SCREEN_SCALE_Y(2.0f), x + SCREEN_SCALE_X(8.f), y + SCREEN_SCALE_Y(2.0f), CRGBA(0, 0, 0, 255));
+				CSprite2d::Draw2DPolygon(x + SCREEN_SCALE_X(12.0f), y + SCREEN_SCALE_Y(12.0f), x + SCREEN_SCALE_X(4.0f), y + SCREEN_SCALE_Y(12.0f), x + SCREEN_SCALE_X(8.f), y + SCREEN_SCALE_Y(4.0f), x + SCREEN_SCALE_X(8.f), y + SCREEN_SCALE_Y(4.0f), color);
+				break;
+			case BLIP_MODE_TRIANGULAR_DOWN:
+				CSprite2d::Draw2DPolygon(x + SCREEN_SCALE_X(8.0f), y + SCREEN_SCALE_Y(14.0f), x + SCREEN_SCALE_X(8.0f), y + SCREEN_SCALE_Y(14.0f), x + SCREEN_SCALE_X(2.f), y + SCREEN_SCALE_Y(3.0f), x + SCREEN_SCALE_X(2.f), y + SCREEN_SCALE_Y(3.0f), CRGBA(0, 0, 0, 255));
+				CSprite2d::Draw2DPolygon(x + SCREEN_SCALE_X(8.0f), y + SCREEN_SCALE_Y(12.0f), x + SCREEN_SCALE_X(8.0f), y + SCREEN_SCALE_Y(12.0f), x + SCREEN_SCALE_X(12.f), y + SCREEN_SCALE_Y(4.0f), x + SCREEN_SCALE_X(4.f), y + SCREEN_SCALE_Y(4.0f), color);
+				break;
+			case BLIP_MODE_SQUARE:
+				CSprite2d::DrawRect(CRect(x + SCREEN_SCALE_X(4.0f), y + SCREEN_SCALE_Y(3.0f), SCREEN_SCALE_X(12.0f) + x, SCREEN_SCALE_Y(12.0f) + y), CRGBA(0, 0, 0, 255));
+				CSprite2d::DrawRect(CRect(x + SCREEN_SCALE_X(5.0f), y + SCREEN_SCALE_Y(4.0f), SCREEN_SCALE_X(11.0f) + x, SCREEN_SCALE_Y(11.0f) + y), color);
+				break;
+		}
+
+	} else {
+		RadarSprites[sprite]->Draw(CRect(x, y, x + SCREEN_SCALE_X(16.f), y + SCREEN_SCALE_X(16.f)), CRGBA(255, 255, 255, 255));
+	}
+
+	wchar *text;
+	switch ( sprite ) {
+		case RADAR_SPRITE_ENTITY_BLIP:
+			text = TheText.Get("LG_38");
+		break;
+		case RADAR_SPRITE_COORD_BLIP:
+			text = TheText.Get("LG_35");
+		break;
+		case RADAR_SPRITE_MAP_HERE:
+			text = TheText.Get("LG_01");
+		break;
+		case RADAR_SPRITE_AVERY:
+			text = TheText.Get("LG_02");
+		break;
+		case RADAR_SPRITE_BIKER:
+			text = TheText.Get("LG_03");
+		break;
+		case RADAR_SPRITE_CORTEZ:
+			text = TheText.Get("LG_04");
+		break;
+		case RADAR_SPRITE_DIAZ:
+			text = TheText.Get("LG_05");
+		break;
+		case RADAR_SPRITE_KENT:
+			text = TheText.Get("LG_06");
+		break;
+		case RADAR_SPRITE_LAWYER:
+			text = TheText.Get("LG_07");
+		break;
+		case RADAR_SPRITE_PHIL:
+			text = TheText.Get("LG_08");
+		break;
+		case RADAR_SPRITE_BIKERS:
+			text = TheText.Get("LG_03");
+		break;
+		case RADAR_SPRITE_BOATYARD:
+			text = TheText.Get("LG_09");
+		break;
+		case RADAR_SPRITE_MALIBU_CLUB:
+			text = TheText.Get("LG_10");
+		break;
+		case RADAR_SPRITE_CUBANS:
+			text = TheText.Get("LG_11");
+		break;
+		case RADAR_SPRITE_FILM:
+			text = TheText.Get("LG_12");
+		break;
+		case RADAR_SPRITE_GUN:
+			text = TheText.Get("LG_13");
+		break;
+		case RADAR_SPRITE_HAITIANS:
+			text = TheText.Get("LG_14");
+		break;
+		case RADAR_SPRITE_HARDWARE:
+			text = TheText.Get("LG_15");
+		break;
+		case RADAR_SPRITE_SAVE:
+			text = TheText.Get("LG_16");
+		break;
+		case RADAR_SPRITE_STRIP:
+			text = TheText.Get("LG_37");
+		break;
+		case RADAR_SPRITE_ICE:
+			text = TheText.Get("LG_17");
+		break;
+		case RADAR_SPRITE_KCABS:
+			text = TheText.Get("LG_18");
+		break;
+		case RADAR_SPRITE_LOVEFIST:
+			text = TheText.Get("LG_19");
+		break;
+		case RADAR_SPRITE_PRINTWORKS:
+			text = TheText.Get("LG_20");
+		break;
+		case RADAR_SPRITE_PROPERTY:
+			text = TheText.Get("LG_21");
+		break;
+		case RADAR_SPRITE_SUNYARD:
+			text = TheText.Get("LG_36");
+		break;
+		case RADAR_SPRITE_SPRAY:
+			text = TheText.Get("LG_22");
+		break;
+		case RADAR_SPRITE_TSHIRT:
+			text = TheText.Get("LG_23");
+		break;
+		case RADAR_SPRITE_TOMMY:
+			text = TheText.Get("LG_24");
+		break;
+		case RADAR_SPRITE_PHONE:
+			text = TheText.Get("LG_25");
+		break;
+		case RADAR_SPRITE_RADIO_WILDSTYLE:
+			text = TheText.Get("LG_26");
+		break;
+		case RADAR_SPRITE_RADIO_FLASH:
+			text = TheText.Get("LG_27");
+		break;
+		case RADAR_SPRITE_RADIO_KCHAT:
+			text = TheText.Get("LG_28");
+		break;
+		case RADAR_SPRITE_RADIO_FEVER:
+			text = TheText.Get("LG_29");
+		break;
+		case RADAR_SPRITE_RADIO_VROCK:
+			text = TheText.Get("LG_30");
+		break;
+		case RADAR_SPRITE_RADIO_VCPR:
+			text = TheText.Get("LG_31");
+		break;
+		case RADAR_SPRITE_RADIO_ESPANTOSO:
+			text = TheText.Get("LG_32");
+		break;
+		case RADAR_SPRITE_RADIO_EMOTION:
+			text = TheText.Get("LG_33");
+		break;
+		case RADAR_SPRITE_RADIO_WAVE:
+			text = TheText.Get("LG_34");
+		break;
+		default:
+		break;
+	}
+	CFont::PrintString(SCREEN_SCALE_X(20.f) + x, SCREEN_SCALE_Y(3.0f) + y, text);
+}
diff --git a/src/core/Radar.h b/src/core/Radar.h
new file mode 100644
index 0000000..0829dda
--- /dev/null
+++ b/src/core/Radar.h
@@ -0,0 +1,289 @@
+#pragma once
+#include "Sprite2d.h"
+
+#define CARBLIP_MARKER_COLOR_R 252
+#define CARBLIP_MARKER_COLOR_G 138
+#define CARBLIP_MARKER_COLOR_B 242
+#define CARBLIP_MARKER_COLOR_A 255
+
+#define CHARBLIP_MARKER_COLOR_R 252
+#define CHARBLIP_MARKER_COLOR_G 138
+#define CHARBLIP_MARKER_COLOR_B 242
+#define CHARBLIP_MARKER_COLOR_A 255
+
+#define OBJECTBLIP_MARKER_COLOR_R 252
+#define OBJECTBLIP_MARKER_COLOR_G 138
+#define OBJECTBLIP_MARKER_COLOR_B 242
+#define OBJECTBLIP_MARKER_COLOR_A 255
+
+#define COORDBLIP_MARKER_COLOR_R 252
+#define COORDBLIP_MARKER_COLOR_G 138
+#define COORDBLIP_MARKER_COLOR_B 242
+#define COORDBLIP_MARKER_COLOR_A 228
+
+#define NUM_MAP_LEGENDS 75
+
+#define MENU_MAP_LENGTH_UNIT 1190.0f // in game unit
+#define MENU_MAP_WIDTH_SCALE 1.112f // in game unit (originally 1.112494151260504f)
+#define MENU_MAP_HEIGHT_SCALE 1.119f // in game unit (originally 1.118714268907563f)
+#define MENU_MAP_TOP_OFFSET 0.28f // in length unit defined above - ~333 game unit
+#define MENU_MAP_LEFT_OFFSET 0.185f // in length unit defined above - ~220 game unit
+#define MENU_MAP_LENGTH (4000.f / MENU_MAP_LENGTH_UNIT)
+
+enum eBlipType
+{
+	BLIP_NONE,
+	BLIP_CAR,
+	BLIP_CHAR,
+	BLIP_OBJECT,
+	BLIP_COORD,
+	BLIP_CONTACT_POINT
+};
+
+enum eBlipDisplay
+{
+	BLIP_DISPLAY_NEITHER = 0,
+	BLIP_DISPLAY_MARKER_ONLY = 1,
+	BLIP_DISPLAY_BLIP_ONLY = 2,
+	BLIP_DISPLAY_BOTH = 3,
+};
+
+enum eRadarSprite
+{
+	RADAR_SPRITE_ENTITY_BLIP = -2,
+	RADAR_SPRITE_COORD_BLIP = -1,
+	RADAR_SPRITE_NONE = 0,
+	RADAR_SPRITE_CENTRE,
+	RADAR_SPRITE_MAP_HERE,
+	RADAR_SPRITE_NORTH,
+	RADAR_SPRITE_AVERY,
+	RADAR_SPRITE_BIKER,
+	RADAR_SPRITE_CORTEZ,
+	RADAR_SPRITE_DIAZ,
+	RADAR_SPRITE_KENT,
+	RADAR_SPRITE_LAWYER,
+	RADAR_SPRITE_PHIL,
+	RADAR_SPRITE_BIKERS,
+	RADAR_SPRITE_BOATYARD,
+	RADAR_SPRITE_MALIBU_CLUB,
+	RADAR_SPRITE_CUBANS,
+	RADAR_SPRITE_FILM,
+	RADAR_SPRITE_GUN,
+	RADAR_SPRITE_HAITIANS,
+	RADAR_SPRITE_HARDWARE,
+	RADAR_SPRITE_SAVE,
+	RADAR_SPRITE_STRIP,
+	RADAR_SPRITE_ICE,
+	RADAR_SPRITE_KCABS,
+	RADAR_SPRITE_LOVEFIST,
+	RADAR_SPRITE_PRINTWORKS,
+	RADAR_SPRITE_PROPERTY,
+	RADAR_SPRITE_SUNYARD,
+	RADAR_SPRITE_SPRAY,
+	RADAR_SPRITE_TSHIRT,
+	RADAR_SPRITE_TOMMY,
+	RADAR_SPRITE_PHONE,
+	RADAR_SPRITE_RADIO_WILDSTYLE,
+	RADAR_SPRITE_RADIO_FLASH,
+	RADAR_SPRITE_RADIO_KCHAT,
+	RADAR_SPRITE_RADIO_FEVER,
+	RADAR_SPRITE_RADIO_VROCK,
+	RADAR_SPRITE_RADIO_VCPR,
+	RADAR_SPRITE_RADIO_ESPANTOSO,
+	RADAR_SPRITE_RADIO_EMOTION,
+	RADAR_SPRITE_RADIO_WAVE,
+
+	RADAR_SPRITE_COUNT
+};
+
+enum
+{
+	RADAR_TRACE_RED,
+	RADAR_TRACE_GREEN,
+	RADAR_TRACE_LIGHT_BLUE,
+	RADAR_TRACE_GRAY,
+	RADAR_TRACE_YELLOW,
+	RADAR_TRACE_MAGENTA,
+	RADAR_TRACE_CYAN
+};
+
+enum
+{
+	BLIP_MODE_TRIANGULAR_UP = 0,
+	BLIP_MODE_TRIANGULAR_DOWN,
+	BLIP_MODE_SQUARE,
+};
+
+struct sRadarTrace
+{
+	uint32 m_nColor;
+	uint32 m_eBlipType; // eBlipType
+	int32 m_nEntityHandle;
+	CVector m_vec2DPos;
+	CVector m_vecPos;
+	uint16 m_BlipIndex;
+	bool m_bDim;
+	bool m_bInUse;
+	bool m_bShortRange;
+	bool m_unused;
+	float m_Radius;
+	int16 m_wScale;
+	uint16 m_eBlipDisplay; // eBlipDisplay
+	uint16 m_eRadarSprite; // eRadarSprite
+};
+
+// Either that was a thing while saving/loading blips, or they added sizes of each field one by one. I want to do the former.
+#pragma pack(push,1)
+struct sRadarTraceSave
+{
+	uint32 m_nColor;
+	float m_Radius;
+	uint32 m_eBlipType; // eBlipType
+	int32 m_nEntityHandle;
+	CVector2D m_vec2DPos;
+	CVector m_vecPos;
+	uint16 m_BlipIndex;
+	bool m_bDim;
+	bool m_bInUse;
+	bool m_bShortRange;
+	bool m_unused;
+	int16 m_wScale;
+	uint16 m_eBlipDisplay; // eBlipDisplay
+	uint16 m_eRadarSprite; // eRadarSprite
+};
+#pragma pack(pop)
+
+// Values for screen space
+#define RADAR_LEFT (40.0f)
+#define RADAR_BOTTOM (40.0f)
+
+#ifdef FIX_RADAR
+/*
+	The values are from an early screenshot taken before R* broke radar
+		#define RADAR_WIDTH (82.0f)
+		#define RADAR_HEIGHT (82.0f)
+*/
+#define RADAR_WIDTH ((CDraw::ms_bFixRadar)  ? (82.0f) : (94.0f))	
+#define RADAR_HEIGHT ((CDraw::ms_bFixRadar) ? (82.0f) : (76.0f))
+#else
+/*
+	broken since forever, someone tried to fix size for 640x512(PAL)
+		http://aap.rockstarvision.com/pics/gta3/ps2screens/gta3_interface.jpg
+	but failed:
+		http://aap.rockstarvision.com/pics/gta3/artwork/gta3_artwork_16.jpg
+	most likely the guy used something like this:
+		int y = 82 * (640.0/512.0)/(640.0/480.0);
+		int x = y * (640.0/512.0);
+*/
+#define RADAR_WIDTH (94.0f)
+#define RADAR_HEIGHT (76.0f)
+#endif
+
+class CRadar
+{
+public:
+	static float m_radarRange;
+	static sRadarTrace ms_RadarTrace[NUMRADARBLIPS];
+	static CSprite2d CentreSprite;
+	static CSprite2d MapHereSprite;
+	static CSprite2d NorthSprite;
+	static CSprite2d AverySprite;
+	static CSprite2d BikerSprite;
+	static CSprite2d CortezSprite;
+	static CSprite2d DiazSprite;
+	static CSprite2d KentSprite;
+	static CSprite2d LawyerSprite;
+	static CSprite2d PhilSprite;
+	static CSprite2d BikersSprite;
+	static CSprite2d BoatyardSprite;
+	static CSprite2d MalibuClubSprite;
+	static CSprite2d CubansSprite;
+	static CSprite2d FilmSprite;
+	static CSprite2d GunSprite;
+	static CSprite2d HaitiansSprite;
+	static CSprite2d HardwareSprite;
+	static CSprite2d SaveHouseSprite;
+	static CSprite2d StripSprite;
+	static CSprite2d IceSprite;
+	static CSprite2d KCabsSprite;
+	static CSprite2d LovefistSprite;
+	static CSprite2d PrintworksSprite;
+	static CSprite2d PropertySprite;
+	static CSprite2d SunYardSprite;
+	static CSprite2d SpraySprite;
+	static CSprite2d TShirtSprite;
+	static CSprite2d TommySprite;
+	static CSprite2d PhoneSprite;
+	static CSprite2d RadioWildstyleSprite;
+	static CSprite2d RadioFlashSprite;
+	static CSprite2d RadioKChatSprite;
+	static CSprite2d RadioFeverSprite;
+	static CSprite2d RadioVRockSprite;
+	static CSprite2d RadioVCPRSprite;
+	static CSprite2d RadioEspantosoSprite;
+	static CSprite2d RadioEmotionSprite;
+	static CSprite2d RadioWaveSprite;
+	static CSprite2d *RadarSprites[RADAR_SPRITE_COUNT];
+	static float cachedCos;
+	static float cachedSin;
+	static CRGBA ArrowBlipColour1;
+	static CRGBA ArrowBlipColour2;
+	static int16 MapLegendList[NUM_MAP_LEGENDS];
+	static int16 MapLegendCounter;
+
+#ifdef MAP_ENHANCEMENTS
+	static int TargetMarkerId;
+	static CVector TargetMarkerPos;
+#endif
+
+	static void InitFrontEndMap();
+	static void DrawYouAreHereSprite(float, float);
+#ifdef MAP_ENHANCEMENTS
+	static void ToggleTargetMarker(float, float);
+#endif
+	static uint8 CalculateBlipAlpha(float dist);
+	static void ChangeBlipBrightness(int32 i, int32 bright);
+	static void ChangeBlipColour(int32 i, int32);
+	static void ChangeBlipDisplay(int32 i, eBlipDisplay display);
+	static void ChangeBlipScale(int32 i, int32 scale);
+	static void ClearBlip(int32 i);
+	static void ClearBlipForEntity(eBlipType type, int32 id);
+	static int ClipRadarPoly(CVector2D *out, const CVector2D *in);
+	static bool DisplayThisBlip(int32 i);
+	static void Draw3dMarkers();
+	static void DrawBlips();
+	static void DrawMap();
+	static void DrawRadarMap();
+	static void DrawRadarMask();
+	static void DrawRadarSection(int32 x, int32 y);
+	static void DrawRadarSprite(uint16 sprite, float x, float y, uint8 alpha);
+	static void DrawRotatingRadarSprite(CSprite2d* sprite, float x, float y, float angle, int32 alpha);
+	static int32 GetActualBlipArrayIndex(int32 i);
+	static int32 GetNewUniqueBlipIndex(int32 i);
+	static uint32 GetRadarTraceColour(uint32 color, bool bright);
+	static void Initialise();
+	static float LimitRadarPoint(CVector2D &point);
+	static void LoadAllRadarBlips(uint8 *buf, uint32 size);
+	static void LoadTextures();
+	static void RemoveRadarSections();
+	static void SaveAllRadarBlips(uint8*, uint32*);
+	static void SetBlipSprite(int32 i, int32 icon);
+	static int32 SetCoordBlip(eBlipType type, CVector pos, uint32, eBlipDisplay);
+	static int32 SetEntityBlip(eBlipType type, int32, uint32, eBlipDisplay);
+	static int32 SetShortRangeCoordBlip(eBlipType type, CVector pos, uint32, eBlipDisplay);
+	static void SetRadarMarkerState(int32 i, bool flag);
+	static void ShowRadarMarker(CVector pos, uint32 color, float radius);
+	static void ShowRadarTrace(float x, float y, uint32 size, uint8 red, uint8 green, uint8 blue, uint8 alpha);
+	static void ShowRadarTraceWithHeight(float x, float y, uint32 size, uint8 red, uint8 green, uint8 blue, uint8 alpha, uint8 mode);
+	static void Shutdown();
+	static void StreamRadarSections(const CVector &posn);
+	static void StreamRadarSections(int32 x, int32 y);
+	static void TransformRealWorldToTexCoordSpace(CVector2D &out, const CVector2D &in, int32 x, int32 y);
+	static void TransformRadarPointToRealWorldSpace(CVector2D &out, const CVector2D &in);
+	static void TransformRadarPointToScreenSpace(CVector2D &out, const CVector2D &in);
+	static void TransformRealWorldPointToRadarSpace(CVector2D &out, const CVector2D &in);
+	static void CalculateCachedSinCos();
+	static void DrawEntityBlip(int32 blipId);
+	static void DrawCoordBlip(int32 blipId);
+	static void DrawLegend(int32, int32, int32);
+};
diff --git a/src/core/Range2D.cpp b/src/core/Range2D.cpp
new file mode 100644
index 0000000..33eafd0
--- /dev/null
+++ b/src/core/Range2D.cpp
@@ -0,0 +1,28 @@
+#include "common.h"
+#include "Range2D.h"
+#include "General.h"
+
+CRange2D::CRange2D(CVector2D _min, CVector2D _max) : min(_min), max(_max) {}
+
+bool
+CRange2D::IsInRange(CVector2D vec)
+{
+	return min.x < vec.x && max.x > vec.x && min.y < vec.y && max.y > vec.y;
+}
+
+void
+CRange2D::DebugShowRange(float, int)
+{
+}
+
+CVector2D
+CRange2D::GetRandomPointInRange()
+{
+	int distX = Abs(max.x - min.x);
+	int distY = Abs(max.y - min.y);
+
+	float outX = CGeneral::GetRandomNumber() % distX + min.x;
+	float outY = CGeneral::GetRandomNumber() % distY + min.y;
+
+	return CVector2D(outX, outY);
+}
diff --git a/src/core/Range2D.h b/src/core/Range2D.h
new file mode 100644
index 0000000..f239e7d
--- /dev/null
+++ b/src/core/Range2D.h
@@ -0,0 +1,11 @@
+#pragma once
+
+class CRange2D
+{
+	CVector2D min, max;
+public:
+	CRange2D(CVector2D _min, CVector2D _max);
+	bool IsInRange(CVector2D vec);
+	void DebugShowRange(float, int);
+	CVector2D GetRandomPointInRange();
+};
\ No newline at end of file
diff --git a/src/core/Range3D.cpp b/src/core/Range3D.cpp
new file mode 100644
index 0000000..7fa28d6
--- /dev/null
+++ b/src/core/Range3D.cpp
@@ -0,0 +1,30 @@
+#include "common.h"
+#include "Range3D.h"
+#include "General.h"
+
+CRange3D::CRange3D(CVector _min, CVector _max) : min(_min), max(_max) {}
+
+bool
+CRange3D::IsInRange(CVector vec)
+{
+	return min.x < vec.x && max.x > vec.x && min.y < vec.y && max.y > vec.y && min.z < vec.z && max.z > vec.z;
+}
+
+void
+CRange3D::DebugShowRange(float, int)
+{
+}
+
+CVector
+CRange3D::GetRandomPointInRange()
+{
+	int distX = Abs(max.x - min.x);
+	int distY = Abs(max.y - min.y);
+	int distZ = Abs(max.z - min.z);
+
+	float outX = CGeneral::GetRandomNumber() % distX + min.x;
+	float outY = CGeneral::GetRandomNumber() % distY + min.y;
+	float outZ = CGeneral::GetRandomNumber() % distZ + min.z;
+
+	return CVector(outX, outY, outZ);
+}
diff --git a/src/core/Range3D.h b/src/core/Range3D.h
new file mode 100644
index 0000000..f42b523
--- /dev/null
+++ b/src/core/Range3D.h
@@ -0,0 +1,11 @@
+#pragma once
+
+class CRange3D
+{
+	CVector min, max;
+public:
+	CRange3D(CVector _min, CVector _max);
+	bool IsInRange(CVector vec);
+	void DebugShowRange(float, int);
+	CVector GetRandomPointInRange();
+};
\ No newline at end of file
diff --git a/src/core/References.cpp b/src/core/References.cpp
new file mode 100644
index 0000000..dc83d96
--- /dev/null
+++ b/src/core/References.cpp
@@ -0,0 +1,145 @@
+#include "common.h"
+
+#include "World.h"
+#include "Vehicle.h"
+#include "PlayerPed.h"
+#include "Pools.h"
+#include "References.h"
+
+CReference CReferences::aRefs[NUMREFERENCES];
+CReference *CReferences::pEmptyList;
+
+void
+CReferences::Init(void)
+{
+	int i;
+	pEmptyList = &aRefs[0];
+	for(i = 0; i < NUMREFERENCES; i++){
+		aRefs[i].pentity = nil;
+		aRefs[i].next = &aRefs[i+1];
+	}
+	aRefs[NUMREFERENCES-1].next = nil;
+}
+
+void
+CEntity::RegisterReference(CEntity **pent)
+{
+	if(IsBuilding())
+		return;
+	CReference *ref;
+	// check if already registered
+	for(ref = m_pFirstReference; ref; ref = ref->next)
+		if(ref->pentity == pent)
+			return;
+	// have to allocate new reference
+	ref = CReferences::pEmptyList;
+	if(ref){
+		CReferences::pEmptyList = ref->next;
+
+		ref->pentity = pent;
+		ref->next = m_pFirstReference;
+		m_pFirstReference = ref;
+		return;
+	}
+	return;
+}
+
+// Clean up the reference from *pent -> 'this'
+void
+CEntity::CleanUpOldReference(CEntity **pent)
+{
+	CReference* ref, ** lastnextp;
+	lastnextp = &m_pFirstReference;
+	for (ref = m_pFirstReference; ref; ref = ref->next) {
+		if (ref->pentity == pent) {
+			*lastnextp = ref->next;
+			ref->next = CReferences::pEmptyList;
+			CReferences::pEmptyList = ref;
+			break;
+		}
+		lastnextp = &ref->next;
+	}
+}
+
+// Clear all references to this entity
+void
+CEntity::ResolveReferences(void)
+{
+	CReference *ref;
+	// clear pointers to this entity
+	for(ref = m_pFirstReference; ref; ref = ref->next)
+		if(*ref->pentity == this)
+			*ref->pentity = nil;
+	// free list
+	if(m_pFirstReference){
+		for(ref = m_pFirstReference; ref->next; ref = ref->next)
+			;
+		ref->next = CReferences::pEmptyList;
+		CReferences::pEmptyList = m_pFirstReference;
+		m_pFirstReference = nil;
+	}
+}
+
+// Free all references that no longer point to this entity
+void
+CEntity::PruneReferences(void)
+{
+	CReference *ref, *next, **lastnextp;
+	lastnextp = &m_pFirstReference;
+	for(ref = m_pFirstReference; ref; ref = next){
+		next = ref->next;
+		if(*ref->pentity == this)
+			lastnextp = &ref->next;
+		else{
+			*lastnextp = ref->next;
+			ref->next = CReferences::pEmptyList;
+			CReferences::pEmptyList = ref;
+		}
+	}
+}
+
+void
+CReferences::RemoveReferencesToPlayer(void)
+{
+	if(FindPlayerVehicle())
+		FindPlayerVehicle()->ResolveReferences();
+#ifdef FIX_BUGS
+	if (FindPlayerPed()) {
+		CPlayerPed* pPlayerPed = FindPlayerPed();
+		FindPlayerPed()->ResolveReferences();
+		CWorld::Players[CWorld::PlayerInFocus].m_pPed = pPlayerPed;
+		pPlayerPed->RegisterReference((CEntity**)&CWorld::Players[CWorld::PlayerInFocus].m_pPed);
+	}
+#else
+	if(FindPlayerPed())
+		FindPlayerPed()->ResolveReferences();
+#endif
+}
+
+void
+CReferences::PruneAllReferencesInWorld(void)
+{
+	int i;
+	CEntity *e;
+
+	i = CPools::GetPedPool()->GetSize();
+	while(--i >= 0){
+		e = CPools::GetPedPool()->GetSlot(i);
+		if(e)
+			e->PruneReferences();
+	}
+
+	i = CPools::GetVehiclePool()->GetSize();
+	while(--i >= 0){
+		e = CPools::GetVehiclePool()->GetSlot(i);
+		if(e)
+			e->PruneReferences();
+	}
+
+	i = CPools::GetObjectPool()->GetSize();
+	while(--i >= 0){
+		e = CPools::GetObjectPool()->GetSlot(i);
+		if(e)
+			e->PruneReferences();
+	}
+}
diff --git a/src/core/References.h b/src/core/References.h
new file mode 100644
index 0000000..e7a64de
--- /dev/null
+++ b/src/core/References.h
@@ -0,0 +1,20 @@
+#pragma once
+
+class CEntity;
+
+struct CReference
+{
+	CReference *next;
+	CEntity **pentity;
+};
+
+class CReferences
+{
+public:
+	static CReference aRefs[NUMREFERENCES];
+	static CReference *pEmptyList;
+
+	static void Init(void);
+	static void RemoveReferencesToPlayer(void);
+	static void PruneAllReferencesInWorld(void);
+};
diff --git a/src/core/Ropes.cpp b/src/core/Ropes.cpp
new file mode 100644
index 0000000..e390a91
--- /dev/null
+++ b/src/core/Ropes.cpp
@@ -0,0 +1,176 @@
+#include "common.h"
+
+#include "main.h"
+#include "Timer.h"
+#include "ModelIndices.h"
+#include "Streaming.h"
+#include "CopPed.h"
+#include "Population.h"
+#include "RenderBuffer.h"
+#include "Camera.h"
+#include "Ropes.h"
+
+CRope CRopes::aRopes[8];
+
+RwImVertexIndex RopeIndices[64] = {
+	0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7,
+	7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 13, 13, 14, 14, 15,
+	15, 16, 16, 17, 17, 18, 18, 19, 19, 20, 20, 21, 21, 22, 22, 23,
+	23, 24, 24, 25, 25, 26, 26, 27, 27, 28, 28, 29, 29, 30, 30, 31,
+	31, 32	// unused
+};
+
+void
+CRope::Update(void)
+{
+	int i;
+	float step = Pow(0.85f, CTimer::GetTimeStep());
+	if(!m_bWasRegistered && CTimer::GetTimeInMilliseconds() > m_updateTimer){
+		m_speed[0].z -= 0.0015f*CTimer::GetTimeStep();
+		m_pos[0] += m_speed[0]*CTimer::GetTimeStep();
+	}
+	for(i = 1; i < ARRAY_SIZE(m_pos); i++){
+		CVector prevPos = m_pos[i];
+		m_pos[i] += m_speed[i]*step*CTimer::GetTimeStep();
+		m_pos[i].z -= 0.05f*CTimer::GetTimeStep();
+		CVector dist = m_pos[i] - m_pos[i-1];
+		m_pos[i] = m_pos[i-1] + (0.625f/dist.Magnitude())*dist;
+		m_speed[i] = (m_pos[i] - prevPos)/CTimer::GetTimeStep();
+	}
+	if(!m_bWasRegistered && m_pos[0].z < 0.0f)
+		m_bActive = false;
+	m_bWasRegistered = false;
+}
+
+void
+CRope::Render(void)
+{
+	int i;
+	int numVerts = 0;
+	if(!TheCamera.IsSphereVisible(m_pos[16], 20.0f))
+		return;
+
+	for(i = 0; i < ARRAY_SIZE(m_pos); i++){
+		RwIm3DVertexSetRGBA(&TempBufferRenderVertices[i], 128, 128, 128, 100);
+		RwIm3DVertexSetPos(&TempBufferRenderVertices[i], m_pos[i].x, m_pos[i].y, m_pos[i].z);
+	}
+
+	RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void*)TRUE);
+	RwRenderStateSet(rwRENDERSTATESRCBLEND, (void*)rwBLENDSRCALPHA);
+	RwRenderStateSet(rwRENDERSTATEDESTBLEND, (void*)rwBLENDINVSRCALPHA);
+	RwRenderStateSet(rwRENDERSTATETEXTURERASTER, nil);
+
+	if(RwIm3DTransform(TempBufferRenderVertices, ARRAY_SIZE(m_pos), nil, rwIM3D_VERTEXXYZ|rwIM3D_VERTEXRGBA)){
+#ifdef FIX_BUGS
+		RwIm3DRenderIndexedPrimitive(rwPRIMTYPELINELIST, RopeIndices, 2*(ARRAY_SIZE(m_pos)-1));
+#else
+		RwIm3DRenderIndexedPrimitive(rwPRIMTYPEPOLYLINE, RopeIndices, 2*(ARRAY_SIZE(m_pos)-1));
+#endif
+		RwIm3DEnd();
+	}
+}
+
+
+void
+CRopes::Init(void)
+{
+	int i;
+	for(i = 0; i < ARRAY_SIZE(aRopes); i++)
+		aRopes[i].m_bActive = false;
+}
+
+void
+CRopes::Update(void)
+{
+	int i;
+	for(i = 0; i < ARRAY_SIZE(aRopes); i++)
+		if(aRopes[i].m_bActive)
+			aRopes[i].Update();
+}
+
+void
+CRopes::Render(void)
+{
+	int i;
+	PUSH_RENDERGROUP("CRopes::Render");
+	for(i = 0; i < ARRAY_SIZE(aRopes); i++)
+		if(aRopes[i].m_bActive)
+			aRopes[i].Render();
+	POP_RENDERGROUP();
+}
+
+bool
+CRopes::RegisterRope(uintptr id, CVector pos, bool setUpdateTimer)
+{
+	int i, j;
+	for(i = 0; i < ARRAY_SIZE(aRopes); i++){
+		if(aRopes[i].m_bActive && aRopes[i].m_id == id){
+			aRopes[i].m_pos[0] = pos;
+			aRopes[i].m_speed[0] = CVector(0.0f, 0.0f, 0.0f);
+			aRopes[i].m_bWasRegistered = true;
+			return true;
+		}
+	}
+	for(i = 0; i < ARRAY_SIZE(aRopes); i++)
+		if(!aRopes[i].m_bActive){
+			aRopes[i].m_id = id;
+			aRopes[i].m_pos[0] = pos;
+			aRopes[i].m_speed[0] = CVector(0.0f, 0.0f, 0.0f);
+			aRopes[i].m_unk = false;
+			aRopes[i].m_bWasRegistered = true;
+			aRopes[i].m_updateTimer = setUpdateTimer ? CTimer::GetTimeInMilliseconds() + 20000 : 0;
+			for(j = 1; j < ARRAY_SIZE(aRopes[0].m_pos); j++){
+				if(j & 1)
+					aRopes[i].m_pos[j] = aRopes[i].m_pos[j-1] + CVector(0.0f, 0.0f, 0.625f);
+				else
+					aRopes[i].m_pos[j] = aRopes[i].m_pos[j-1] - CVector(0.0f, 0.0f, 0.625f);
+				aRopes[i].m_speed[j] = CVector(0.0f, 0.0f, 0.0f);
+			}
+			aRopes[i].m_bActive = true;
+			return true;
+		}
+	return false;
+}
+
+void
+CRopes::SetSpeedOfTopNode(uintptr id, CVector speed)
+{
+	int i;
+	for(i = 0; i < ARRAY_SIZE(aRopes); i++)
+		if(aRopes[i].m_bActive && aRopes[i].m_id == id){
+			aRopes[i].m_speed[0] = speed;
+			return;
+		}
+}
+
+bool
+CRopes::FindCoorsAlongRope(uintptr id, float t, CVector *coors)
+{
+	int i, j;
+	float f;
+	for(i = 0; i < ARRAY_SIZE(aRopes); i++)
+		if(aRopes[i].m_bActive && aRopes[i].m_id == id){
+			t = (ARRAY_SIZE(aRopes[0].m_pos)-1)*clamp(t, 0.0f, 0.999f);
+			j = t;
+			f = t - j; 
+			*coors = (1.0f-f)*aRopes[i].m_pos[j] + f*aRopes[i].m_pos[j+1];
+			return true;
+		}
+	return false;
+}
+
+bool
+CRopes::CreateRopeWithSwatComingDown(CVector pos)
+{
+	static uint32 ropeId = 0;
+
+	if(!CStreaming::HasModelLoaded(MI_SWAT) || !RegisterRope(ropeId+100, pos, true))
+		return false;
+	CCopPed *swat = (CCopPed*)CPopulation::AddPed(PEDTYPE_COP, COP_HELI_SWAT, pos);
+	swat->bUsesCollision = false;
+	swat->m_pRopeEntity = (CEntity*)1;
+	swat->m_nRopeID = 100 + ropeId;
+	CAnimManager::BlendAnimation(swat->GetClump(), ASSOCGRP_STD, ANIM_STD_ABSEIL, 4.0f);
+	ropeId++;
+	return true;
+}
diff --git a/src/core/Ropes.h b/src/core/Ropes.h
new file mode 100644
index 0000000..7930fa9
--- /dev/null
+++ b/src/core/Ropes.h
@@ -0,0 +1,31 @@
+#pragma once
+
+class CRope
+{
+public:
+	bool m_bActive;
+	bool m_bWasRegistered;
+	bool m_unk;
+	uintptr m_id;
+	uint32 m_updateTimer;
+	CVector m_pos[32];
+	CVector m_speed[32];
+
+	void Update(void);
+	void Render(void);
+};
+
+class CRopes
+{
+	static CRope aRopes[8];
+
+public:
+
+	static void Init(void);
+	static void Update(void);
+	static void Render(void);
+	static bool RegisterRope(uintptr id, CVector pos, bool setUpdateTimer);
+	static void SetSpeedOfTopNode(uintptr id, CVector speed);
+	static bool FindCoorsAlongRope(uintptr id, float t, CVector *coors);
+	static bool CreateRopeWithSwatComingDown(CVector pos);
+};
diff --git a/src/core/Stats.cpp b/src/core/Stats.cpp
new file mode 100644
index 0000000..7ada0da
--- /dev/null
+++ b/src/core/Stats.cpp
@@ -0,0 +1,1439 @@
+#include "common.h"
+
+#include "Stats.h"
+#include "Text.h"
+#include "World.h"
+#include "Pad.h"
+#include "DMAudio.h"
+#include "main.h"
+#include "Font.h"
+#include "Frontend.h"
+#include "audio_enums.h"
+
+#include <climits>
+
+#ifdef USE_PRECISE_MEASUREMENT_CONVERTION
+#define MILES_IN_METER 0.000621371192f
+#define FEET_IN_METER 3.28084f
+#else
+#define MILES_IN_METER (1 / 1670.f)
+#define FEET_IN_METER 3.33f
+#endif
+
+int32 CStats::SeagullsKilled;
+int32 CStats::BoatsExploded;
+int32 CStats::WantedStarsAttained;
+int32 CStats::WantedStarsEvaded;
+int32 CStats::DaysPassed;
+int32 CStats::HeadsPopped;
+int32 CStats::CommercialPassed;
+int32 CStats::IndustrialPassed;
+int32 CStats::SuburbanPassed;
+int32 CStats::NumberKillFrenziesPassed;
+int32 CStats::PeopleKilledByOthers;
+int32 CStats::HelisDestroyed;
+int32 CStats::PedsKilledOfThisType[NUM_PEDTYPES];
+int32 CStats::TimesDied;
+int32 CStats::TimesArrested;
+int32 CStats::KillsSinceLastCheckpoint;
+float CStats::DistanceTravelledByCar;
+float CStats::DistanceTravelledByHelicoptor;
+float CStats::DistanceTravelledByBike;
+float CStats::DistanceTravelledByBoat;
+float CStats::DistanceTravelledByPlane;
+float CStats::DistanceTravelledByGolfCart;
+float CStats::DistanceTravelledOnFoot;
+int32 CStats::FlightTime;
+int32 CStats::TimesDrowned;
+int32 CStats::PhotosTaken;
+float CStats::LoanSharks;
+float CStats::StoresKnockedOff;
+float CStats::MovieStunts;
+float CStats::Assassinations;
+float CStats::PizzasDelivered;
+float CStats::GarbagePickups;
+float CStats::IceCreamSold;
+float CStats::TopShootingRangeScore;
+float CStats::ShootingRank;
+float CStats::ProgressMade;
+float CStats::TotalProgressInGame;
+int32 CStats::CarsExploded;
+int32 CStats::PeopleKilledByPlayer;
+float CStats::MaximumJumpDistance;
+float CStats::MaximumJumpHeight;
+int32 CStats::MaximumJumpFlips;
+int32 CStats::MaximumJumpSpins;
+int32 CStats::BestStuntJump;
+int32 CStats::NumberOfUniqueJumpsFound;
+int32 CStats::TotalNumberOfUniqueJumps;
+int32 CStats::PassengersDroppedOffWithTaxi;
+int32 CStats::MoneyMadeWithTaxi;
+int32 CStats::MissionsGiven;
+int32 CStats::MissionsPassed;
+char CStats::LastMissionPassedName[8];
+int32 CStats::TotalLegitimateKills;
+int32 CStats::LivesSavedWithAmbulance;
+int32 CStats::CriminalsCaught;
+int32 CStats::HighestLevelAmbulanceMission;
+int32 CStats::HighestLevelVigilanteMission;
+int32 CStats::HighestLevelFireMission;
+int32 CStats::FiresExtinguished;
+int32 CStats::TotalNumberKillFrenzies;
+int32 CStats::TotalNumberMissions;
+int32 CStats::RoundsFiredByPlayer;
+int32 CStats::KgsOfExplosivesUsed;
+int32 CStats::BulletsThatHit;
+int32 CStats::BestTimeBombDefusal;
+int32 CStats::FastestTimes[CStats::TOTAL_FASTEST_TIMES];
+int32 CStats::HighestScores[CStats::TOTAL_HIGHEST_SCORES];
+int32 CStats::BestPositions[CStats::TOTAL_BEST_POSITIONS];
+bool CStats::PropertyOwned[CStats::TOTAL_PROPERTIES];
+int32 CStats::NumPropertyOwned;
+int32 CStats::PropertyDestroyed;
+float CStats::HighestChaseValue;
+int32 CStats::CheatedCount;
+int32 CStats::ShowChaseStatOnScreen;
+int32 CStats::PamphletMissionPassed;
+bool CStats::abSonyCDs[1];
+int32 CStats::BloodRingKills;
+int32 CStats::BloodRingTime;
+float CStats::FavoriteRadioStationList[NUM_RADIOS];
+
+int32 CStats::Sprayings;
+float CStats::AutoPaintingBudget;
+int32 CStats::NoMoreHurricanes;
+float CStats::FashionBudget;
+float CStats::PropertyBudget;
+float CStats::WeaponBudget;
+int32 CStats::SafeHouseVisits;
+int32 CStats::TyresPopped;
+
+int32 CStats::LongestWheelie;
+int32 CStats::LongestStoppie;
+int32 CStats::Longest2Wheel;
+float CStats::LongestWheelieDist;
+float CStats::LongestStoppieDist;
+float CStats::Longest2WheelDist;
+
+void CStats::Init()
+{
+	PeopleKilledByOthers = 0;
+	PeopleKilledByPlayer = 0;
+	CarsExploded = 0;
+	BoatsExploded = 0;
+	RoundsFiredByPlayer = 0;
+	for (int i = 0; i < NUM_PEDTYPES; i++)
+		PedsKilledOfThisType[i] = 0;
+	HelisDestroyed = 0;
+	ProgressMade = 0.0f;
+	KgsOfExplosivesUsed = 0;
+	BulletsThatHit = 0;
+	TyresPopped = 0;
+	HeadsPopped = 0;
+	WantedStarsAttained = 0;
+	WantedStarsEvaded = 0;
+	TimesArrested = 0;
+	TimesDied = 0;
+	DaysPassed = 0;
+	SafeHouseVisits = 0;
+	Sprayings = 0;
+	MaximumJumpDistance = 0;
+	MaximumJumpHeight = 0;
+	MaximumJumpFlips = 0;
+	MaximumJumpSpins = 0;
+	BestStuntJump = 0;
+	NumberOfUniqueJumpsFound = 0;
+	TotalNumberOfUniqueJumps = 0;
+	MissionsGiven = 0;
+	MissionsPassed = 0;
+	PassengersDroppedOffWithTaxi = 0;
+	MoneyMadeWithTaxi = 0;
+	DistanceTravelledOnFoot = 0;
+	DistanceTravelledByCar = 0;
+	DistanceTravelledByBike = 0;
+	DistanceTravelledByBoat = 0;
+	DistanceTravelledByGolfCart = 0;
+	DistanceTravelledByHelicoptor = 0;
+#ifdef FIX_BUGS
+	DistanceTravelledByPlane = 0;
+#endif
+	LivesSavedWithAmbulance = 0;
+	CriminalsCaught = 0;
+	HighestLevelVigilanteMission = 0;
+	HighestLevelAmbulanceMission = 0;
+	HighestLevelFireMission = 0;
+	FiresExtinguished = 0;
+	PhotosTaken = 0;
+	NumberKillFrenziesPassed = 0;
+	TotalNumberKillFrenzies = 0;
+	TotalNumberMissions = 0;
+	FlightTime = 0;
+	TimesDrowned = 0;
+	SeagullsKilled = 0;
+	WeaponBudget = 0.0f;
+	FashionBudget = 0.0f;
+	LoanSharks = 0.0f;
+	StoresKnockedOff = 0.0f;
+	MovieStunts = 0.0f;
+	Assassinations = 0.0f;
+	PizzasDelivered = 0.0f;
+	GarbagePickups = 0.0f;
+	IceCreamSold = 0.0f;
+	TopShootingRangeScore = 0.0f;
+	ShootingRank = 0.0f;
+	LongestWheelie = 0;
+	LongestStoppie = 0;
+	Longest2Wheel = 0;
+	LongestWheelieDist = 0.0f;
+	LongestStoppieDist = 0.0f;
+	Longest2WheelDist = 0.0f;
+	PropertyBudget = 0.0f;
+	AutoPaintingBudget = 0.0f;
+	PropertyDestroyed = 0;
+	HighestChaseValue = 0.0f;
+	CheatedCount = 0;
+
+	for (int i = 0; i < TOTAL_FASTEST_TIMES; i++)
+		FastestTimes[i] = 0;
+	for (int i = 0; i < TOTAL_HIGHEST_SCORES; i++)
+		HighestScores[i] = 0;
+	for (int i = 0; i < TOTAL_BEST_POSITIONS; i++)
+		BestPositions[i] = INT_MAX;
+
+	KillsSinceLastCheckpoint = 0;
+	TotalLegitimateKills = 0;
+
+	for (int i = 0; i < ARRAY_SIZE(LastMissionPassedName); i++)
+		LastMissionPassedName[i] = 0;
+
+	IndustrialPassed = 0;
+	CommercialPassed = 0;
+	SuburbanPassed = 0;
+	PamphletMissionPassed = 0;
+	NoMoreHurricanes = 0;
+	ShowChaseStatOnScreen = 0;
+	for (int i = 0; i < ARRAY_SIZE(abSonyCDs); i++)
+		abSonyCDs[i] = 0;
+	PopulateFavoriteRadioStationList();
+
+	NumPropertyOwned = 0;
+	for (int i = 0; i < TOTAL_PROPERTIES; i++)
+		PropertyOwned[i] = false;
+
+	BloodRingKills = 0;
+	BloodRingTime = 0;
+}
+
+void CStats::RegisterFastestTime(int32 index, int32 time)
+{
+	assert(index >= 0 && index < TOTAL_FASTEST_TIMES);
+	if (FastestTimes[index] == 0)
+		FastestTimes[index] = time;
+	else
+		FastestTimes[index] = Min(FastestTimes[index], time);
+}
+
+void CStats::RegisterHighestScore(int32 index, int32 score)
+{
+	assert(index >= 0 && index < TOTAL_HIGHEST_SCORES);
+	HighestScores[index] = Max(HighestScores[index], score);
+}
+
+void CStats::RegisterBestPosition(int32 index, int32 position)
+{
+	assert(index >= 0 && index < TOTAL_BEST_POSITIONS);
+	BestPositions[index] = Min(BestPositions[index], position);
+}
+
+void CStats::AnotherLifeSavedWithAmbulance()
+{
+	++LivesSavedWithAmbulance;
+}
+
+void CStats::AnotherCriminalCaught()
+{
+	++CriminalsCaught;
+}
+
+void CStats::RegisterLevelAmbulanceMission(int32 level)
+{
+	HighestLevelAmbulanceMission = Max(HighestLevelAmbulanceMission, level);
+}
+
+void CStats::RegisterLevelVigilanteMission(int32 level)
+{
+	HighestLevelVigilanteMission = Max(HighestLevelVigilanteMission, level);
+}
+
+void CStats::RegisterLevelFireMission(int32 level)
+{
+	HighestLevelFireMission = Max(HighestLevelFireMission, level);
+}
+
+void CStats::AnotherFireExtinguished()
+{
+	++FiresExtinguished;
+}
+
+void CStats::AnotherKillFrenzyPassed()
+{
+	++NumberKillFrenziesPassed;
+}
+
+void CStats::SetTotalNumberKillFrenzies(int32 total)
+{
+	TotalNumberKillFrenzies = total;
+}
+
+void CStats::SetTotalNumberMissions(int32 total)
+{
+	TotalNumberMissions = total;
+}
+
+wchar *CStats::FindCriminalRatingString()
+{
+	int rating = FindCriminalRatingNumber();
+
+	if (rating < 0) {
+		if (rating > -500) return TheText.Get("RATNG53");
+		if (rating > -2000) return TheText.Get("RATNG54");
+		if (rating > -4000) return TheText.Get("RATNG55");
+		if (rating > -6000) return TheText.Get("RATNG56");
+		return TheText.Get("RATNG57");
+	}
+	if (rating < 20) return TheText.Get("RATNG1");
+	if (rating < 50) return TheText.Get("RATNG2");
+	if (rating < 75) return TheText.Get("RATNG3");
+	if (rating < 100) return TheText.Get("RATNG4");
+	if (rating < 120) return TheText.Get("RATNG5");
+	if (rating < 150) return TheText.Get("RATNG6");
+	if (rating < 200) return TheText.Get("RATNG7");
+	if (rating < 240) return TheText.Get("RATNG8");
+	if (rating < 270) return TheText.Get("RATNG9");
+	if (rating < 300) return TheText.Get("RATNG10");
+	if (rating < 335) return TheText.Get("RATNG11");
+	if (rating < 370) return TheText.Get("RATNG12");
+	if (rating < 400) return TheText.Get("RATNG13");
+	if (rating < 450) return TheText.Get("RATNG14");
+	if (rating < 500) return TheText.Get("RATNG15");
+	if (rating < 550) return TheText.Get("RATNG16");
+	if (rating < 600) return TheText.Get("RATNG17");
+	if (rating < 610) return TheText.Get("RATNG18");
+	if (rating < 650) return TheText.Get("RATNG19");
+	if (rating < 700) return TheText.Get("RATNG20");
+	if (rating < 850) return TheText.Get("RATNG21");
+	if (rating < 1000) return TheText.Get("RATNG22");
+	if (rating < 1005) return TheText.Get("RATNG23");
+	if (rating < 1150) return TheText.Get("RATNG24");
+	if (rating < 1300) return TheText.Get(TimesArrested > 0 ? "RATNG25" : "RATNG24");
+	if (rating < 1500) return TheText.Get("RATNG26");
+	if (rating < 1700) return TheText.Get("RATNG27");
+	if (rating < 2000) return TheText.Get("RATNG28");
+	if (rating < 2100) return TheText.Get("RATNG29");
+	if (rating < 2300) return TheText.Get("RATNG30");
+	if (rating < 2500) return TheText.Get("RATNG31");
+	if (rating < 2750) return TheText.Get("RATNG32");
+	if (rating < 3000) return TheText.Get("RATNG33");
+	if (rating < 3500) return TheText.Get("RATNG34");
+	if (rating < 4000) return TheText.Get("RATNG35");
+	if (rating < 5000) return TheText.Get("RATNG36");
+	if (rating < 7500) return TheText.Get("RATNG37");
+	if (rating < 10000) return TheText.Get("RATNG38");
+	if (rating < 20000) return TheText.Get("RATNG39");
+	if (rating < 30000) return TheText.Get("RATNG40");
+	if (rating < 40000) return TheText.Get("RATNG41");
+	if (rating < 50000) return TheText.Get("RATNG42");
+	if (rating < 65000) return TheText.Get("RATNG43");
+	if (rating < 80000) return TheText.Get("RATNG44");
+	if (rating < 100000) return TheText.Get("RATNG45");
+	if (rating < 150000) return TheText.Get("RATNG46");
+	if (rating < 200000) return TheText.Get("RATNG47");
+	if (rating < 300000) return TheText.Get("RATNG48");
+	if (rating < 375000) return TheText.Get("RATNG49");
+	if (rating < 500000) return TheText.Get(FlightTime / 60000 / 60 > 10 ? "RATNG50" : "RATNG49");
+	if (rating < 1000000) return TheText.Get("RATNG51");
+	return TheText.Get(CWorld::Players[CWorld::PlayerInFocus].m_nVisibleMoney > 10000000 ? "RATNG52" : "RATNG51");
+}
+
+wchar *CStats::FindChaseString(float fMediaLevel) {
+	if (fMediaLevel < 20.0f) return TheText.Get("CHASE1");
+	if (fMediaLevel < 50.0f) return TheText.Get("CHASE2");
+	if (fMediaLevel < 75.0f) return TheText.Get("CHASE3");
+	if (fMediaLevel < 100.0f) return TheText.Get("CHASE4");
+	if (fMediaLevel < 150.0f) return TheText.Get("CHASE5");
+	if (fMediaLevel < 200.0f) return TheText.Get("CHASE6");
+	if (fMediaLevel < 250.0f) return TheText.Get("CHASE7");
+	if (fMediaLevel < 300.0f) return TheText.Get("CHASE8");
+	if (fMediaLevel < 350.0f) return TheText.Get("CHASE9");
+	if (fMediaLevel < 400.0f) return TheText.Get("CHASE10");
+	if (fMediaLevel < 500.0f) return TheText.Get("CHASE11");
+	if (fMediaLevel < 600.0f) return TheText.Get("CHASE12");
+	if (fMediaLevel < 700.0f) return TheText.Get("CHASE13");
+	if (fMediaLevel < 800.0f) return TheText.Get("CHASE14");
+	if (fMediaLevel < 900.0f) return TheText.Get("CHASE15");
+	if (fMediaLevel < 1000.0f) return TheText.Get("CHASE16");
+	if (fMediaLevel < 1200.0f) return TheText.Get("CHASE17");
+	if (fMediaLevel < 1400.0f) return TheText.Get("CHASE18");
+	if (fMediaLevel < 1600.0f) return TheText.Get("CHASE19");
+	if (fMediaLevel < 1800.0f) return TheText.Get("CHASE20");
+	return TheText.Get("CHASE21");
+}
+
+int32 CStats::FindCriminalRatingNumber()
+{
+	int32 rating;
+
+	rating = FiresExtinguished + 10 * HighestLevelFireMission + 10 * HighestLevelAmbulanceMission
+		+ CriminalsCaught + LivesSavedWithAmbulance
+		+ 30 * HelisDestroyed + TotalLegitimateKills - 3 * TimesArrested - 3 * TimesDied
+		+ CWorld::Players[CWorld::PlayerInFocus].m_nMoney / 5000;
+	if (CPad::bHasPlayerCheated || CheatedCount > 0) {
+		rating -= CheatedCount;
+		if (rating <= -10000)
+			rating = -10000;
+
+	} else if (rating <= 0) {
+		rating = 0;
+	}
+
+	if (RoundsFiredByPlayer > 100)
+		rating += (float)BulletsThatHit / (float)RoundsFiredByPlayer * 500.0f;
+	if (TotalProgressInGame)
+		rating += ProgressMade / TotalProgressInGame * 1000.0f;
+	return rating;
+}
+
+float CStats::GetPercentageProgress()
+{
+	float percentCompleted = (TotalProgressInGame == 0.f ? 0.f :
+		100.0f * ProgressMade / (CGame::nastyGame ? TotalProgressInGame : TotalProgressInGame - 1.0f));
+
+	return Min(percentCompleted, 100.0f);
+}
+
+void CStats::MoneySpentOnWeapons(int32 money)
+{
+	WeaponBudget += money;
+}
+
+void CStats::MoneySpentOnProperty(int32 money)
+{
+	PropertyBudget += money;
+}
+
+void CStats::MoneySpentOnAutoPainting(int32 money)
+{
+	AutoPaintingBudget += money;
+}
+
+void CStats::MoneySpentOnFashion(int32 money)
+{
+	FashionBudget += money;
+}
+
+void CStats::NumOfVisitsFromLoanSharks(int32 num)
+{
+	LoanSharks += num;
+}
+
+void CStats::NumOfStoresKnockedOff(int32 num)
+{
+	StoresKnockedOff += num;
+}
+
+void CStats::NumOfMovieStunts(int32 num)
+{
+	MovieStunts += num;
+}
+
+void CStats::NumOfAssassinations(int32 num)
+{
+	Assassinations += num;
+}
+
+void CStats::NumOfPizzasDelivered(int32 num)
+{
+	PizzasDelivered += num;
+}
+
+void CStats::NumOfGarbagePickups(int32 num)
+{
+	GarbagePickups += num;
+}
+
+void CStats::NumOfIceCreamSold(int32 num)
+{
+	IceCreamSold += num;
+}
+
+void CStats::AddNumBloodRingKills(int32 num)
+{
+	BloodRingKills += num;
+}
+
+void CStats::LongestTimeInBloodRing(int32 time)
+{
+	if (BloodRingTime < time)
+		BloodRingTime = time;
+}
+
+void CStats::AddPropertyAsOwned(int32 id)
+{
+	if (!PropertyOwned[id]) {
+		PropertyOwned[id] = true;
+		++NumPropertyOwned;
+	}
+}
+
+float CStats::GetFavoriteRadioStationList(int32 station)
+{
+	return FavoriteRadioStationList[station];
+}
+
+void CStats::SaveStats(uint8 *buf, uint32 *size)
+{
+	CheckPointReachedSuccessfully();
+	uint8 *buf_start = buf;
+	*size = sizeof(PeopleKilledByPlayer) +
+		sizeof(PeopleKilledByOthers) +
+		sizeof(CarsExploded) +
+		sizeof(BoatsExploded) +
+		sizeof(TyresPopped) +
+		sizeof(RoundsFiredByPlayer) +
+		sizeof(PedsKilledOfThisType) +
+		sizeof(HelisDestroyed) +
+		sizeof(ProgressMade) +
+		sizeof(TotalProgressInGame) +
+		sizeof(KgsOfExplosivesUsed) +
+		sizeof(BulletsThatHit) +
+		sizeof(HeadsPopped) +
+		sizeof(WantedStarsAttained) +
+		sizeof(WantedStarsEvaded) +
+		sizeof(TimesArrested) +
+		sizeof(TimesDied) +
+		sizeof(DaysPassed) +
+		sizeof(SafeHouseVisits) +
+		sizeof(Sprayings) +
+		sizeof(MaximumJumpDistance) +
+		sizeof(MaximumJumpHeight) +
+		sizeof(MaximumJumpFlips) +
+		sizeof(MaximumJumpSpins) +
+		sizeof(BestStuntJump) +
+		sizeof(NumberOfUniqueJumpsFound) +
+		sizeof(TotalNumberOfUniqueJumps) +
+		sizeof(MissionsGiven) +
+		sizeof(PassengersDroppedOffWithTaxi) +
+		sizeof(MoneyMadeWithTaxi) +
+		sizeof(IndustrialPassed) +
+		sizeof(CommercialPassed) +
+		sizeof(SuburbanPassed) +
+		sizeof(PamphletMissionPassed) +
+		sizeof(NoMoreHurricanes) +
+		sizeof(DistanceTravelledOnFoot) +
+		sizeof(DistanceTravelledByCar) +
+		sizeof(DistanceTravelledByBike) +
+		sizeof(DistanceTravelledByBoat) +
+		sizeof(DistanceTravelledByGolfCart) +
+		sizeof(DistanceTravelledByHelicoptor) +
+		sizeof(DistanceTravelledByPlane) +
+		sizeof(LivesSavedWithAmbulance) +
+		sizeof(CriminalsCaught) +
+		sizeof(FiresExtinguished) +
+		sizeof(HighestLevelVigilanteMission) +
+		sizeof(HighestLevelAmbulanceMission) +
+		sizeof(HighestLevelFireMission) +
+		sizeof(PhotosTaken) +
+		sizeof(NumberKillFrenziesPassed) +
+		sizeof(TotalNumberKillFrenzies) +
+		sizeof(TotalNumberMissions) +
+		sizeof(FlightTime) +
+		sizeof(TimesDrowned) +
+		sizeof(SeagullsKilled) +
+		sizeof(WeaponBudget) +
+		sizeof(FashionBudget) +
+		sizeof(LoanSharks) +
+		sizeof(StoresKnockedOff) +
+		sizeof(MovieStunts) +
+		sizeof(Assassinations) +
+		sizeof(PizzasDelivered) +
+		sizeof(GarbagePickups) +
+		sizeof(IceCreamSold) +
+		sizeof(TopShootingRangeScore) +
+		sizeof(ShootingRank) +
+		sizeof(LongestWheelie) +
+		sizeof(LongestStoppie) +
+		sizeof(Longest2Wheel) +
+		sizeof(LongestWheelieDist) +
+		sizeof(LongestStoppieDist) +
+		sizeof(Longest2WheelDist) +
+		sizeof(PropertyBudget) +
+		sizeof(AutoPaintingBudget) +
+		sizeof(PropertyDestroyed) +
+		sizeof(NumPropertyOwned) +
+		sizeof(BloodRingKills) +
+		sizeof(BloodRingTime) +
+		sizeof(PropertyOwned) +
+		sizeof(HighestChaseValue) +
+		sizeof(FastestTimes) +
+		sizeof(HighestScores) +
+		sizeof(BestPositions) +
+		sizeof(KillsSinceLastCheckpoint) +
+		sizeof(TotalLegitimateKills) +
+		sizeof(LastMissionPassedName) +
+		sizeof(CheatedCount) +
+		sizeof(FavoriteRadioStationList);
+
+#define CopyToBuf(buf, data) memcpy(buf, &data, sizeof(data)); buf += sizeof(data);
+	CopyToBuf(buf, PeopleKilledByPlayer);
+	CopyToBuf(buf, PeopleKilledByOthers);
+	CopyToBuf(buf, CarsExploded);
+	CopyToBuf(buf, BoatsExploded);
+	CopyToBuf(buf, TyresPopped);
+	CopyToBuf(buf, RoundsFiredByPlayer);
+	CopyToBuf(buf, PedsKilledOfThisType);
+	CopyToBuf(buf, HelisDestroyed);
+	CopyToBuf(buf, ProgressMade);
+	CopyToBuf(buf, TotalProgressInGame);
+	CopyToBuf(buf, KgsOfExplosivesUsed);
+	CopyToBuf(buf, BulletsThatHit);
+	CopyToBuf(buf, HeadsPopped);
+	CopyToBuf(buf, WantedStarsAttained);
+	CopyToBuf(buf, WantedStarsEvaded);
+	CopyToBuf(buf, TimesArrested);
+	CopyToBuf(buf, TimesDied);
+	CopyToBuf(buf, DaysPassed);
+	CopyToBuf(buf, SafeHouseVisits);
+	CopyToBuf(buf, Sprayings);
+	CopyToBuf(buf, MaximumJumpDistance);
+	CopyToBuf(buf, MaximumJumpHeight);
+	CopyToBuf(buf, MaximumJumpFlips);
+	CopyToBuf(buf, MaximumJumpSpins);
+	CopyToBuf(buf, BestStuntJump);
+	CopyToBuf(buf, NumberOfUniqueJumpsFound);
+	CopyToBuf(buf, TotalNumberOfUniqueJumps);
+	CopyToBuf(buf, MissionsGiven);
+	CopyToBuf(buf, PassengersDroppedOffWithTaxi);
+	CopyToBuf(buf, MoneyMadeWithTaxi);
+	CopyToBuf(buf, IndustrialPassed);
+	CopyToBuf(buf, CommercialPassed);
+	CopyToBuf(buf, SuburbanPassed);
+	CopyToBuf(buf, PamphletMissionPassed);
+	CopyToBuf(buf, NoMoreHurricanes);
+	CopyToBuf(buf, DistanceTravelledOnFoot);
+	CopyToBuf(buf, DistanceTravelledByCar);
+	CopyToBuf(buf, DistanceTravelledByBike);
+	CopyToBuf(buf, DistanceTravelledByBoat);
+	CopyToBuf(buf, DistanceTravelledByGolfCart);
+	CopyToBuf(buf, DistanceTravelledByHelicoptor);
+	CopyToBuf(buf, DistanceTravelledByPlane);
+	CopyToBuf(buf, LivesSavedWithAmbulance);
+	CopyToBuf(buf, CriminalsCaught);
+	CopyToBuf(buf, FiresExtinguished);
+	CopyToBuf(buf, HighestLevelVigilanteMission);
+	CopyToBuf(buf, HighestLevelAmbulanceMission);
+	CopyToBuf(buf, HighestLevelFireMission);
+	CopyToBuf(buf, PhotosTaken);
+	CopyToBuf(buf, NumberKillFrenziesPassed);
+	CopyToBuf(buf, TotalNumberKillFrenzies);
+	CopyToBuf(buf, TotalNumberMissions);
+	CopyToBuf(buf, FlightTime);
+	CopyToBuf(buf, TimesDrowned);
+	CopyToBuf(buf, SeagullsKilled);
+	CopyToBuf(buf, WeaponBudget);
+	CopyToBuf(buf, FashionBudget);
+	CopyToBuf(buf, LoanSharks);
+	CopyToBuf(buf, StoresKnockedOff);
+	CopyToBuf(buf, MovieStunts);
+	CopyToBuf(buf, Assassinations);
+	CopyToBuf(buf, PizzasDelivered);
+	CopyToBuf(buf, GarbagePickups);
+	CopyToBuf(buf, IceCreamSold);
+	CopyToBuf(buf, TopShootingRangeScore);
+	CopyToBuf(buf, ShootingRank);
+	CopyToBuf(buf, LongestWheelie);
+	CopyToBuf(buf, LongestStoppie);
+	CopyToBuf(buf, Longest2Wheel);
+	CopyToBuf(buf, LongestWheelieDist);
+	CopyToBuf(buf, LongestStoppieDist);
+	CopyToBuf(buf, Longest2WheelDist);
+	CopyToBuf(buf, PropertyBudget);
+	CopyToBuf(buf, AutoPaintingBudget);
+	CopyToBuf(buf, PropertyDestroyed);
+	CopyToBuf(buf, NumPropertyOwned);
+	CopyToBuf(buf, BloodRingKills);
+	CopyToBuf(buf, BloodRingTime);
+	CopyToBuf(buf, PropertyOwned);
+	CopyToBuf(buf, HighestChaseValue);
+	CopyToBuf(buf, FastestTimes);
+	CopyToBuf(buf, HighestScores);
+	CopyToBuf(buf, BestPositions);
+	CopyToBuf(buf, KillsSinceLastCheckpoint);
+	CopyToBuf(buf, TotalLegitimateKills);
+	CopyToBuf(buf, LastMissionPassedName);
+	CopyToBuf(buf, CheatedCount);
+	PopulateFavoriteRadioStationList();
+	CopyToBuf(buf, FavoriteRadioStationList);
+
+	assert(buf - buf_start == *size);
+#undef CopyToBuf
+}
+
+void CStats::LoadStats(uint8 *buf, uint32 size)
+{
+	uint8* buf_start = buf;
+
+#define CopyFromBuf(buf, data) memcpy(&data, buf, sizeof(data)); buf += sizeof(data);
+
+	CopyFromBuf(buf, PeopleKilledByPlayer);
+	CopyFromBuf(buf, PeopleKilledByOthers);
+	CopyFromBuf(buf, CarsExploded);
+	CopyFromBuf(buf, BoatsExploded);
+	CopyFromBuf(buf, TyresPopped);
+	CopyFromBuf(buf, RoundsFiredByPlayer);
+	CopyFromBuf(buf, PedsKilledOfThisType);
+	CopyFromBuf(buf, HelisDestroyed);
+	CopyFromBuf(buf, ProgressMade);
+	CopyFromBuf(buf, TotalProgressInGame);
+	CopyFromBuf(buf, KgsOfExplosivesUsed);
+	CopyFromBuf(buf, BulletsThatHit);
+	CopyFromBuf(buf, HeadsPopped);
+	CopyFromBuf(buf, WantedStarsAttained);
+	CopyFromBuf(buf, WantedStarsEvaded);
+	CopyFromBuf(buf, TimesArrested);
+	CopyFromBuf(buf, TimesDied);
+	CopyFromBuf(buf, DaysPassed);
+	CopyFromBuf(buf, SafeHouseVisits);
+	CopyFromBuf(buf, Sprayings);
+	CopyFromBuf(buf, MaximumJumpDistance);
+	CopyFromBuf(buf, MaximumJumpHeight);
+	CopyFromBuf(buf, MaximumJumpFlips);
+	CopyFromBuf(buf, MaximumJumpSpins);
+	CopyFromBuf(buf, BestStuntJump);
+	CopyFromBuf(buf, NumberOfUniqueJumpsFound);
+	CopyFromBuf(buf, TotalNumberOfUniqueJumps);
+	CopyFromBuf(buf, MissionsGiven);
+	CopyFromBuf(buf, PassengersDroppedOffWithTaxi);
+	CopyFromBuf(buf, MoneyMadeWithTaxi);
+	CopyFromBuf(buf, IndustrialPassed);
+	CopyFromBuf(buf, CommercialPassed);
+	CopyFromBuf(buf, SuburbanPassed);
+	CopyFromBuf(buf, PamphletMissionPassed);
+	CopyFromBuf(buf, NoMoreHurricanes);
+	CopyFromBuf(buf, DistanceTravelledOnFoot);
+	CopyFromBuf(buf, DistanceTravelledByCar);
+	CopyFromBuf(buf, DistanceTravelledByBike);
+	CopyFromBuf(buf, DistanceTravelledByBoat);
+	CopyFromBuf(buf, DistanceTravelledByGolfCart);
+	CopyFromBuf(buf, DistanceTravelledByHelicoptor);
+	CopyFromBuf(buf, DistanceTravelledByPlane);
+	CopyFromBuf(buf, LivesSavedWithAmbulance);
+	CopyFromBuf(buf, CriminalsCaught);
+	CopyFromBuf(buf, FiresExtinguished);
+	CopyFromBuf(buf, HighestLevelVigilanteMission);
+	CopyFromBuf(buf, HighestLevelAmbulanceMission);
+	CopyFromBuf(buf, HighestLevelFireMission);
+	CopyFromBuf(buf, PhotosTaken);
+	CopyFromBuf(buf, NumberKillFrenziesPassed);
+	CopyFromBuf(buf, TotalNumberKillFrenzies);
+	CopyFromBuf(buf, TotalNumberMissions);
+	CopyFromBuf(buf, FlightTime);
+	CopyFromBuf(buf, TimesDrowned);
+	CopyFromBuf(buf, SeagullsKilled);
+	CopyFromBuf(buf, WeaponBudget);
+	CopyFromBuf(buf, FashionBudget);
+	CopyFromBuf(buf, LoanSharks);
+	CopyFromBuf(buf, StoresKnockedOff);
+	CopyFromBuf(buf, MovieStunts);
+	CopyFromBuf(buf, Assassinations);
+	CopyFromBuf(buf, PizzasDelivered);
+	CopyFromBuf(buf, GarbagePickups);
+	CopyFromBuf(buf, IceCreamSold);
+	CopyFromBuf(buf, TopShootingRangeScore);
+	CopyFromBuf(buf, ShootingRank);
+	CopyFromBuf(buf, LongestWheelie);
+	CopyFromBuf(buf, LongestStoppie);
+	CopyFromBuf(buf, Longest2Wheel);
+	CopyFromBuf(buf, LongestWheelieDist);
+	CopyFromBuf(buf, LongestStoppieDist);
+	CopyFromBuf(buf, Longest2WheelDist);
+	CopyFromBuf(buf, PropertyBudget);
+	CopyFromBuf(buf, AutoPaintingBudget);
+	CopyFromBuf(buf, PropertyDestroyed);
+	CopyFromBuf(buf, NumPropertyOwned);
+	CopyFromBuf(buf, BloodRingKills);
+	CopyFromBuf(buf, BloodRingTime);
+	CopyFromBuf(buf, PropertyOwned);
+	CopyFromBuf(buf, HighestChaseValue);
+	CopyFromBuf(buf, FastestTimes);
+	CopyFromBuf(buf, HighestScores);
+	CopyFromBuf(buf, BestPositions);
+	CopyFromBuf(buf, KillsSinceLastCheckpoint);
+	CopyFromBuf(buf, TotalLegitimateKills);
+	CopyFromBuf(buf, LastMissionPassedName);
+	CopyFromBuf(buf, CheatedCount);
+	CopyFromBuf(buf, FavoriteRadioStationList);
+
+	assert(buf - buf_start == size);
+#undef CopyFromBuf
+}
+
+void
+CStats::PopulateFavoriteRadioStationList()
+{
+	float* pListenTimeArray = DMAudio.GetListenTimeArray();
+	for (int i = 0; i < NUM_RADIOS; i++)
+		FavoriteRadioStationList[i] = pListenTimeArray[i];
+}
+
+void
+CStats::BuildStatLine(Const char *text, void *stat, int displayType, void *stat2, int isTime)
+{
+#define STAT_D *(int*)stat
+#define STAT_F *(float*)stat
+#define STAT2_D *(int*)stat2
+#define STAT2_F *(float*)stat2
+	if (!text)
+		return;
+
+	gString2[0] = '\0';
+	if (isTime == 1) {
+		if (*((int*)stat2) >= 10)
+			sprintf(gString2, " %d:%d", STAT_D, STAT2_D);
+		else
+			sprintf(gString2, " %d:0%d", STAT_D, STAT2_D);
+
+	} else if (stat2) {
+#ifdef MORE_LANGUAGES
+		if (CFont::IsJapanese()) {
+			switch (displayType) {
+				case 0:
+				case 4:
+				sprintf(gString2, "  %d/%d", STAT_D, STAT2_D);
+				break;
+				case 1:
+				sprintf(gString2, "  %.2f/%.2f", STAT_F, STAT2_F);
+				break;
+				case 2:
+				sprintf(gString2, "  %d%%/%d%%", STAT_D, STAT2_D);
+				break;
+				case 3:
+				sprintf(gString2, "  $%.2f/$%.2f", STAT_F, STAT2_F);
+				break;
+				default:
+				break;
+			}
+		} else
+#endif
+		{
+			switch (displayType) {
+				case 0:
+				sprintf(gString2, "  %d %s %d", STAT_D, UnicodeToAscii(TheText.Get("FEST_OO")), STAT2_D);
+				break;
+				case 1:
+				sprintf(gString2, "  %.2f %s %.2f", STAT_F, UnicodeToAscii(TheText.Get("FEST_OO")), STAT2_F);
+				break;
+				case 2:
+				sprintf(gString2, "  %d%% %s %d%%", STAT_D, UnicodeToAscii(TheText.Get("FEST_OO")), STAT2_D);
+				break;
+				case 3:
+				sprintf(gString2, "  $%.2f %s $%.2f", STAT_F, UnicodeToAscii(TheText.Get("FEST_OO")), STAT2_F);
+				break;
+				case 4:
+				sprintf(gString2, "  %d_ %s %d_", STAT_D, UnicodeToAscii(TheText.Get("FEST_OO")), STAT2_D);
+				break;
+				default:
+				break;
+			}
+		}
+	} else if (stat) {
+		switch (displayType) {
+			case 0:
+			sprintf(gString2, "%d", STAT_D);
+			break;
+			case 1:
+			sprintf(gString2, "%.2f", STAT_F);
+			break;
+			case 2:
+			sprintf(gString2, "%d%%", STAT_D);
+			break;
+			case 3:
+			sprintf(gString2, "$%.2f", STAT_F);
+			break;
+			case 4:
+#ifdef MORE_LANGUAGES
+			if (CFont::IsJapanese())
+				sprintf(gString2, "%d", STAT_D);
+			else
+#endif
+				sprintf(gString2, "%d_", STAT_D);
+			break;
+			default:
+			break;
+		}
+	}
+	UnicodeStrcpy(gUString, TheText.Get(text));
+	CFont::FilterOutTokensFromString(gUString);
+	AsciiToUnicode(gString2, gUString2);
+#undef STAT_D
+#undef STAT_F
+#undef STAT2_D
+#undef STAT2_F
+}
+
+// rowIdx 99999 returns total numbers of rows. otherwise it returns 0.
+int
+CStats::ConstructStatLine(int rowIdx)
+{
+
+#define STAT_LINE_1(varType, left, right1, type) \
+	do { \
+		if(counter == rowIdx){ \
+			varType a = right1; \
+			BuildStatLine(left, &a, type, nil, 0); \
+			return 0; \
+		} counter++; \
+	} while(0)
+
+#define STAT_LINE_2(varType, left, right1, type, right2, time) \
+	do { \
+		if(counter == rowIdx){ \
+			varType a = right1; \
+			varType b = right2; \
+			BuildStatLine(left, &a, type, &b, time); \
+			return 0; \
+		} counter++; \
+	} while(0)
+
+#define TEXT_ON_LEFT_GXT(name) \
+	do { \
+		if(counter == rowIdx){ \
+			BuildStatLine(name, nil, 0, nil, 0); \
+			return 0; \
+		} counter++; \
+	} while(0)
+
+#define TEXT_ON_RIGHT(text) \
+	do { \
+		if(counter == rowIdx){ \
+			gUString[0] = '\0'; \
+			UnicodeStrcpy(gUString2, text); \
+			return 0; \
+		} counter++; \
+	} while(0)
+
+#define FASTEST_TIME(id, str) \
+	do { \
+		if(FastestTimes[id]) { \
+			if(counter == rowIdx){ \
+				int hour = 0, minute; \
+				for (int i = FastestTimes[id]; i > 59; i -= 60) hour++; \
+				for (minute = FastestTimes[id]; minute > 59; minute -= 60); \
+				if (minute < 0) minute = -minute; \
+				BuildStatLine(str, &hour, 0, &minute, 1); \
+				return 0; \
+			} \
+			counter++; \
+		} \
+	} while(0)
+
+	switch (rowIdx) {
+		case 0: {
+			int percentCompleted = GetPercentageProgress();
+			BuildStatLine("PER_COM", &percentCompleted, 2, nil, 0);
+			return 0;
+		}
+		case 1: {
+			BuildStatLine("NMISON", &MissionsGiven, 0, nil, 0);
+			return 0;
+		}
+		case 2: {
+			int hour = (CTimer::GetTimeInMilliseconds() / 60000) / 60;
+			int minute = (CTimer::GetTimeInMilliseconds() / 60000) % 60;
+			BuildStatLine("ST_TIME", &hour, 0, &minute, 1);
+			return 0;
+		}
+		case 3: {
+			BuildStatLine("DAYSPS", &DaysPassed, 0, nil, 0);
+			return 0;
+		}
+		case 4: {
+			BuildStatLine("NUMSHV", &SafeHouseVisits, 0, nil, 0);
+			return 0;
+		}
+	}
+	int counter = 5;
+	
+	if (CGame::nastyGame) {
+		STAT_LINE_2(int, "FEST_RP", NumberKillFrenziesPassed, 0, TotalNumberKillFrenzies, 0);
+	}
+	
+	CPlayerInfo &player = CWorld::Players[CWorld::PlayerInFocus];
+
+	// Hidden packages shouldn't be shown with percent
+#ifdef FIX_BUGS
+	STAT_LINE_2(int, "PERPIC", player.m_nCollectedPackages, 0, player.m_nTotalPackages, 0);
+#else
+	float fPackagesPercent = 0.0f;
+	if (player.m_nTotalPackages != 0)
+		fPackagesPercent = player.m_nCollectedPackages * 100.0f / player.m_nTotalPackages;
+
+	STAT_LINE_2(int, "PERPIC", fPackagesPercent, 0, 100, 0);
+#endif
+
+	if (CGame::nastyGame) {
+		STAT_LINE_1(int, "PE_WAST", PeopleKilledByPlayer, 0);
+		STAT_LINE_1(int, "PE_WSOT", PeopleKilledByOthers, 0);
+	}
+	STAT_LINE_1(int, "CAR_EXP", CarsExploded, 0);
+	STAT_LINE_1(int, "BOA_EXP", BoatsExploded, 0);
+	STAT_LINE_1(int, "HEL_DST", HelisDestroyed, 0);
+	STAT_LINE_1(int, "TYREPOP", TyresPopped, 0);
+	STAT_LINE_1(int, "ST_STAR", WantedStarsAttained, 0);
+	STAT_LINE_1(int, "ST_STGN", WantedStarsEvaded, 0);
+	STAT_LINE_1(int, "TM_BUST", TimesArrested, 0);
+	STAT_LINE_1(int, "TM_DED", TimesDied, 0);
+
+#ifdef MORE_LANGUAGES
+	// JP version removed it altogether actually
+	if (!CFont::IsJapanese())
+#endif
+	STAT_LINE_1(int, "ST_HEAD", HeadsPopped, 0);
+
+	static uint32 lastProcessedDay = UINT32_MAX;
+	static uint32 lastPoliceSpending = 0;
+
+	// What a random stat...
+	if (lastProcessedDay != DaysPassed) {
+		lastProcessedDay = DaysPassed;
+		lastPoliceSpending = (CTimer::GetTimeInMilliseconds() & 255 + 80) * 255.44f;
+	}
+	STAT_LINE_1(float, "DAYPLC", lastPoliceSpending, 3);
+
+	int mostPatheticGang = 0;
+	int mostKill = 0;
+	for (int i = PEDTYPE_GANG1; i < PEDTYPE_GANG9; ++i) {
+		if (CStats::PedsKilledOfThisType[i] > mostKill) {
+			mostKill = CStats::PedsKilledOfThisType[i];
+			mostPatheticGang = i;
+		}
+	}
+	if (mostPatheticGang > 0) {
+		TEXT_ON_LEFT_GXT("ST_GANG");
+
+		switch (mostPatheticGang) {
+			case PEDTYPE_GANG1:
+				TEXT_ON_RIGHT(TheText.Get("ST_GNG1"));
+				break;
+			case PEDTYPE_GANG2:
+				TEXT_ON_RIGHT(TheText.Get("ST_GNG2"));
+				break;
+			case PEDTYPE_GANG3:
+				TEXT_ON_RIGHT(TheText.Get("ST_GNG3"));
+				break;
+			case PEDTYPE_GANG4:
+				TEXT_ON_RIGHT(TheText.Get("ST_GNG4"));
+				break;
+			case PEDTYPE_GANG5:
+				TEXT_ON_RIGHT(TheText.Get("ST_GNG5"));
+				break;
+			case PEDTYPE_GANG6:
+				TEXT_ON_RIGHT(TheText.Get("ST_GNG6"));
+				break;
+			case PEDTYPE_GANG7:
+				TEXT_ON_RIGHT(TheText.Get("ST_GNG7"));
+				break;
+			case PEDTYPE_GANG8:
+				TEXT_ON_RIGHT(TheText.Get("ST_GNG8"));
+				break;
+			default:
+				break;
+		}
+	}
+
+	STAT_LINE_1(int, "GNG_WST", PedsKilledOfThisType[PEDTYPE_GANG9] + PedsKilledOfThisType[PEDTYPE_GANG8]
+			+ PedsKilledOfThisType[PEDTYPE_GANG7] + PedsKilledOfThisType[PEDTYPE_GANG6]
+			+ PedsKilledOfThisType[PEDTYPE_GANG5] + PedsKilledOfThisType[PEDTYPE_GANG4]
+			+ PedsKilledOfThisType[PEDTYPE_GANG3] + PedsKilledOfThisType[PEDTYPE_GANG2]
+			+ PedsKilledOfThisType[PEDTYPE_GANG1], 0);
+
+	STAT_LINE_1(int, "DED_CRI", PedsKilledOfThisType[PEDTYPE_CRIMINAL], 0);
+	STAT_LINE_1(int, "KGS_EXP", KgsOfExplosivesUsed, 0);
+	STAT_LINE_1(int, "BUL_FIR", RoundsFiredByPlayer, 0);
+	STAT_LINE_1(int, "BUL_HIT", BulletsThatHit, 0);
+;
+	STAT_LINE_1(int, "ACCURA", RoundsFiredByPlayer == 0 ? 0 : (BulletsThatHit * 100.0f / (float)RoundsFiredByPlayer), 2);
+
+	switch (FrontEndMenuManager.m_PrefsLanguage) {
+		case CMenuManager::LANGUAGE_AMERICAN:
+#ifndef USE_MEASUREMENTS_IN_METERS
+			STAT_LINE_1(float, "FEST_DF", DistanceTravelledOnFoot * MILES_IN_METER, 1);
+			STAT_LINE_1(float, "FEST_DC", DistanceTravelledByCar * MILES_IN_METER, 1);
+			STAT_LINE_1(float, "DISTBIK", DistanceTravelledByBike * MILES_IN_METER, 1);
+			STAT_LINE_1(float, "DISTBOA", DistanceTravelledByBoat * MILES_IN_METER, 1);
+			STAT_LINE_1(float, "DISTGOL", DistanceTravelledByGolfCart * MILES_IN_METER, 1);
+			STAT_LINE_1(float, "DISTHEL", DistanceTravelledByHelicoptor * MILES_IN_METER, 1);
+#ifdef FIX_BUGS
+			STAT_LINE_1(float, "TOT_DIS", (DistanceTravelledOnFoot + DistanceTravelledByCar + DistanceTravelledByBoat + DistanceTravelledByBike
+				+ DistanceTravelledByGolfCart + DistanceTravelledByHelicoptor + DistanceTravelledByPlane) * MILES_IN_METER, 1);
+			STAT_LINE_1(float, "MXCARD", MaximumJumpDistance * FEET_IN_METER, 1);
+			STAT_LINE_1(float, "MXCARJ", MaximumJumpHeight * FEET_IN_METER, 1);
+#else
+			STAT_LINE_1(float, "TOT_DIS", (DistanceTravelledOnFoot + DistanceTravelledByCar + DistanceTravelledByBoat + DistanceTravelledByBike
+				+ DistanceTravelledByGolfCart + DistanceTravelledByHelicoptor) * MILES_IN_METER, 1);
+#endif
+			break;
+#endif
+		case CMenuManager::LANGUAGE_FRENCH:
+		case CMenuManager::LANGUAGE_GERMAN:
+		case CMenuManager::LANGUAGE_ITALIAN:
+		case CMenuManager::LANGUAGE_SPANISH:
+#ifdef MORE_LANGUAGES
+		case CMenuManager::LANGUAGE_POLISH:
+		case CMenuManager::LANGUAGE_RUSSIAN:
+		case CMenuManager::LANGUAGE_JAPANESE:
+#endif
+			STAT_LINE_1(float, "FESTDFM", DistanceTravelledOnFoot, 1);
+			STAT_LINE_1(float, "FESTDCM", DistanceTravelledByCar, 1);
+			STAT_LINE_1(float, "DISTBIM", DistanceTravelledByBike, 1);
+			STAT_LINE_1(float, "DISTBOM", DistanceTravelledByBoat, 1);
+			STAT_LINE_1(float, "DISTGOM", DistanceTravelledByGolfCart, 1);
+			STAT_LINE_1(float, "DISTHEM", DistanceTravelledByHelicoptor, 1);
+#ifdef FIX_BUGS
+			STAT_LINE_1(float, "TOTDISM", DistanceTravelledOnFoot + DistanceTravelledByCar + DistanceTravelledByBoat
+				+ DistanceTravelledByBike + DistanceTravelledByGolfCart + DistanceTravelledByHelicoptor + DistanceTravelledByPlane, 1);
+			STAT_LINE_1(float, "MXCARDM", MaximumJumpDistance, 1);
+			STAT_LINE_1(float, "MXCARJM", MaximumJumpHeight, 1);
+#else
+			STAT_LINE_1(float, "TOTDISM", DistanceTravelledOnFoot + DistanceTravelledByCar + DistanceTravelledByBoat
+				+ DistanceTravelledByGolfCart + DistanceTravelledByHelicoptor, 1);
+#endif
+			break;
+		default:
+			break;
+	}
+
+	// They were selecting the unit according to language in III, but they deleted the feet code in VC. Weird
+#ifndef FIX_BUGS
+	STAT_LINE_1(float, "MXCARDM", MaximumJumpDistance, 1);
+	STAT_LINE_1(float, "MXCARJM", MaximumJumpHeight, 1);
+#endif
+	STAT_LINE_1(int, "MXFLIP", MaximumJumpFlips, 0);
+	STAT_LINE_2(int, "NOUNIF", NumberOfUniqueJumpsFound, 0, TotalNumberOfUniqueJumps, 0);
+	STAT_LINE_1(int, "MXJUMP", MaximumJumpSpins, 4);
+
+	TEXT_ON_LEFT_GXT("BSTSTU");
+	switch (BestStuntJump) {
+		case 1:
+			TEXT_ON_RIGHT(TheText.Get("INSTUN"));
+			break;
+		case 2:
+			TEXT_ON_RIGHT(TheText.Get("PRINST"));
+			break;
+		case 3:
+			TEXT_ON_RIGHT(TheText.Get("DBINST"));
+			break;
+		case 4:
+			TEXT_ON_RIGHT(TheText.Get("DBPINS"));
+			break;
+		case 5:
+			TEXT_ON_RIGHT(TheText.Get("TRINST"));
+			break;
+		case 6:
+			TEXT_ON_RIGHT(TheText.Get("PRTRST"));
+			break;
+		case 7:
+			TEXT_ON_RIGHT(TheText.Get("QUINST"));
+			break;
+		case 8:
+			TEXT_ON_RIGHT(TheText.Get("PQUINS"));
+			break;
+		default:
+			TEXT_ON_RIGHT(TheText.Get("NOSTUC"));
+			break;
+	}
+	STAT_LINE_1(int, "ST_WHEE", LongestWheelie, 0);
+	STAT_LINE_1(float, "ST_WHED", LongestWheelieDist, 1);
+	STAT_LINE_1(int, "ST_STOP", LongestStoppie, 0);
+	STAT_LINE_1(float, "ST_STOD", LongestStoppieDist, 1);
+	STAT_LINE_1(int, "ST_2WHE", Longest2Wheel, 0);
+	STAT_LINE_1(float, "ST_2WHD", Longest2WheelDist, 1);
+
+	if (LoanSharks > 0.0f)
+		STAT_LINE_1(int, "ST_LOAN", LoanSharks, 0);
+
+	STAT_LINE_1(int, "FEST_CC", CriminalsCaught, 0);
+	STAT_LINE_1(int, "FEST_HV", HighestLevelVigilanteMission, 0);
+	STAT_LINE_1(int, "PASDRO", PassengersDroppedOffWithTaxi, 0);
+	STAT_LINE_1(float, "MONTAX", MoneyMadeWithTaxi, 3);
+	STAT_LINE_1(int, "FEST_LS", LivesSavedWithAmbulance, 0);
+	STAT_LINE_1(int, "FEST_HA", HighestLevelAmbulanceMission, 0);
+	STAT_LINE_1(int, "FEST_FE", FiresExtinguished, 0);
+	STAT_LINE_1(int, "FIRELVL", HighestLevelFireMission, 0);
+
+	STAT_LINE_2(int, "ST_STOR", StoresKnockedOff, 0, 15, 0);
+
+	if (MovieStunts > 0.0f)
+		STAT_LINE_1(int, "ST_MOVI", MovieStunts, 0);
+
+	STAT_LINE_2(int, "ST_ASSI", Assassinations, 0, 5, 0);
+
+	if (PhotosTaken > 0)
+		STAT_LINE_1(int, "ST_PHOT", PhotosTaken, 0);
+
+	if (PizzasDelivered > 0.0f)
+		STAT_LINE_1(int, "ST_PIZZ", PizzasDelivered, 0);
+
+	if (GarbagePickups > 0.0f)
+		STAT_LINE_1(int, "ST_GARB", GarbagePickups, 0);
+
+	if (IceCreamSold > 0.0f)
+		STAT_LINE_1(int, "ST_ICEC", IceCreamSold, 0);
+
+	if (HighestScores[1])
+		STAT_LINE_1(int, "STHC_02", HighestScores[1], 0);
+
+	FASTEST_TIME(0, "STFT_01");
+	FASTEST_TIME(1, "STFT_02");
+	FASTEST_TIME(2, "STFT_03");
+	FASTEST_TIME(3, "STFT_04");
+	FASTEST_TIME(4, "STFT_05");
+	FASTEST_TIME(5, "STFT_06");
+	FASTEST_TIME(6, "STFT_07");
+	FASTEST_TIME(7, "STFT_08");
+	FASTEST_TIME(8, "STFT_09");
+	FASTEST_TIME(9, "STFT_10");
+	FASTEST_TIME(10, "STFT_11");
+	FASTEST_TIME(11, "STFT_12");
+	FASTEST_TIME(12, "STFT_13");
+	FASTEST_TIME(13, "STFT_14");
+	FASTEST_TIME(14, "STFT_15");
+	FASTEST_TIME(15, "STFT_16");
+	FASTEST_TIME(16, "STFT_17");
+	FASTEST_TIME(17, "STFT_18");
+	FASTEST_TIME(18, "STFT_19");
+	FASTEST_TIME(19, "STFT_20");
+	FASTEST_TIME(22, "STFT_23");
+
+	if (HighestScores[0])
+		STAT_LINE_1(int, "STHC_01", HighestScores[0], 0);
+
+	if (HighestScores[3])
+		STAT_LINE_1(int, "STHC_04", HighestScores[3], 0);
+
+	if (HighestScores[2])
+		STAT_LINE_1(int, "STHC_03", HighestScores[2], 0);
+
+	if (BestPositions[0] != INT_MAX)
+		STAT_LINE_1(int, "STHC_05", BestPositions[0], 0);
+
+	FASTEST_TIME(20, "STFT_21");
+
+	if (FastestTimes[21])
+		STAT_LINE_1(float, "STFT_22", FastestTimes[21] / 1000, 1);
+
+	if (TopShootingRangeScore > 0.0f)
+		STAT_LINE_1(int, "TOP_SHO", TopShootingRangeScore, 0);
+
+	if (ShootingRank > 0.0f)
+		STAT_LINE_1(int, "SHO_RAN", ShootingRank, 0);
+
+	int flightMinute = (FlightTime / 60000) % 60;
+	int flightHour = (FlightTime / 60000) / 60;
+	STAT_LINE_2(int, "ST_FTIM", flightHour, 0, flightMinute, 1);
+
+	// We always have pilot rank if we flew more then 5 minutes
+#ifndef FIX_BUGS
+	if (flightHour != 0)
+		TEXT_ON_LEFT_GXT("ST_PRAN");
+#endif
+
+#ifdef FIX_BUGS
+#define FL_TIME_MORE_THAN(hour, minute) (flightHour > hour || (flightHour == hour && flightMinute >= minute))
+#else
+#define FL_TIME_MORE_THAN(hour, minute) (flightHour > hour || flightMinute >= minute)
+#endif
+
+	if (FL_TIME_MORE_THAN(0,5)) {
+
+#ifdef FIX_BUGS
+		TEXT_ON_LEFT_GXT("ST_PRAN");
+#endif
+		if (!FL_TIME_MORE_THAN(0,10)) TEXT_ON_RIGHT(TheText.Get("ST_PR01"));
+		else if (!FL_TIME_MORE_THAN(0,20)) TEXT_ON_RIGHT(TheText.Get("ST_PR02"));
+		else if (!FL_TIME_MORE_THAN(0,30)) TEXT_ON_RIGHT(TheText.Get("ST_PR03"));
+		else if (!FL_TIME_MORE_THAN(1,0)) TEXT_ON_RIGHT(TheText.Get("ST_PR04"));
+		else if (!FL_TIME_MORE_THAN(1,30)) TEXT_ON_RIGHT(TheText.Get("ST_PR05"));
+		else if (!FL_TIME_MORE_THAN(2,0)) TEXT_ON_RIGHT(TheText.Get("ST_PR06"));
+		else if (!FL_TIME_MORE_THAN(2,30)) TEXT_ON_RIGHT(TheText.Get("ST_PR07"));
+		else if (!FL_TIME_MORE_THAN(3,0)) TEXT_ON_RIGHT(TheText.Get("ST_PR08"));
+		else if (!FL_TIME_MORE_THAN(3,30)) TEXT_ON_RIGHT(TheText.Get("ST_PR09"));
+		else if (!FL_TIME_MORE_THAN(4,0)) TEXT_ON_RIGHT(TheText.Get("ST_PR10"));
+		else if (!FL_TIME_MORE_THAN(5,0)) TEXT_ON_RIGHT(TheText.Get("ST_PR11"));
+		else if (!FL_TIME_MORE_THAN(10,0)) TEXT_ON_RIGHT(TheText.Get("ST_PR12"));
+		else if (!FL_TIME_MORE_THAN(20,0)) TEXT_ON_RIGHT(TheText.Get("ST_PR13"));
+		else if (!FL_TIME_MORE_THAN(25,0)) TEXT_ON_RIGHT(TheText.Get("ST_PR14"));
+		else if (!FL_TIME_MORE_THAN(30,0)) TEXT_ON_RIGHT(TheText.Get("ST_PR15"));
+		else if (!FL_TIME_MORE_THAN(49,2)) TEXT_ON_RIGHT(TheText.Get("ST_PR16"));
+		else if (!FL_TIME_MORE_THAN(50,0)) TEXT_ON_RIGHT(TheText.Get("ST_PR17"));
+		else if (!FL_TIME_MORE_THAN(100,0)) TEXT_ON_RIGHT(TheText.Get("ST_PR18"));
+		else TEXT_ON_RIGHT(TheText.Get("ST_PR19"));
+	}
+#undef FL_TIME_MORE_THAN
+
+	if (BloodRingKills > 0)
+		STAT_LINE_1(int, "ST_BRK", BloodRingKills, 0);
+
+	if (BloodRingTime > 0)
+		STAT_LINE_1(int, "ST_LTBR", BloodRingTime, 0);
+
+	STAT_LINE_1(int, "ST_DRWN", TimesDrowned, 0);
+
+	if (SeagullsKilled > 0)
+		STAT_LINE_1(int, "SEAGULL", SeagullsKilled, 0);
+
+	bool playerHatesRadio = true;
+	float* pListenTimeArray = DMAudio.GetListenTimeArray();
+	for (int i = 0; i < NUM_RADIOS; i++) {
+		FavoriteRadioStationList[i] = pListenTimeArray[i];
+		if (FavoriteRadioStationList[i] != 0.0) // double
+			playerHatesRadio = false;
+	}
+
+	if (!playerHatesRadio) {
+		// Most listened
+		TEXT_ON_LEFT_GXT("FST_MFR");
+		float mostListenTime = FavoriteRadioStationList[0];
+		int mostListenedRadio = 0;
+		for (int i = 0; i < NUM_RADIOS; i++) {
+			if (FavoriteRadioStationList[i] > mostListenTime) {
+				mostListenTime = FavoriteRadioStationList[i];
+				mostListenedRadio = i;
+			}
+		}
+		switch (mostListenedRadio) {
+			case WILDSTYLE:
+				TEXT_ON_RIGHT(TheText.Get("FEA_FM0"));
+				break;
+			case FLASH_FM:
+				TEXT_ON_RIGHT(TheText.Get("FEA_FM1"));
+				break;
+			case KCHAT:
+				TEXT_ON_RIGHT(TheText.Get("FEA_FM2"));
+				break;
+			case FEVER:
+				TEXT_ON_RIGHT(TheText.Get("FEA_FM3"));
+				break;
+			case V_ROCK:
+				TEXT_ON_RIGHT(TheText.Get("FEA_FM4"));
+				break;
+			case VCPR:
+				TEXT_ON_RIGHT(TheText.Get("FEA_FM5"));
+				break;
+			case RADIO_ESPANTOSO:
+				TEXT_ON_RIGHT(TheText.Get("FEA_FM6"));
+				break;
+			case EMOTION:
+				TEXT_ON_RIGHT(TheText.Get("FEA_FM7"));
+				break;
+			case WAVE:
+				TEXT_ON_RIGHT(TheText.Get("FEA_FM8"));
+				break;
+			case USERTRACK:
+				TEXT_ON_RIGHT(TheText.Get("FEA_MP3"));
+				break;
+			default:
+				TEXT_ON_RIGHT(TheText.Get("FEA_FM8")); // heh
+				break;
+		}
+
+		// Least listened
+		TEXT_ON_LEFT_GXT("FST_LFR");
+		float leastListenTime = FavoriteRadioStationList[0];
+		int leastListenedRadio = 0;
+		for (int i = 0; i < NUM_RADIOS; i++) {
+#ifdef FIX_BUGS
+			if (!DMAudio.IsMP3RadioChannelAvailable() && i == USERTRACK)
+				continue;
+#endif
+			if (FavoriteRadioStationList[i] < leastListenTime) {
+				leastListenTime = FavoriteRadioStationList[i];
+				leastListenedRadio = i;
+			}
+		}
+#ifndef FIX_BUGS
+		if (!DMAudio.IsMP3RadioChannelAvailable() && leastListenedRadio == USERTRACK)
+			leastListenedRadio = WAVE;
+#endif
+
+		switch (leastListenedRadio) {
+			case WILDSTYLE:
+				TEXT_ON_RIGHT(TheText.Get("FEA_FM0"));
+				break;
+			case FLASH_FM:
+				TEXT_ON_RIGHT(TheText.Get("FEA_FM1"));
+				break;
+			case KCHAT:
+				TEXT_ON_RIGHT(TheText.Get("FEA_FM2"));
+				break;
+			case FEVER:
+				TEXT_ON_RIGHT(TheText.Get("FEA_FM3"));
+				break;
+			case V_ROCK:
+				TEXT_ON_RIGHT(TheText.Get("FEA_FM4"));
+				break;
+			case VCPR:
+				TEXT_ON_RIGHT(TheText.Get("FEA_FM5"));
+				break;
+			case RADIO_ESPANTOSO:
+				TEXT_ON_RIGHT(TheText.Get("FEA_FM6"));
+				break;
+			case EMOTION:
+				TEXT_ON_RIGHT(TheText.Get("FEA_FM7"));
+				break;
+			case WAVE:
+				TEXT_ON_RIGHT(TheText.Get("FEA_FM8"));
+				break;
+			case USERTRACK:
+				TEXT_ON_RIGHT(TheText.Get("FEA_MP3"));
+				break;
+			default:
+				TEXT_ON_RIGHT(TheText.Get("FEA_FM8")); // heh
+				break;
+		}
+	}
+	STAT_LINE_1(int, "SPRAYIN", Sprayings, 0);
+	STAT_LINE_1(float, "ST_WEAP", WeaponBudget, 3);
+	STAT_LINE_1(float, "ST_FASH", FashionBudget, 3);
+	STAT_LINE_1(float, "ST_PROP", PropertyBudget, 3);
+	STAT_LINE_1(float, "ST_AUTO", AutoPaintingBudget, 3);
+	STAT_LINE_1(float, "ST_DAMA", PropertyBudget, 3);
+
+	if (NumPropertyOwned > 0) {
+		STAT_LINE_1(int, "PROPOWN", NumPropertyOwned, 0);
+		if (PropertyOwned[0]) TEXT_ON_RIGHT(TheText.Get("STPR_1"));
+		if (PropertyOwned[1]) TEXT_ON_RIGHT(TheText.Get("STPR_2"));
+		if (PropertyOwned[2]) TEXT_ON_RIGHT(TheText.Get("STPR_3"));
+		if (PropertyOwned[3]) TEXT_ON_RIGHT(TheText.Get("STPR_4"));
+		if (PropertyOwned[4]) TEXT_ON_RIGHT(TheText.Get("STPR_5"));
+		if (PropertyOwned[5]) TEXT_ON_RIGHT(TheText.Get("STPR_6"));
+		if (PropertyOwned[6]) TEXT_ON_RIGHT(TheText.Get("STPR_7"));
+		if (PropertyOwned[7]) TEXT_ON_RIGHT(TheText.Get("STPR_8"));
+		if (PropertyOwned[8]) TEXT_ON_RIGHT(TheText.Get("STPR_9"));
+		if (PropertyOwned[9]) TEXT_ON_RIGHT(TheText.Get("STPR_10"));
+		if (PropertyOwned[10]) TEXT_ON_RIGHT(TheText.Get("STPR_11"));
+		if (PropertyOwned[11]) TEXT_ON_RIGHT(TheText.Get("STPR_12"));
+		if (PropertyOwned[12]) TEXT_ON_RIGHT(TheText.Get("STPR_13"));
+		if (PropertyOwned[13]) TEXT_ON_RIGHT(TheText.Get("STPR_14"));
+		if (PropertyOwned[14]) TEXT_ON_RIGHT(TheText.Get("STPR_15"));
+	}
+	STAT_LINE_1(int, "CHASE", HighestChaseValue, 0);
+	TEXT_ON_RIGHT(FindChaseString(HighestChaseValue));
+
+	return counter;
+
+#undef STAT_LINE_1
+#undef STAT_LINE_2
+#undef TEXT_ON_LEFT_GXT
+#undef TEXT_ON_RIGHT
+#undef FASTEST_TIME
+}
diff --git a/src/core/Stats.h b/src/core/Stats.h
new file mode 100644
index 0000000..243ff0e
--- /dev/null
+++ b/src/core/Stats.h
@@ -0,0 +1,152 @@
+#pragma once
+
+#include "PedType.h"
+#include "audio_enums.h"
+
+class CStats
+{
+public:
+	enum {
+		TOTAL_FASTEST_TIMES = 23,
+		TOTAL_HIGHEST_SCORES = 5,
+		TOTAL_BEST_POSITIONS = 1,
+		TOTAL_PROPERTIES = 15
+	};
+	static int32 SeagullsKilled;
+	static int32 DaysPassed;
+	static int32 HeadsPopped;
+	static int32 CommercialPassed;
+	static int32 IndustrialPassed;
+	static int32 SuburbanPassed;
+	static int32 NumberKillFrenziesPassed;
+	static int32 PeopleKilledByOthers;
+	static int32 HelisDestroyed;
+	static int32 PedsKilledOfThisType[NUM_PEDTYPES];
+	static int32 TimesDied;
+	static int32 TimesArrested;
+	static int32 KillsSinceLastCheckpoint;
+	static float DistanceTravelledByCar;
+	static float DistanceTravelledByHelicoptor;
+	static float DistanceTravelledByBike;
+	static float DistanceTravelledByBoat;
+	static float DistanceTravelledByPlane;
+	static float DistanceTravelledByGolfCart;
+	static float DistanceTravelledOnFoot;
+	static int32 FlightTime;
+	static int32 TimesDrowned;
+	static int32 PhotosTaken;
+	static float LoanSharks;
+	static float StoresKnockedOff;
+	static float MovieStunts;
+	static float Assassinations;
+	static float PizzasDelivered;
+	static float GarbagePickups;
+	static float IceCreamSold;
+	static float TopShootingRangeScore;
+	static float ShootingRank;
+	static int32 CarsExploded;
+	static int32 BoatsExploded;
+	static int32 WantedStarsAttained;
+	static int32 WantedStarsEvaded;
+	static int32 PeopleKilledByPlayer;
+	static float ProgressMade;
+	static float TotalProgressInGame;
+	static float MaximumJumpDistance;
+	static float MaximumJumpHeight;
+	static int32 MaximumJumpFlips;
+	static int32 MaximumJumpSpins;
+	static int32 BestStuntJump;
+	static int32 NumberOfUniqueJumpsFound;
+	static int32 TotalNumberOfUniqueJumps;
+	static int32 PassengersDroppedOffWithTaxi;
+	static int32 MoneyMadeWithTaxi;
+	static int32 MissionsGiven;
+	static int32 MissionsPassed;
+	static char  LastMissionPassedName[8];
+	static int32 TotalLegitimateKills;
+	static int32 LivesSavedWithAmbulance;
+	static int32 CriminalsCaught;
+	static int32 HighestLevelAmbulanceMission;
+	static int32 HighestLevelVigilanteMission;
+	static int32 HighestLevelFireMission;
+	static int32 FiresExtinguished;
+	static int32 TotalNumberKillFrenzies;
+	static int32 TotalNumberMissions;
+	static int32 RoundsFiredByPlayer;
+	static int32 KgsOfExplosivesUsed;
+	static int32 BulletsThatHit;
+	static int32 BestTimeBombDefusal;
+	static int32 FastestTimes[TOTAL_FASTEST_TIMES];
+	static int32 HighestScores[TOTAL_HIGHEST_SCORES];
+	static int32 BestPositions[TOTAL_BEST_POSITIONS];
+	static bool PropertyOwned[TOTAL_PROPERTIES];
+	static int32 NumPropertyOwned;
+	static int32 PropertyDestroyed;
+	static float HighestChaseValue;
+	static int32 CheatedCount;
+	static int32 ShowChaseStatOnScreen;
+	static int32 PamphletMissionPassed;
+	static bool abSonyCDs[1];
+	static int32 BloodRingKills;
+	static int32 BloodRingTime;
+	static float FavoriteRadioStationList[NUM_RADIOS];
+	static int32 Sprayings;
+	static float AutoPaintingBudget;
+	static int32 NoMoreHurricanes;
+	static float FashionBudget;
+	static float PropertyBudget;
+	static float WeaponBudget;
+	static int32 SafeHouseVisits;
+	static int32 TyresPopped;
+
+	static int32 LongestWheelie;
+	static int32 LongestStoppie;
+	static int32 Longest2Wheel;
+	static float LongestWheelieDist;
+	static float LongestStoppieDist;
+	static float Longest2WheelDist;
+
+public:
+	static void Init(void);
+	static void RegisterFastestTime(int32, int32);
+	static void RegisterHighestScore(int32, int32);
+	static void RegisterBestPosition(int32, int32);
+	static void AnotherLifeSavedWithAmbulance();
+	static void AnotherCriminalCaught();
+	static void RegisterLevelAmbulanceMission(int32);
+	static void RegisterLevelVigilanteMission(int32);
+	static void RegisterLevelFireMission(int32);
+	static void AnotherFireExtinguished();
+	static wchar *FindCriminalRatingString();
+	static wchar *FindChaseString(float fMediaLevel);
+	static void AnotherKillFrenzyPassed();
+	static void SetTotalNumberKillFrenzies(int32);
+	static void SetTotalNumberMissions(int32);
+	static void CheckPointReachedSuccessfully() { TotalLegitimateKills += KillsSinceLastCheckpoint; KillsSinceLastCheckpoint = 0; };
+	static void CheckPointReachedUnsuccessfully() { KillsSinceLastCheckpoint = 0; };
+	static int32 FindCriminalRatingNumber();
+	static void SaveStats(uint8 *buf, uint32 *size);
+	static void LoadStats(uint8 *buf, uint32 size);
+	static float GetPercentageProgress();
+
+	static void MoneySpentOnWeapons(int32);
+	static void MoneySpentOnProperty(int32);
+	static void MoneySpentOnAutoPainting(int32);
+	static void MoneySpentOnFashion(int32);
+
+	static void NumOfVisitsFromLoanSharks(int32);
+	static void NumOfStoresKnockedOff(int32);
+	static void NumOfMovieStunts(int32);
+	static void NumOfAssassinations(int32);
+	static void NumOfPizzasDelivered(int32);
+	static void NumOfGarbagePickups(int32);
+	static void NumOfIceCreamSold(int32);
+	static void AddNumBloodRingKills(int32);
+
+	static void LongestTimeInBloodRing(int32);
+	static void AddPropertyAsOwned(int32);
+	static void PopulateFavoriteRadioStationList();
+	static float GetFavoriteRadioStationList(int32);
+	static void BuildStatLine(Const char *, void *, int, void *, int);
+	static int ConstructStatLine(int);
+};
diff --git a/src/core/Streaming.cpp b/src/core/Streaming.cpp
new file mode 100644
index 0000000..b28a99f
--- /dev/null
+++ b/src/core/Streaming.cpp
@@ -0,0 +1,3249 @@
+#include "common.h"
+
+#include "General.h"
+#include "Pad.h"
+#include "Hud.h"
+#include "Text.h"
+#include "Clock.h"
+#include "Renderer.h"
+#include "ModelInfo.h"
+#include "TxdStore.h"
+#include "ModelIndices.h"
+#include "Pools.h"
+#include "Wanted.h"
+#include "Directory.h"
+#include "RwHelper.h"
+#include "World.h"
+#include "Entity.h"
+#include "FileMgr.h"
+#include "FileLoader.h"
+#include "Zones.h"
+#include "Radar.h"
+#include "Camera.h"
+#include "Record.h"
+#include "CarCtrl.h"
+#include "Population.h"
+#include "Gangs.h"
+#include "CutsceneMgr.h"
+#include "CdStream.h"
+#include "Streaming.h"
+#include "Replay.h"
+#include "main.h"
+#include "ColStore.h"
+#include "DMAudio.h"
+#include "Script.h"
+#include "MemoryMgr.h"
+#include "MemoryHeap.h"
+#include "Font.h"
+#include "Frontend.h"
+#include "VarConsole.h"
+
+bool CStreaming::ms_disableStreaming;
+bool CStreaming::ms_bLoadingBigModel;
+int32 CStreaming::ms_numModelsRequested;
+CStreamingInfo CStreaming::ms_aInfoForModel[NUMSTREAMINFO];
+CStreamingInfo CStreaming::ms_startLoadedList;
+CStreamingInfo CStreaming::ms_endLoadedList;
+CStreamingInfo CStreaming::ms_startRequestedList;
+CStreamingInfo CStreaming::ms_endRequestedList;
+int32 CStreaming::ms_oldSectorX;
+int32 CStreaming::ms_oldSectorY;
+int32 CStreaming::ms_streamingBufferSize;
+#ifndef ONE_THREAD_PER_CHANNEL
+int8 *CStreaming::ms_pStreamingBuffer[2];
+#else
+int8 *CStreaming::ms_pStreamingBuffer[4];
+#endif
+size_t CStreaming::ms_memoryUsed;
+CStreamingChannel CStreaming::ms_channel[2];
+int32 CStreaming::ms_channelError;
+int32 CStreaming::ms_numVehiclesLoaded;
+int32 CStreaming::ms_numPedsLoaded;
+int32 CStreaming::ms_vehiclesLoaded[MAXVEHICLESLOADED];
+int32 CStreaming::ms_lastVehicleDeleted;
+bool CStreaming::ms_bIsPedFromPedGroupLoaded[NUMMODELSPERPEDGROUP];
+CDirectory *CStreaming::ms_pExtraObjectsDir;
+int32 CStreaming::ms_numPriorityRequests;
+int32 CStreaming::ms_currentPedGrp;
+int32 CStreaming::ms_currentPedLoading;
+int32 CStreaming::ms_lastCullZone;
+uint16 CStreaming::ms_loadedGangs;
+uint16 CStreaming::ms_loadedGangCars;
+int32 CStreaming::ms_imageOffsets[NUMCDIMAGES];
+int32 CStreaming::ms_lastImageRead;
+int32 CStreaming::ms_imageSize;
+size_t CStreaming::ms_memoryAvailable;
+
+int32 desiredNumVehiclesLoaded = 12;
+
+CEntity *pIslandLODmainlandEntity;
+CEntity *pIslandLODbeachEntity;
+int32 islandLODmainland;
+int32 islandLODbeach;
+
+#ifndef MASTER
+bool gbPrintStats;
+bool gbPrintVehiclesInMemory;  // TODO
+bool gbPrintStreamingBuffer; // TODO
+#endif
+
+bool
+CStreamingInfo::GetCdPosnAndSize(uint32 &posn, uint32 &size)
+{
+	if(m_size == 0)
+		return false;
+	posn = m_position;
+	size = m_size;
+	return true;
+}
+
+void
+CStreamingInfo::SetCdPosnAndSize(uint32 posn, uint32 size)
+{
+	m_position = posn;
+	m_size = size;
+}
+
+void
+CStreamingInfo::AddToList(CStreamingInfo *link)
+{
+	// Insert this after link
+	m_next = link->m_next;
+	m_prev = link;
+	link->m_next = this;
+	m_next->m_prev = this;
+}
+
+void
+CStreamingInfo::RemoveFromList(void)
+{
+	m_next->m_prev = m_prev;
+	m_prev->m_next = m_next;
+	m_next = nil;
+	m_prev = nil;
+}
+
+void
+CStreaming::Init2(void)
+{
+	int i;
+
+	for(i = 0; i < NUMSTREAMINFO; i++){
+		ms_aInfoForModel[i].m_loadState = STREAMSTATE_NOTLOADED;
+		ms_aInfoForModel[i].m_next = nil;
+		ms_aInfoForModel[i].m_prev = nil;
+		ms_aInfoForModel[i].m_nextID = -1;
+		ms_aInfoForModel[i].m_size = 0;
+		ms_aInfoForModel[i].m_position = 0;
+	}
+
+	ms_channelError = -1;
+
+	// init lists
+
+	ms_startLoadedList.m_next = &ms_endLoadedList;
+	ms_startLoadedList.m_prev = nil;
+	ms_endLoadedList.m_prev = &ms_startLoadedList;
+	ms_endLoadedList.m_next = nil;
+
+	ms_startRequestedList.m_next = &ms_endRequestedList;
+	ms_startRequestedList.m_prev = nil;
+	ms_endRequestedList.m_prev = &ms_startRequestedList;
+	ms_endRequestedList.m_next = nil;
+
+	// init misc
+
+	ms_oldSectorX = 0;
+	ms_oldSectorY = 0;
+	ms_streamingBufferSize = 0;
+	ms_disableStreaming = false;
+	ms_memoryUsed = 0;
+	ms_bLoadingBigModel = false;
+
+	// init channels
+
+	ms_channel[0].state = CHANNELSTATE_IDLE;
+	ms_channel[1].state = CHANNELSTATE_IDLE;
+	for(i = 0; i < 4; i++){
+		ms_channel[0].streamIds[i] = -1;
+		ms_channel[0].offsets[i] = -1;
+		ms_channel[1].streamIds[i] = -1;
+		ms_channel[1].offsets[i] = -1;
+	}
+
+	// init stream info, mark things that are already loaded
+
+	for(i = 0; i < MODELINFOSIZE; i++){
+		CBaseModelInfo *mi = CModelInfo::GetModelInfo(i);
+		if(mi && mi->GetRwObject()){
+			ms_aInfoForModel[i].m_loadState = STREAMSTATE_LOADED;
+			ms_aInfoForModel[i].m_flags = STREAMFLAGS_DONT_REMOVE;
+			if(mi->IsSimple())
+				((CSimpleModelInfo*)mi)->m_alpha = 255;
+		}
+	}
+
+	for(i = 0; i < TXDSTORESIZE; i++)
+		if(CTxdStore::GetSlot(i) && CTxdStore::GetSlot(i)->texDict)
+			ms_aInfoForModel[i + STREAM_OFFSET_TXD].m_loadState = STREAMSTATE_LOADED;
+
+
+	for(i = 0; i < MAXVEHICLESLOADED; i++)
+		ms_vehiclesLoaded[i] = -1;
+	ms_numVehiclesLoaded = 0;
+	ms_numPedsLoaded = 8;
+
+	for(i = 0; i < ARRAY_SIZE(ms_bIsPedFromPedGroupLoaded); i++)
+		ms_bIsPedFromPedGroupLoaded[i] = false;
+
+	ms_pExtraObjectsDir = new CDirectory(EXTRADIRSIZE);
+	ms_numPriorityRequests = 0;
+	ms_currentPedGrp = -1;
+	ms_lastCullZone = -1;		// unused because RemoveModelsNotVisibleFromCullzone is gone
+	ms_loadedGangs = 0;
+	ms_currentPedLoading = NUMMODELSPERPEDGROUP;	// unused, whatever it is
+
+	LoadCdDirectory();
+
+	// allocate streaming buffers
+	if(ms_streamingBufferSize & 1) ms_streamingBufferSize++;
+#ifndef ONE_THREAD_PER_CHANNEL
+	ms_pStreamingBuffer[0] = (int8*)RwMallocAlign(ms_streamingBufferSize*CDSTREAM_SECTOR_SIZE, CDSTREAM_SECTOR_SIZE);
+	ms_streamingBufferSize /= 2;
+	ms_pStreamingBuffer[1] = ms_pStreamingBuffer[0] + ms_streamingBufferSize*CDSTREAM_SECTOR_SIZE;
+#else
+	ms_pStreamingBuffer[0] = (int8*)RwMallocAlign(ms_streamingBufferSize*2*CDSTREAM_SECTOR_SIZE, CDSTREAM_SECTOR_SIZE);
+	ms_streamingBufferSize /= 2;
+	ms_pStreamingBuffer[1] = ms_pStreamingBuffer[0] + ms_streamingBufferSize*CDSTREAM_SECTOR_SIZE;
+	ms_pStreamingBuffer[2] = ms_pStreamingBuffer[1] + ms_streamingBufferSize*CDSTREAM_SECTOR_SIZE;
+	ms_pStreamingBuffer[3] = ms_pStreamingBuffer[2] + ms_streamingBufferSize*CDSTREAM_SECTOR_SIZE;
+#endif
+	debug("Streaming buffer size is %d sectors", ms_streamingBufferSize);
+
+	// PC only, figure out how much memory we got
+#ifdef GTA_PC
+#define MB (1024*1024)
+#ifdef FIX_BUGS
+	// do what gta3 does
+	extern size_t _dwMemAvailPhys;
+	ms_memoryAvailable = (_dwMemAvailPhys - 10*MB)/2;
+	if(ms_memoryAvailable < 65*MB)
+		ms_memoryAvailable = 65*MB;
+	desiredNumVehiclesLoaded = (int32)((ms_memoryAvailable / MB - 65) / 3 + 12);
+	if(desiredNumVehiclesLoaded > MAXVEHICLESLOADED)
+		desiredNumVehiclesLoaded = MAXVEHICLESLOADED;
+#else
+	ms_memoryAvailable = 65 * MB;
+	desiredNumVehiclesLoaded = 25;
+	debug("Memory allocated to Streaming is %zuMB", ms_memoryAvailable/MB); // original modifier was %d
+#endif
+#undef MB
+#endif
+
+	// find island LODs
+
+	pIslandLODmainlandEntity = nil;
+	pIslandLODbeachEntity = nil;
+	islandLODmainland = -1;
+	islandLODbeach = -1;
+	CModelInfo::GetModelInfo("IslandLODmainland", &islandLODmainland);
+	CModelInfo::GetModelInfo("IslandLODbeach", &islandLODbeach);
+
+#ifndef MASTER
+	VarConsole.Add("Streaming Debug", &gbPrintStats, true);
+	VarConsole.Add("Streaming Vehicle Debug", &gbPrintVehiclesInMemory, true);
+	VarConsole.Add("Printf Streaming Buffer contents", &gbPrintStreamingBuffer, true);
+#endif
+}
+
+void
+CStreaming::Init(void)
+{
+#ifdef USE_TXD_CDIMAGE
+	if(!CanVideoCardDoDXT()){
+		int txdHandle = CFileMgr::OpenFile("MODELS\\TXD.IMG", "r");
+		if (txdHandle)
+			CFileMgr::CloseFile(txdHandle);
+		if (!CheckVideoCardCaps() && txdHandle) {
+			CdStreamAddImage("MODELS\\TXD.IMG");
+			CStreaming::Init2();
+		} else {
+			CStreaming::Init2();
+			if (CreateTxdImageForVideoCard()) {
+				CStreaming::Shutdown();
+				CdStreamAddImage("MODELS\\TXD.IMG");
+				CStreaming::Init2();
+			}
+		}
+	} else
+		CStreaming::Init2();
+#else
+	CStreaming::Init2();
+#endif
+}
+
+void
+CStreaming::ReInit(void)
+{
+	int i;
+	CStreaming::FlushRequestList();
+	CStreaming::DeleteAllRwObjects();
+	CStreaming::RemoveAllUnusedModels();
+	for(i = 0; i < MODELINFOSIZE; i++)
+		if(CModelInfo::GetModelInfo(i) && ms_aInfoForModel[i].m_flags & STREAMFLAGS_SCRIPTOWNED)
+			SetMissionDoesntRequireModel(i);
+	CStreaming::ms_disableStreaming = false;
+}
+
+void
+CStreaming::Shutdown(void)
+{
+	RwFreeAlign(ms_pStreamingBuffer[0]);
+	ms_streamingBufferSize = 0;
+	if(ms_pExtraObjectsDir) {
+		delete ms_pExtraObjectsDir;
+#ifdef FIX_BUGS
+		ms_pExtraObjectsDir = nil;
+#endif
+	}
+}
+
+#ifndef MASTER
+uint64 timeProcessingTXD;
+uint64 timeProcessingDFF;
+#endif
+
+void
+CStreaming::Update(void)
+{
+	CStreamingInfo *si, *prev;
+	bool requestedSubway = false;
+
+#ifndef MASTER
+	timeProcessingTXD = 0;
+	timeProcessingDFF = 0;
+#endif
+
+	UpdateMemoryUsed();
+
+	if(ms_channelError != -1){
+		RetryLoadFile(ms_channelError);
+		return;
+	}
+
+	if(CTimer::GetIsPaused())
+		return;
+
+	LoadBigBuildingsWhenNeeded();
+	if(!ms_disableStreaming && TheCamera.GetPosition().z < 55.0f)
+		AddModelsToRequestList(TheCamera.GetPosition(), 0);
+
+	DeleteFarAwayRwObjects(TheCamera.GetPosition());
+
+	if(!ms_disableStreaming &&
+	   !CCutsceneMgr::IsCutsceneProcessing() &&
+	   ms_numModelsRequested < 5 &&
+	   !CRenderer::m_loadingPriority &&
+	   CGame::currArea == AREA_MAIN_MAP &&
+	   !CReplay::IsPlayingBack()){
+		StreamVehiclesAndPeds();
+		StreamZoneModels(FindPlayerCoors());
+	}
+
+	LoadRequestedModels();
+
+	if(CWorld::Players[0].m_pRemoteVehicle){
+		CColStore::AddCollisionNeededAtPosn(FindPlayerCoors());
+		CColStore::LoadCollision(CWorld::Players[0].m_pRemoteVehicle->GetPosition());
+		CColStore::EnsureCollisionIsInMemory(CWorld::Players[0].m_pRemoteVehicle->GetPosition());
+	}else{
+		CColStore::LoadCollision(FindPlayerCoors());
+		CColStore::EnsureCollisionIsInMemory(FindPlayerCoors());
+	}
+
+	// TODO: PrintRequestList
+	//if (CPad::GetPad(1)->GetLeftShoulder2JustDown() && CPad::GetPad(1)->GetRightShoulder1() && CPad::GetPad(1)->GetRightShoulder2())
+	//	PrintRequestList();
+
+	for(si = ms_endRequestedList.m_prev; si != &ms_startRequestedList; si = prev){
+		prev = si->m_prev;
+		if((si->m_flags & (STREAMFLAGS_KEEP_IN_MEMORY|STREAMFLAGS_PRIORITY)) == 0)
+			RemoveModel(si - ms_aInfoForModel);
+	}
+}
+
+void
+CStreaming::LoadCdDirectory(void)
+{
+	char dirname[132];
+	int i;
+
+#ifdef GTA_PC
+	ms_imageOffsets[0] = 0;
+	ms_imageOffsets[1] = -1;
+	ms_imageOffsets[2] = -1;
+	ms_imageOffsets[3] = -1;
+	ms_imageOffsets[4] = -1;
+	ms_imageOffsets[5] = -1;
+	ms_imageSize = GetGTA3ImgSize();
+	// PS2 uses CFileMgr::GetCdFile on all IMG files to fill the array
+#endif
+
+	i = CdStreamGetNumImages();
+	while(i-- >= 1){
+		strcpy(dirname, CdStreamGetImageName(i));
+		strncpy(strrchr(dirname, '.') + 1, "DIR", 3);
+		LoadCdDirectory(dirname, i);
+	}
+
+	ms_lastImageRead = 0;
+	ms_imageSize /= CDSTREAM_SECTOR_SIZE;
+}
+
+void
+CStreaming::LoadCdDirectory(const char *dirname, int n)
+{
+	int fd, lastID, imgSelector;
+	int modelId;
+	CDirectory::DirectoryInfo direntry;
+	char *dot;
+
+	lastID = -1;
+	fd = CFileMgr::OpenFile(dirname, "rb");
+	assert(fd > 0);
+
+	imgSelector = n<<24;
+	assert(sizeof(direntry) == 32);
+	while(CFileMgr::Read(fd, (char*)&direntry, sizeof(direntry))){
+		bool bAddToStreaming = false;
+
+		if(direntry.size > (uint32)ms_streamingBufferSize)
+			ms_streamingBufferSize = direntry.size;
+		direntry.name[23] = '\0';
+		dot = strchr(direntry.name, '.');
+		if(dot == nil || dot-direntry.name > 20){
+			debug("%s is too long\n", direntry.name);
+			lastID = -1;
+			continue;
+		}
+
+		*dot = '\0';
+
+		if(strncasecmp(dot+1, "DFF", 3) == 0){
+			if(CModelInfo::GetModelInfo(direntry.name, &modelId)){
+				bAddToStreaming = true;
+			}else{
+#ifdef FIX_BUGS
+				// remember which cdimage this came from
+				ms_pExtraObjectsDir->AddItem(direntry, n);
+#else
+				ms_pExtraObjectsDir->AddItem(direntry);
+#endif
+				lastID = -1;
+			}
+		}else if(strncasecmp(dot+1, "TXD", 3) == 0){
+			modelId = CTxdStore::FindTxdSlot(direntry.name);
+			if(modelId == -1)
+				modelId = CTxdStore::AddTxdSlot(direntry.name);
+			modelId += STREAM_OFFSET_TXD;
+			bAddToStreaming = true;
+		}else if(strncasecmp(dot+1, "COL", 3) == 0){
+			modelId = CColStore::FindColSlot(direntry.name);
+			if(modelId == -1)
+				modelId = CColStore::AddColSlot(direntry.name);
+			modelId += STREAM_OFFSET_COL;
+			bAddToStreaming = true;
+		}else if(strncasecmp(dot+1, "IFP", 3) == 0){
+			modelId = CAnimManager::RegisterAnimBlock(direntry.name);
+			modelId += STREAM_OFFSET_ANIM;
+			bAddToStreaming = true;
+		}else{
+			*dot = '.';
+			lastID = -1;
+		}
+
+		if(bAddToStreaming){
+			if(ms_aInfoForModel[modelId].GetCdSize()){
+				debug("%s.%s appears more than once in %s\n", direntry.name, dot+1, dirname);
+				lastID = -1;
+			}else{
+				direntry.offset |= imgSelector;
+				ms_aInfoForModel[modelId].SetCdPosnAndSize(direntry.offset, direntry.size);
+				if(lastID != -1)
+					ms_aInfoForModel[lastID].m_nextID = modelId;
+				lastID = modelId;
+			}
+		}
+	}
+
+	CFileMgr::CloseFile(fd);
+}
+
+static char*
+GetObjectName(int streamId)
+{
+	static char objname[32];
+	if(streamId < STREAM_OFFSET_TXD)
+		sprintf(objname, "%s.dff", CModelInfo::GetModelInfo(streamId)->GetModelName());
+	else if(streamId >= STREAM_OFFSET_TXD && streamId < STREAM_OFFSET_COL)
+		sprintf(objname, "%s.txd", CTxdStore::GetTxdName(streamId-STREAM_OFFSET_TXD));
+	else if(streamId >= STREAM_OFFSET_COL && streamId < STREAM_OFFSET_ANIM)
+		sprintf(objname, "%s.col", CColStore::GetColName(streamId-STREAM_OFFSET_COL));
+	else{
+		assert(streamId < NUMSTREAMINFO);
+		sprintf(objname, "%s.ifp", CAnimManager::GetAnimationBlock(streamId-STREAM_OFFSET_ANIM)->name);
+	}
+	return objname;
+}
+
+#ifdef USE_CUSTOM_ALLOCATOR
+RpAtomic*
+RegisterAtomicMemPtrsCB(RpAtomic *atomic, void *data)
+{
+	// empty because we expect models to be pre-instanced
+	return atomic;
+}
+#endif
+
+bool
+CStreaming::ConvertBufferToObject(int8 *buf, int32 streamId)
+{
+	RwMemory mem;
+	RwStream *stream;
+	int cdsize;
+	uint32 startTime, endTime, timeDiff;
+	CBaseModelInfo *mi;
+	bool success;
+
+	startTime = CTimer::GetCurrentTimeInCycles() / CTimer::GetCyclesPerMillisecond();
+
+	cdsize = ms_aInfoForModel[streamId].GetCdSize();
+	mem.start = (uint8*)buf;
+	mem.length = cdsize * CDSTREAM_SECTOR_SIZE;
+	stream = RwStreamOpen(rwSTREAMMEMORY, rwSTREAMREAD, &mem);
+
+	if(streamId < STREAM_OFFSET_TXD){
+		// Model
+		mi = CModelInfo::GetModelInfo(streamId);
+
+		// Txd and anim have to be loaded
+		int animId = mi->GetAnimFileIndex();
+#ifdef FIX_BUGS
+		if(!HasTxdLoaded(mi->GetTxdSlot()) ||
+#else
+		// texDict will exist even if only first part has loaded
+		if(CTxdStore::GetSlot(mi->GetTxdSlot())->texDict == nil ||
+#endif
+		   animId != -1 && !CAnimManager::GetAnimationBlock(animId)->isLoaded){
+			RemoveModel(streamId);
+			ReRequestModel(streamId);
+			RwStreamClose(stream, &mem);
+			return false;
+		}
+
+		// Set Txd and anims to use
+		CTxdStore::AddRef(mi->GetTxdSlot());
+#if GTA_VERSION > GTAVC_PS2
+		if(animId != -1)
+			CAnimManager::AddAnimBlockRef(animId);
+#endif
+
+		PUSH_MEMID(MEMID_STREAM_MODELS);
+		CTxdStore::SetCurrentTxd(mi->GetTxdSlot());
+		if(mi->IsSimple()){
+			success = CFileLoader::LoadAtomicFile(stream, streamId);
+			// TODO(MIAMI)? complain if file is not pre-instanced. we hardly are interested in that
+		} else if (mi->GetModelType() == MITYPE_VEHICLE) {
+			// load vehicles in two parts
+			CModelInfo::GetModelInfo(streamId)->AddRef();
+			success = CFileLoader::StartLoadClumpFile(stream, streamId);
+			if(success)
+				ms_aInfoForModel[streamId].m_loadState = STREAMSTATE_STARTED;
+		}else{
+			success = CFileLoader::LoadClumpFile(stream, streamId);
+#ifdef USE_CUSTOM_ALLOCATOR
+			if(success)
+				RpClumpForAllAtomics((RpClump*)mi->GetRwObject(), RegisterAtomicMemPtrsCB, nil);
+#endif
+		}
+		POP_MEMID();
+		UpdateMemoryUsed();
+
+		// Txd and anims no longer needed unless we only read part of the file
+		if(ms_aInfoForModel[streamId].m_loadState != STREAMSTATE_STARTED){
+			CTxdStore::RemoveRefWithoutDelete(mi->GetTxdSlot());
+#if GTA_VERSION > GTAVC_PS2
+			if(animId != -1)
+				CAnimManager::RemoveAnimBlockRefWithoutDelete(animId);
+#endif
+		}
+
+		if(!success){
+			debug("Failed to load %s\n", CModelInfo::GetModelInfo(streamId)->GetModelName());
+			RemoveModel(streamId);
+			ReRequestModel(streamId);
+			RwStreamClose(stream, &mem);
+			return false;
+		}
+	}else if(streamId >= STREAM_OFFSET_TXD && streamId < STREAM_OFFSET_COL){
+		// Txd
+		if((ms_aInfoForModel[streamId].m_flags & STREAMFLAGS_KEEP_IN_MEMORY) == 0 &&
+		   !IsTxdUsedByRequestedModels(streamId - STREAM_OFFSET_TXD)){
+			RemoveModel(streamId);
+			RwStreamClose(stream, &mem);
+			return false;
+		}
+
+		PUSH_MEMID(MEMID_STREAM_TEXUTRES);
+		if(ms_bLoadingBigModel || cdsize > 200){
+			success = CTxdStore::StartLoadTxd(streamId - STREAM_OFFSET_TXD, stream);
+			if(success)
+				ms_aInfoForModel[streamId].m_loadState = STREAMSTATE_STARTED;
+		}else
+		        success = CTxdStore::LoadTxd(streamId - STREAM_OFFSET_TXD, stream);
+		POP_MEMID();
+		UpdateMemoryUsed();
+
+		if(!success){
+			debug("Failed to load %s.txd\n", CTxdStore::GetTxdName(streamId - STREAM_OFFSET_TXD));
+			RemoveModel(streamId);
+			ReRequestModel(streamId);
+			RwStreamClose(stream, &mem);
+			return false;
+		}
+	}else if(streamId >= STREAM_OFFSET_COL && streamId < STREAM_OFFSET_ANIM){
+		PUSH_MEMID(MEMID_STREAM_COLLISION);
+		bool success = CColStore::LoadCol(streamId-STREAM_OFFSET_COL, mem.start, mem.length);
+		POP_MEMID();
+		if(!success){
+			debug("Failed to load %s.col\n", CColStore::GetColName(streamId - STREAM_OFFSET_COL));
+			RemoveModel(streamId);
+			ReRequestModel(streamId);
+			RwStreamClose(stream, &mem);
+			return false;
+		}
+	}else if(streamId >= STREAM_OFFSET_ANIM){
+		assert(streamId < NUMSTREAMINFO);
+		if((ms_aInfoForModel[streamId].m_flags & STREAMFLAGS_KEEP_IN_MEMORY) == 0 &&
+		   !AreAnimsUsedByRequestedModels(streamId - STREAM_OFFSET_ANIM)){
+			RemoveModel(streamId);
+			RwStreamClose(stream, &mem);
+			return false;
+		}
+		PUSH_MEMID(MEMID_STREAM_ANIMATION);
+		CAnimManager::LoadAnimFile(stream, true, nil);
+		CAnimManager::CreateAnimAssocGroups();
+		POP_MEMID();
+	}
+
+	RwStreamClose(stream, &mem);
+
+	if(streamId < STREAM_OFFSET_TXD){
+		// Model
+		// Vehicles and Peds not in loaded list
+		if (mi->GetModelType() != MITYPE_VEHICLE && mi->GetModelType() != MITYPE_PED) {
+			CSimpleModelInfo *smi = (CSimpleModelInfo*)mi;
+
+			// Set fading for some objects
+			if(mi->IsSimple() && !smi->m_isBigBuilding){
+				if(ms_aInfoForModel[streamId].m_flags & STREAMFLAGS_NOFADE)
+					smi->m_alpha = 255;
+				else
+					smi->m_alpha = 0;
+			}
+
+			if(CanRemoveModel(streamId))
+				ms_aInfoForModel[streamId].AddToList(&ms_startLoadedList);
+		}
+	}else if(streamId >= STREAM_OFFSET_TXD && streamId < STREAM_OFFSET_COL ||
+	         streamId >= STREAM_OFFSET_ANIM){
+		assert(streamId < NUMSTREAMINFO);
+		// Txd and anims
+		if(CanRemoveModel(streamId))
+			ms_aInfoForModel[streamId].AddToList(&ms_startLoadedList);
+	}
+
+	// Mark objects as loaded
+	if(ms_aInfoForModel[streamId].m_loadState != STREAMSTATE_STARTED){
+		ms_aInfoForModel[streamId].m_loadState = STREAMSTATE_LOADED;
+#ifndef USE_CUSTOM_ALLOCATOR
+		ms_memoryUsed += ms_aInfoForModel[streamId].GetCdSize() * CDSTREAM_SECTOR_SIZE;
+#endif
+	}
+
+	endTime = CTimer::GetCurrentTimeInCycles() / CTimer::GetCyclesPerMillisecond();
+	timeDiff = endTime - startTime;
+	if(timeDiff > 5)
+		debug("%s took %d ms\n", GetObjectName(streamId), timeDiff);
+
+	return true;
+}
+
+bool
+CStreaming::FinishLoadingLargeFile(int8 *buf, int32 streamId)
+{
+	RwMemory mem;
+	RwStream *stream;
+	uint32 startTime, endTime, timeDiff;
+	CBaseModelInfo *mi;
+	bool success;
+
+	startTime = CTimer::GetCurrentTimeInCycles() / CTimer::GetCyclesPerMillisecond();
+
+	if(ms_aInfoForModel[streamId].m_loadState != STREAMSTATE_STARTED){
+		if(streamId < STREAM_OFFSET_TXD)
+			CModelInfo::GetModelInfo(streamId)->RemoveRef();
+		return false;
+	}
+
+	mem.start = (uint8*)buf;
+	mem.length = ms_aInfoForModel[streamId].GetCdSize() * CDSTREAM_SECTOR_SIZE;
+	stream = RwStreamOpen(rwSTREAMMEMORY, rwSTREAMREAD, &mem);
+
+	if(streamId < STREAM_OFFSET_TXD){
+		// Model
+		mi = CModelInfo::GetModelInfo(streamId);
+		PUSH_MEMID(MEMID_STREAM_MODELS);
+		CTxdStore::SetCurrentTxd(mi->GetTxdSlot());
+		success = CFileLoader::FinishLoadClumpFile(stream, streamId);
+		if(success){
+#ifdef USE_CUSTOM_ALLOCATOR
+			RpClumpForAllAtomics((RpClump*)mi->GetRwObject(), RegisterAtomicMemPtrsCB, nil);
+#endif
+			success = AddToLoadedVehiclesList(streamId);
+		}
+		POP_MEMID();
+		mi->RemoveRef();
+		CTxdStore::RemoveRefWithoutDelete(mi->GetTxdSlot());
+#if GTA_VERSION > GTAVC_PS2
+		if(mi->GetAnimFileIndex() != -1)
+			CAnimManager::RemoveAnimBlockRefWithoutDelete(mi->GetAnimFileIndex());
+#endif
+	}else if(streamId >= STREAM_OFFSET_TXD && streamId < STREAM_OFFSET_COL){
+		// Txd
+		CTxdStore::AddRef(streamId - STREAM_OFFSET_TXD);
+		PUSH_MEMID(MEMID_STREAM_TEXUTRES);
+		success = CTxdStore::FinishLoadTxd(streamId - STREAM_OFFSET_TXD, stream);
+		POP_MEMID();
+		CTxdStore::RemoveRefWithoutDelete(streamId - STREAM_OFFSET_TXD);
+	}else{
+		assert(0 && "invalid streamId");
+	}
+
+	RwStreamClose(stream, &mem);
+
+	ms_aInfoForModel[streamId].m_loadState = STREAMSTATE_LOADED;
+#ifndef USE_CUSTOM_ALLOCATOR
+	ms_memoryUsed += ms_aInfoForModel[streamId].GetCdSize() * CDSTREAM_SECTOR_SIZE;
+#endif
+
+	if(!success){
+		RemoveModel(streamId);
+		ReRequestModel(streamId);
+		UpdateMemoryUsed();
+		return false;
+	}
+
+	UpdateMemoryUsed();
+
+	endTime = CTimer::GetCurrentTimeInCycles() / CTimer::GetCyclesPerMillisecond();
+	timeDiff = endTime - startTime;
+	if(timeDiff > 5)
+		debug("%s took %d ms\n", GetObjectName(streamId), timeDiff);
+
+	return true;
+}
+
+void
+CStreaming::RequestModel(int32 id, int32 flags)
+{
+	CSimpleModelInfo *mi;
+
+	if(ms_aInfoForModel[id].m_loadState == STREAMSTATE_INQUEUE){
+		// updgrade to priority
+		if(flags & STREAMFLAGS_PRIORITY && !ms_aInfoForModel[id].IsPriority()){
+			ms_numPriorityRequests++;
+			ms_aInfoForModel[id].m_flags |= STREAMFLAGS_PRIORITY;
+		}
+	}else if(ms_aInfoForModel[id].m_loadState != STREAMSTATE_NOTLOADED){
+		flags &= ~STREAMFLAGS_PRIORITY;
+	}
+	ms_aInfoForModel[id].m_flags |= flags;
+
+	if(ms_aInfoForModel[id].m_loadState == STREAMSTATE_LOADED){
+		// Already loaded, only check changed flags
+
+		if(ms_aInfoForModel[id].m_flags & STREAMFLAGS_NOFADE && id < STREAM_OFFSET_TXD){
+			mi = (CSimpleModelInfo*)CModelInfo::GetModelInfo(id);
+			if(mi->IsSimple())
+				mi->m_alpha = 255;
+		}
+
+		// reinsert into list
+		if(ms_aInfoForModel[id].m_next){
+			ms_aInfoForModel[id].RemoveFromList();
+			if(CanRemoveModel(id))
+				ms_aInfoForModel[id].AddToList(&ms_startLoadedList);
+		}
+	}else if(ms_aInfoForModel[id].m_loadState == STREAMSTATE_NOTLOADED ||
+	         ms_aInfoForModel[id].m_loadState == STREAMSTATE_LOADED){	// how can this be true again?
+
+		if(ms_aInfoForModel[id].m_loadState == STREAMSTATE_NOTLOADED){
+			if(id < STREAM_OFFSET_TXD){
+				mi = (CSimpleModelInfo*)CModelInfo::GetModelInfo(id);
+				RequestTxd(mi->GetTxdSlot(), flags);
+				int anim = mi->GetAnimFileIndex();
+				if(anim != -1)
+					RequestAnim(anim, STREAMFLAGS_DEPENDENCY);
+			}
+			ms_aInfoForModel[id].AddToList(&ms_startRequestedList);
+			ms_numModelsRequested++;
+			if(flags & STREAMFLAGS_PRIORITY)
+				ms_numPriorityRequests++;
+		}
+
+		ms_aInfoForModel[id].m_loadState = STREAMSTATE_INQUEUE;
+		ms_aInfoForModel[id].m_flags = flags;
+	}
+}
+
+#define BIGBUILDINGFLAGS STREAMFLAGS_DONT_REMOVE
+
+void
+CStreaming::RequestBigBuildings(eLevelName level)
+{
+	int i, n;
+	CBuilding *b;
+
+	n = CPools::GetBuildingPool()->GetSize()-1;
+	for(i = n; i >= 0; i--){
+		b = CPools::GetBuildingPool()->GetSlot(i);
+		if(b && b->bIsBIGBuilding
+#ifdef NO_ISLAND_LOADING
+		   && (((FrontEndMenuManager.m_PrefsIslandLoading != CMenuManager::ISLAND_LOADING_LOW) && (b != pIslandLODmainlandEntity) &&
+		        (b != pIslandLODbeachEntity)) ||
+		       (b->m_level == level))
+#else
+		   && b->m_level == level
+#endif
+			)
+			if(!b->bStreamBIGBuilding)
+				RequestModel(b->GetModelIndex(), BIGBUILDINGFLAGS);
+	}
+	RequestIslands(level);
+}
+
+void
+CStreaming::RequestBigBuildings(eLevelName level, const CVector &pos)
+{
+	int i, n;
+	CBuilding *b;
+
+	n = CPools::GetBuildingPool()->GetSize()-1;
+	for(i = n; i >= 0; i--){
+		b = CPools::GetBuildingPool()->GetSlot(i);
+		if(b && b->bIsBIGBuilding
+#ifdef NO_ISLAND_LOADING
+		    && (((FrontEndMenuManager.m_PrefsIslandLoading != CMenuManager::ISLAND_LOADING_LOW) && (b != pIslandLODmainlandEntity) && (b != pIslandLODbeachEntity)
+				) || (b->m_level == level))
+#else
+		   && b->m_level == level
+#endif
+		)
+			if(b->bStreamBIGBuilding){
+				if(CRenderer::ShouldModelBeStreamed(b, pos))
+					RequestModel(b->GetModelIndex(), 0);
+			}else
+				RequestModel(b->GetModelIndex(), BIGBUILDINGFLAGS);
+	}
+	RequestIslands(level);
+}
+
+void
+CStreaming::InstanceBigBuildings(eLevelName level, const CVector &pos)
+{
+	int i, n;
+	CBuilding *b;
+
+	n = CPools::GetBuildingPool()->GetSize()-1;
+	for(i = n; i >= 0; i--){
+		b = CPools::GetBuildingPool()->GetSlot(i);
+		if(b && b->bIsBIGBuilding && b->m_level == level &&
+		   b->bStreamBIGBuilding && b->m_rwObject == nil)
+			if(CRenderer::ShouldModelBeStreamed(b, pos))
+				b->CreateRwObject();
+	}
+}
+
+void
+CStreaming::InstanceLoadedModelsInSectorList(CPtrList &list)
+{
+	CPtrNode *node;
+	CEntity *e;
+	for(node = list.first; node; node = node->next) {
+		e = (CEntity *)node->item;
+		if(IsAreaVisible(e->m_area) && e->m_rwObject == nil)
+			e->CreateRwObject();
+	}
+}
+
+void
+CStreaming::InstanceLoadedModels(const CVector &pos)
+{
+	int minX = CWorld::GetSectorIndexX(pos.x - 80.0f);
+	if(minX <= 0) minX = 0;
+
+	int minY = CWorld::GetSectorIndexY(pos.y - 80.0f);
+	if(minY <= 0) minY = 0;
+
+	int maxX = CWorld::GetSectorIndexX(pos.x + 80.0f);
+	if(maxX >= NUMSECTORS_X) maxX = NUMSECTORS_X - 1;
+
+	int maxY = CWorld::GetSectorIndexY(pos.y + 80.0f);
+	if(maxY >= NUMSECTORS_Y) maxY = NUMSECTORS_Y - 1;
+
+	int x, y;
+	for(y = minY; y <= maxY; y++){
+		for(x = minX; x <= maxX; x++){
+			CSector *sector = CWorld::GetSector(x, y);
+			InstanceLoadedModelsInSectorList(sector->m_lists[ENTITYLIST_BUILDINGS]);
+			InstanceLoadedModelsInSectorList(sector->m_lists[ENTITYLIST_BUILDINGS_OVERLAP]);
+			InstanceLoadedModelsInSectorList(sector->m_lists[ENTITYLIST_OBJECTS]);
+			InstanceLoadedModelsInSectorList(sector->m_lists[ENTITYLIST_DUMMIES]);
+		}
+	}
+}
+
+void
+CStreaming::RequestIslands(eLevelName level)
+{
+	ISLAND_LOADING_ISNT(HIGH)
+	switch(level){
+	case LEVEL_MAINLAND:
+		if(islandLODbeach != -1)
+			RequestModel(islandLODbeach, BIGBUILDINGFLAGS);
+		break;
+	case LEVEL_BEACH:
+		if(islandLODmainland != -1)
+			RequestModel(islandLODmainland, BIGBUILDINGFLAGS);
+		break;
+	default: break;
+	}
+}
+
+static char *IGnames[] = {
+	"player",
+	"player2",
+	"player3",
+	"player4",
+	"player5",
+	"player6",
+	"player7",
+	"player8",
+	"player9",
+	"play10",
+	"play11",
+	"igken",
+	"igcandy",
+	"igsonny",
+	"igbuddy",
+	"igjezz",
+	"ighlary",
+	"igphil",
+	"igmerc",
+	"igdick",
+	"igdiaz",
+	""
+};
+
+static char *CSnames[] = {
+	"csplay",
+	"csplay2",
+	"csplay3",
+	"csplay4",
+	"csplay5",
+	"csplay6",
+	"csplay7",
+	"csplay8",
+	"csplay9",
+	"csplay10",
+	"csplay11",
+	"csken",
+	"cscandy",
+	"cssonny",
+	"csbuddy",
+	"csjezz",
+	"cshlary",
+	"csphil",
+	"csmerc",
+	"csdick",
+	"csdiaz",
+	""
+};
+
+void
+CStreaming::RequestSpecialModel(int32 modelId, const char *modelName, int32 flags)
+{
+	CBaseModelInfo *mi;
+	int txdId;
+	char oldName[48];
+	uint32 pos, size;
+	int i, n;
+
+	mi = CModelInfo::GetModelInfo(modelId);
+	if(strncasecmp("CSPlay", modelName, 6) == 0){
+		char *curname = CModelInfo::GetModelInfo(MI_PLAYER)->GetModelName();
+		for(int i = 0; CSnames[i][0]; i++){
+			if(strcasecmp(curname, IGnames[i]) == 0){
+				modelName = CSnames[i];
+				break;
+			}
+		}
+	}
+	if(!CGeneral::faststrcmp(mi->GetModelName(), modelName)){
+		// Already have the correct name, just request it
+		RequestModel(modelId, flags);
+		return;
+	}
+
+	if(mi->GetNumRefs() > 0){
+		n = CPools::GetPedPool()->GetSize()-1;
+		for(i = n; i >= 0 && mi->GetNumRefs() > 0; i--){
+			CPed *ped = CPools::GetPedPool()->GetSlot(i);
+			if(ped && ped->GetModelIndex() == modelId &&
+			   !ped->IsPlayer() && ped->CanBeDeletedEvenInVehicle())
+				CTheScripts::RemoveThisPed(ped);
+		}
+		n = CPools::GetObjectPool()->GetSize()-1;
+		for(i = n; i >= 0 && mi->GetNumRefs() > 0; i--){
+			CObject *obj = CPools::GetObjectPool()->GetSlot(i);
+			if(obj && obj->GetModelIndex() == modelId && obj->CanBeDeleted()){
+				CWorld::Remove(obj);
+				CWorld::RemoveReferencesToDeletedObject(obj);
+				delete obj;
+			}
+		}
+	}
+
+	strcpy(oldName, mi->GetModelName());
+	mi->SetModelName(modelName);
+
+	// What exactly is going on here?
+	if(CModelInfo::GetModelInfo(oldName, nil)){
+		txdId = CTxdStore::FindTxdSlot(oldName);
+		if(txdId != -1 && CTxdStore::GetSlot(txdId)->texDict){
+			CTxdStore::AddRef(txdId);
+			RemoveModel(modelId);
+			CTxdStore::RemoveRefWithoutDelete(txdId);
+		}else
+			RemoveModel(modelId);
+	}else
+		RemoveModel(modelId);
+
+	bool found = ms_pExtraObjectsDir->FindItem(modelName, pos, size);
+	assert(found);
+	mi->ClearTexDictionary();
+	if(CTxdStore::FindTxdSlot(modelName) == -1)
+		mi->SetTexDictionary("generic");
+	else
+		mi->SetTexDictionary(modelName);
+	ms_aInfoForModel[modelId].SetCdPosnAndSize(pos, size);
+	RequestModel(modelId, flags);
+}
+
+void
+CStreaming::RequestSpecialChar(int32 charId, const char *modelName, int32 flags)
+{
+	RequestSpecialModel(charId + MI_SPECIAL01, modelName, flags);
+}
+
+bool
+CStreaming::HasSpecialCharLoaded(int32 id)
+{
+	return HasModelLoaded(id + MI_SPECIAL01);
+}
+
+void
+CStreaming::SetMissionDoesntRequireSpecialChar(int32 id)
+{
+	return SetMissionDoesntRequireModel(id + MI_SPECIAL01);
+}
+
+void
+CStreaming::DecrementRef(int32 id)
+{
+	ms_numModelsRequested--;
+	if(ms_aInfoForModel[id].IsPriority()){
+		ms_aInfoForModel[id].m_flags &= ~STREAMFLAGS_PRIORITY;
+		ms_numPriorityRequests--;
+	}
+}
+
+void
+CStreaming::RemoveModel(int32 id)
+{
+	int i;
+
+	if(ms_aInfoForModel[id].m_loadState == STREAMSTATE_NOTLOADED)
+		return;
+
+	if(ms_aInfoForModel[id].m_loadState == STREAMSTATE_LOADED){
+		if(id < STREAM_OFFSET_TXD)
+			CModelInfo::GetModelInfo(id)->DeleteRwObject();
+		else if(id >= STREAM_OFFSET_TXD && id < STREAM_OFFSET_COL)
+			CTxdStore::RemoveTxd(id - STREAM_OFFSET_TXD);
+		else if(id >= STREAM_OFFSET_COL && id < STREAM_OFFSET_ANIM)
+			CColStore::RemoveCol(id - STREAM_OFFSET_COL);
+		else if(id >= STREAM_OFFSET_ANIM){
+			assert(id < NUMSTREAMINFO);
+			CAnimManager::RemoveAnimBlock(id - STREAM_OFFSET_ANIM);
+		}
+		ms_memoryUsed -= ms_aInfoForModel[id].GetCdSize()*CDSTREAM_SECTOR_SIZE;
+	}
+
+	if(ms_aInfoForModel[id].m_next){
+		// Remove from list, model is neither loaded nor requested
+		if(ms_aInfoForModel[id].m_loadState == STREAMSTATE_INQUEUE)
+			DecrementRef(id);
+		ms_aInfoForModel[id].RemoveFromList();
+	}else if(ms_aInfoForModel[id].m_loadState == STREAMSTATE_READING){
+		for(i = 0; i < 4; i++){
+			if(ms_channel[0].streamIds[i] == id)
+				ms_channel[0].streamIds[i] = -1;
+			if(ms_channel[1].streamIds[i] == id)
+				ms_channel[1].streamIds[i] = -1;
+		}
+	}
+
+	if(ms_aInfoForModel[id].m_loadState == STREAMSTATE_STARTED){
+		if(id < STREAM_OFFSET_TXD)
+			RpClumpGtaCancelStream();
+		else if(id >= STREAM_OFFSET_TXD && id < STREAM_OFFSET_COL)
+			CTxdStore::RemoveTxd(id - STREAM_OFFSET_TXD);
+		else if(id >= STREAM_OFFSET_COL && id < STREAM_OFFSET_ANIM)
+			CColStore::RemoveCol(id - STREAM_OFFSET_COL);
+		else if(id >= STREAM_OFFSET_ANIM){
+			assert(id < NUMSTREAMINFO);
+			CAnimManager::RemoveAnimBlock(id - STREAM_OFFSET_ANIM);
+		}
+	}
+
+	ms_aInfoForModel[id].m_loadState = STREAMSTATE_NOTLOADED;
+}
+
+void
+CStreaming::RemoveUnusedBuildings(eLevelName level)
+{
+	if(level != LEVEL_BEACH)
+		RemoveBuildings(LEVEL_BEACH);
+	if(level != LEVEL_MAINLAND)
+		RemoveBuildings(LEVEL_MAINLAND);
+}
+
+void
+CStreaming::RemoveBuildings(eLevelName level)
+{
+	int i, n;
+	CEntity *e;
+	CBaseModelInfo *mi;
+
+	n = CPools::GetBuildingPool()->GetSize()-1;
+	for(i = n; i >= 0; i--){
+		e = CPools::GetBuildingPool()->GetSlot(i);
+		if(e && e->m_level == level){
+			mi = CModelInfo::GetModelInfo(e->GetModelIndex());
+			if(!e->bImBeingRendered){
+				e->DeleteRwObject();
+				if (mi->GetNumRefs() == 0)
+					RemoveModel(e->GetModelIndex());
+			}
+		}
+	}
+
+	n = CPools::GetTreadablePool()->GetSize()-1;
+	for(i = n; i >= 0; i--){
+		e = CPools::GetTreadablePool()->GetSlot(i);
+		if(e && e->m_level == level){
+			mi = CModelInfo::GetModelInfo(e->GetModelIndex());
+			if(!e->bImBeingRendered){
+				e->DeleteRwObject();
+				if (mi->GetNumRefs() == 0)
+					RemoveModel(e->GetModelIndex());
+			}
+		}
+	}
+
+	n = CPools::GetObjectPool()->GetSize()-1;
+	for(i = n; i >= 0; i--){
+		e = CPools::GetObjectPool()->GetSlot(i);
+		if(e && e->m_level == level){
+			mi = CModelInfo::GetModelInfo(e->GetModelIndex());
+			if(!e->bImBeingRendered && ((CObject*)e)->ObjectCreatedBy == GAME_OBJECT){
+				e->DeleteRwObject();
+				if (mi->GetNumRefs() == 0)
+					RemoveModel(e->GetModelIndex());
+			}
+		}
+	}
+
+	n = CPools::GetDummyPool()->GetSize()-1;
+	for(i = n; i >= 0; i--){
+		e = CPools::GetDummyPool()->GetSlot(i);
+		if(e && e->m_level == level){
+			mi = CModelInfo::GetModelInfo(e->GetModelIndex());
+			if(!e->bImBeingRendered){
+				e->DeleteRwObject();
+				if (mi->GetNumRefs() == 0)
+					RemoveModel(e->GetModelIndex());
+			}
+		}
+	}
+}
+
+void
+CStreaming::RemoveBuildingsNotInArea(int32 area)
+{
+	int i, n;
+	CEntity *e;
+
+	n = CPools::GetBuildingPool()->GetSize()-1;
+	for(i = n; i >= 0; i--){
+		e = CPools::GetBuildingPool()->GetSlot(i);
+		if(e && e->m_rwObject && !IsAreaVisible(area) &&
+		   (!e->bIsBIGBuilding || e->bStreamBIGBuilding)){
+			if(e->bIsBIGBuilding)
+				RequestModel(e->GetModelIndex(), 0);
+			if(!e->bImBeingRendered)
+				e->DeleteRwObject();
+		}
+	}
+
+	n = CPools::GetTreadablePool()->GetSize()-1;
+	for(i = n; i >= 0; i--){
+		e = CPools::GetTreadablePool()->GetSlot(i);
+		if(e && e->m_rwObject && !IsAreaVisible(area) &&
+		   (!e->bIsBIGBuilding || e->bStreamBIGBuilding)){
+			if(e->bIsBIGBuilding)
+				RequestModel(e->GetModelIndex(), 0);
+			if(!e->bImBeingRendered)
+				e->DeleteRwObject();
+		}
+	}
+
+	n = CPools::GetObjectPool()->GetSize()-1;
+	for(i = n; i >= 0; i--){
+		e = CPools::GetObjectPool()->GetSlot(i);
+		if(e && e->m_rwObject && !IsAreaVisible(area) &&
+		   (!e->bIsBIGBuilding || e->bStreamBIGBuilding)){
+			if(e->bIsBIGBuilding)
+				RequestModel(e->GetModelIndex(), 0);
+			if(!e->bImBeingRendered)
+				e->DeleteRwObject();
+		}
+	}
+
+	n = CPools::GetDummyPool()->GetSize()-1;
+	for(i = n; i >= 0; i--){
+		e = CPools::GetDummyPool()->GetSlot(i);
+		if(e && e->m_rwObject && !IsAreaVisible(area) &&
+		   (!e->bIsBIGBuilding || e->bStreamBIGBuilding)){
+			if(e->bIsBIGBuilding)
+				RequestModel(e->GetModelIndex(), 0);
+			if(!e->bImBeingRendered)
+				e->DeleteRwObject();
+		}
+	}
+}
+
+void
+CStreaming::RemoveUnusedBigBuildings(eLevelName level)
+{
+	ISLAND_LOADING_IS(LOW)
+	{
+	if(level != LEVEL_BEACH)
+		RemoveBigBuildings(LEVEL_BEACH);
+	if(level != LEVEL_MAINLAND)
+		RemoveBigBuildings(LEVEL_MAINLAND);
+	}
+	RemoveIslandsNotUsed(level);
+}
+
+void
+DeleteIsland(CEntity *island)
+{
+	if(island == nil)
+		return;
+	if(island->bImBeingRendered)
+		debug("Didn't delete island because it was being rendered\n");
+	else{
+		island->DeleteRwObject();
+		CStreaming::RemoveModel(island->GetModelIndex());
+	}
+}
+
+void
+CStreaming::RemoveIslandsNotUsed(eLevelName level)
+{
+	int i;
+	if(pIslandLODmainlandEntity == nil)
+	for(i = CPools::GetBuildingPool()->GetSize()-1; i >= 0; i--){
+		CBuilding *building = CPools::GetBuildingPool()->GetSlot(i);
+		if(building == nil)
+			continue;
+		if(building->GetModelIndex() == islandLODmainland)
+			pIslandLODmainlandEntity = building;
+		if(building->GetModelIndex() == islandLODbeach)
+			pIslandLODbeachEntity = building;
+	}
+#ifdef NO_ISLAND_LOADING
+	if(FrontEndMenuManager.m_PrefsIslandLoading == CMenuManager::ISLAND_LOADING_HIGH) {
+		DeleteIsland(pIslandLODmainlandEntity);
+		DeleteIsland(pIslandLODbeachEntity);
+	} else
+#endif
+	switch(level){
+	case LEVEL_MAINLAND:
+		DeleteIsland(pIslandLODmainlandEntity);
+		break;
+	case LEVEL_BEACH:
+		DeleteIsland(pIslandLODbeachEntity);
+
+		break;
+	}
+}
+
+void
+CStreaming::RemoveBigBuildings(eLevelName level)
+{
+	int i, n;
+	CEntity *e;
+	CBaseModelInfo *mi;
+
+	n = CPools::GetBuildingPool()->GetSize()-1;
+	for(i = n; i >= 0; i--){
+		e = CPools::GetBuildingPool()->GetSlot(i);
+		if(e && e->bIsBIGBuilding && e->m_level == level){
+			mi = CModelInfo::GetModelInfo(e->GetModelIndex());
+			if(!e->bImBeingRendered){
+				e->DeleteRwObject();
+				if (mi->GetNumRefs() == 0)
+					RemoveModel(e->GetModelIndex());
+			}
+		}
+	}
+}
+
+bool
+CStreaming::RemoveLoadedVehicle(void)
+{
+	int i, id;
+
+	for(i = 0; i < MAXVEHICLESLOADED; i++){
+		ms_lastVehicleDeleted++;
+		if(ms_lastVehicleDeleted == MAXVEHICLESLOADED)
+			ms_lastVehicleDeleted = 0;
+		id = ms_vehiclesLoaded[ms_lastVehicleDeleted];
+		if(id != -1 && CanRemoveModel(id) && CModelInfo::GetModelInfo(id)->GetNumRefs() == 0 &&
+		   ms_aInfoForModel[id].m_loadState == STREAMSTATE_LOADED)
+			goto found;
+	}
+	return false;
+found:
+	RemoveModel(ms_vehiclesLoaded[ms_lastVehicleDeleted]);
+	ms_numVehiclesLoaded--;
+	ms_vehiclesLoaded[ms_lastVehicleDeleted] = -1;
+	CVehicleModelInfo* pVehicleInfo = (CVehicleModelInfo*)CModelInfo::GetModelInfo(id);
+	if (pVehicleInfo->m_vehicleClass != -1)
+		CCarCtrl::RemoveFromLoadedVehicleArray(id, pVehicleInfo->m_vehicleClass);
+	return true;
+}
+
+bool
+CStreaming::RemoveLeastUsedModel(uint32 excludeMask)
+{
+	CStreamingInfo *si;
+	int streamId;
+
+	for(si = ms_endLoadedList.m_prev; si != &ms_startLoadedList; si = si->m_prev){
+		if(si->m_flags & excludeMask)
+			continue;
+		streamId = si - ms_aInfoForModel;
+		if(streamId < STREAM_OFFSET_TXD){
+			if (CModelInfo::GetModelInfo(streamId)->GetNumRefs() == 0) {
+				RemoveModel(streamId);
+				return true;
+			}
+		}else if(streamId >= STREAM_OFFSET_TXD && streamId < STREAM_OFFSET_COL){
+			if(CTxdStore::GetNumRefs(streamId - STREAM_OFFSET_TXD) == 0 &&
+			   !IsTxdUsedByRequestedModels(streamId - STREAM_OFFSET_TXD)){
+				RemoveModel(streamId);
+				return true;
+			}
+		}else if(streamId >= STREAM_OFFSET_ANIM){
+			assert(streamId < NUMSTREAMINFO);
+			if(CAnimManager::GetNumRefsToAnimBlock(streamId - STREAM_OFFSET_ANIM) == 0 &&
+			   !AreAnimsUsedByRequestedModels(streamId - STREAM_OFFSET_ANIM)){
+				RemoveModel(streamId);
+				return true;
+			}
+		}
+	}
+	return (ms_numVehiclesLoaded > 7 || CGame::currArea != AREA_MAIN_MAP && ms_numVehiclesLoaded > 4) && RemoveLoadedVehicle();
+}
+
+void
+CStreaming::RemoveAllUnusedModels(void)
+{
+	int i;
+
+	for(i = 0; i < MAXVEHICLESLOADED; i++)
+		RemoveLoadedVehicle();
+
+	for(i = NUM_DEFAULT_MODELS; i < MODELINFOSIZE; i++){
+		if(ms_aInfoForModel[i].m_loadState == STREAMSTATE_LOADED &&
+		    CModelInfo::GetModelInfo(i)->GetNumRefs() == 0) {
+			RemoveModel(i);
+			ms_aInfoForModel[i].m_loadState = STREAMSTATE_NOTLOADED;
+		}
+	}
+}
+
+void
+CStreaming::RemoveUnusedModelsInLoadedList(void)
+{
+	// empty
+}
+
+bool
+CStreaming::RemoveLoadedZoneModel(void)
+{
+	int i;
+
+	if(ms_currentPedGrp == -1)
+		return false;
+
+	for(i = 0; i < NUMMODELSPERPEDGROUP; i++){
+		int mi = CPopulation::ms_pPedGroups[ms_currentPedGrp].models[i];
+		if(mi != -1 && ms_bIsPedFromPedGroupLoaded[i] &&
+		   HasModelLoaded(mi) &&  CanRemoveModel(mi) &&
+		   CModelInfo::GetModelInfo(mi)->GetNumRefs() == 0){
+			RemoveModel(CPopulation::ms_pPedGroups[ms_currentPedGrp].models[i]);
+			ms_numPedsLoaded--;
+			ms_bIsPedFromPedGroupLoaded[i] = false;
+			return true;
+		}
+	}
+
+	return false;
+}
+
+bool
+CStreaming::IsTxdUsedByRequestedModels(int32 txdId)
+{
+	CStreamingInfo *si;
+	int streamId;
+	int i;
+
+	for(si = ms_startRequestedList.m_next; si != &ms_endRequestedList; si = si->m_next){
+		streamId = si - ms_aInfoForModel;
+		if(streamId < STREAM_OFFSET_TXD &&
+		   CModelInfo::GetModelInfo(streamId)->GetTxdSlot() == txdId)
+			return true;
+	}
+
+	for(i = 0; i < 4; i++){
+		streamId = ms_channel[0].streamIds[i];
+		if(streamId != -1 && streamId < STREAM_OFFSET_TXD &&
+		   CModelInfo::GetModelInfo(streamId)->GetTxdSlot() == txdId)
+			return true;
+		streamId = ms_channel[1].streamIds[i];
+		if(streamId != -1 && streamId < STREAM_OFFSET_TXD &&
+		   CModelInfo::GetModelInfo(streamId)->GetTxdSlot() == txdId)
+			return true;
+	}
+
+	return false;
+}
+
+bool
+CStreaming::AreAnimsUsedByRequestedModels(int32 animId)
+{
+	CStreamingInfo *si;
+	int streamId;
+	int i;
+
+	for(si = ms_startRequestedList.m_next; si != &ms_endRequestedList; si = si->m_next){
+		streamId = si - ms_aInfoForModel;
+		if(streamId < STREAM_OFFSET_TXD &&
+		   CModelInfo::GetModelInfo(streamId)->GetAnimFileIndex() == animId)
+			return true;
+	}
+
+	for(i = 0; i < 4; i++){
+		streamId = ms_channel[0].streamIds[i];
+		if(streamId != -1 && streamId < STREAM_OFFSET_TXD &&
+		   CModelInfo::GetModelInfo(streamId)->GetAnimFileIndex() == animId)
+			return true;
+		streamId = ms_channel[1].streamIds[i];
+		if(streamId != -1 && streamId < STREAM_OFFSET_TXD &&
+		   CModelInfo::GetModelInfo(streamId)->GetAnimFileIndex() == animId)
+			return true;
+	}
+
+	return false;
+}
+
+int32
+CStreaming::GetAvailableVehicleSlot(void)
+{
+	int i;
+	for(i = 0; i < MAXVEHICLESLOADED; i++)
+		if(ms_vehiclesLoaded[i] == -1)
+			return i;
+	return -1;
+}
+
+bool
+CStreaming::AddToLoadedVehiclesList(int32 modelId)
+{
+	int i;
+	int id;
+
+	if(ms_numVehiclesLoaded < desiredNumVehiclesLoaded){
+		// still room for vehicles
+		for(i = 0; i < MAXVEHICLESLOADED; i++){
+			if(ms_vehiclesLoaded[ms_lastVehicleDeleted] == -1)
+				break;
+			ms_lastVehicleDeleted++;
+			if(ms_lastVehicleDeleted == MAXVEHICLESLOADED)
+				ms_lastVehicleDeleted = 0;
+		}
+		assert(ms_vehiclesLoaded[ms_lastVehicleDeleted] == -1);
+		ms_numVehiclesLoaded++;
+	}else{
+		// find vehicle we can remove
+		for(i = 0; i < MAXVEHICLESLOADED; i++){
+			id = ms_vehiclesLoaded[ms_lastVehicleDeleted];
+			if(id != -1 && CanRemoveModel(id) &&
+			   CModelInfo::GetModelInfo(id)->GetNumRefs() == 0)
+				goto found;
+			ms_lastVehicleDeleted++;
+			if(ms_lastVehicleDeleted == MAXVEHICLESLOADED)
+				ms_lastVehicleDeleted = 0;
+		}
+		id = -1;
+found:
+		if(id == -1){
+			// didn't find anything, try a free slot
+			id = GetAvailableVehicleSlot();
+			if(id == -1)
+				return false;	// still no luck
+			ms_lastVehicleDeleted = id;
+			// this is more than we wanted actually
+			ms_numVehiclesLoaded++;
+		}
+		else{
+			RemoveModel(id);
+			CVehicleModelInfo* pVehicleInfo = (CVehicleModelInfo*)CModelInfo::GetModelInfo(id);
+			if (pVehicleInfo->m_vehicleClass != -1)
+				CCarCtrl::RemoveFromLoadedVehicleArray(id, pVehicleInfo->m_vehicleClass);
+		}
+	}
+
+	ms_vehiclesLoaded[ms_lastVehicleDeleted++] = modelId;
+	if(ms_lastVehicleDeleted == MAXVEHICLESLOADED)
+		ms_lastVehicleDeleted = 0;
+	CVehicleModelInfo* pVehicleInfo = (CVehicleModelInfo*)CModelInfo::GetModelInfo(modelId);
+	if (pVehicleInfo->m_vehicleClass != -1)
+		CCarCtrl::AddToLoadedVehicleArray(modelId, pVehicleInfo->m_vehicleClass, pVehicleInfo->m_frequency);
+	return true;
+}
+
+bool
+CStreaming::IsObjectInCdImage(int32 id)
+{
+	uint32 posn, size;
+	return ms_aInfoForModel[id].GetCdPosnAndSize(posn, size);
+}
+
+void
+CStreaming::SetModelIsDeletable(int32 id)
+{
+	ms_aInfoForModel[id].m_flags &= ~STREAMFLAGS_DONT_REMOVE;
+	if ((id >= STREAM_OFFSET_TXD && id < STREAM_OFFSET_COL || CModelInfo::GetModelInfo(id)->GetModelType() != MITYPE_VEHICLE) &&
+	   (ms_aInfoForModel[id].m_flags & STREAMFLAGS_SCRIPTOWNED) == 0){
+		if(ms_aInfoForModel[id].m_loadState != STREAMSTATE_LOADED)
+			RemoveModel(id);
+		else if(ms_aInfoForModel[id].m_next == nil)
+			ms_aInfoForModel[id].AddToList(&ms_startLoadedList);
+	}
+}
+
+void
+CStreaming::SetModelTxdIsDeletable(int32 id)
+{
+	SetModelIsDeletable(CModelInfo::GetModelInfo(id)->GetTxdSlot() + STREAM_OFFSET_TXD);
+}
+
+void
+CStreaming::SetMissionDoesntRequireModel(int32 id)
+{
+	ms_aInfoForModel[id].m_flags &= ~STREAMFLAGS_SCRIPTOWNED;
+	if ((id >= STREAM_OFFSET_TXD || CModelInfo::GetModelInfo(id)->GetModelType() != MITYPE_VEHICLE) &&
+	   (ms_aInfoForModel[id].m_flags & STREAMFLAGS_DONT_REMOVE) == 0){
+		if(ms_aInfoForModel[id].m_loadState != STREAMSTATE_LOADED)
+			RemoveModel(id);
+		else if(ms_aInfoForModel[id].m_next == nil)
+			ms_aInfoForModel[id].AddToList(&ms_startLoadedList);
+	}
+}
+
+void
+CStreaming::LoadInitialPeds(void)
+{
+	RequestModel(MI_COP, STREAMFLAGS_DONT_REMOVE);
+	RequestModel(MI_MALE01, STREAMFLAGS_DONT_REMOVE);
+	RequestModel(MI_TAXI_D, STREAMFLAGS_DONT_REMOVE);
+}
+
+void
+CStreaming::LoadInitialWeapons(void)
+{
+	CStreaming::RequestModel(MI_NIGHTSTICK, STREAMFLAGS_DONT_REMOVE);
+	CStreaming::RequestModel(MI_MISSILE, STREAMFLAGS_DONT_REMOVE);
+}
+
+void
+CStreaming::LoadInitialVehicles(void)
+{
+	ms_numVehiclesLoaded = 0;
+	ms_lastVehicleDeleted = 0;
+
+	RequestModel(MI_POLICE, STREAMFLAGS_DONT_REMOVE);
+}
+
+void
+CStreaming::StreamVehiclesAndPeds(void)
+{
+	int i, model;
+	static int timeBeforeNextLoad = 0;
+	static int modelQualityClass = 0;
+
+	if(CRecordDataForGame::IsRecording() ||
+	   CRecordDataForGame::IsPlayingBack()
+#ifdef FIX_BUGS
+	   || CReplay::IsPlayingBack()
+#endif
+		)
+		return;
+
+	if(FindPlayerPed()->m_pWanted->AreSwatRequired()){
+		RequestModel(MI_ENFORCER, STREAMFLAGS_DONT_REMOVE);
+		RequestModel(MI_SWAT, STREAMFLAGS_DONT_REMOVE);
+	}else{
+		SetModelIsDeletable(MI_ENFORCER);
+		if(!HasModelLoaded(MI_ENFORCER))
+			SetModelIsDeletable(MI_SWAT);
+	}
+
+	if(FindPlayerPed()->m_pWanted->AreFbiRequired()){
+		RequestModel(MI_FBIRANCH, STREAMFLAGS_DONT_REMOVE);
+		RequestModel(MI_FBI, STREAMFLAGS_DONT_REMOVE);
+	}else{
+		SetModelIsDeletable(MI_FBIRANCH);
+		if(!HasModelLoaded(MI_FBIRANCH))
+			SetModelIsDeletable(MI_FBI);
+	}
+
+	if(FindPlayerPed()->m_pWanted->AreArmyRequired()){
+		RequestModel(MI_RHINO, STREAMFLAGS_DONT_REMOVE);
+		RequestModel(MI_BARRACKS, STREAMFLAGS_DONT_REMOVE);
+		RequestModel(MI_ARMY, STREAMFLAGS_DONT_REMOVE);
+	}else{
+		SetModelIsDeletable(MI_RHINO);
+		SetModelIsDeletable(MI_BARRACKS);
+		if(!HasModelLoaded(MI_RHINO) && !HasModelLoaded(MI_BARRACKS))
+			SetModelIsDeletable(MI_ARMY);
+	}
+
+	if(FindPlayerPed()->m_pWanted->NumOfHelisRequired() > 0)
+		RequestModel(MI_CHOPPER, STREAMFLAGS_DONT_REMOVE);
+	else
+		SetModelIsDeletable(MI_CHOPPER);
+
+	if (FindPlayerPed()->m_pWanted->AreMiamiViceRequired()) {
+		SetModelIsDeletable(MI_VICE1);
+		SetModelIsDeletable(MI_VICE2);
+		SetModelIsDeletable(MI_VICE3);
+		SetModelIsDeletable(MI_VICE4);
+		SetModelIsDeletable(MI_VICE5);
+		SetModelIsDeletable(MI_VICE6);
+		SetModelIsDeletable(MI_VICE7);
+		SetModelIsDeletable(MI_VICE8);
+		RequestModel(MI_VICECHEE, STREAMFLAGS_DONT_REMOVE);
+		if(CPopulation::NumMiamiViceCops == 0)
+			switch (CCarCtrl::MiamiViceCycle) {
+			case 0:
+				RequestModel(MI_VICE1, STREAMFLAGS_DONT_REMOVE);
+				RequestModel(MI_VICE2, STREAMFLAGS_DONT_REMOVE);
+				break;
+			case 1:
+				RequestModel(MI_VICE3, STREAMFLAGS_DONT_REMOVE);
+				RequestModel(MI_VICE4, STREAMFLAGS_DONT_REMOVE);
+				break;
+			case 2:
+				RequestModel(MI_VICE5, STREAMFLAGS_DONT_REMOVE);
+				RequestModel(MI_VICE6, STREAMFLAGS_DONT_REMOVE);
+				break;
+			case 3:
+				RequestModel(MI_VICE7, STREAMFLAGS_DONT_REMOVE);
+				RequestModel(MI_VICE8, STREAMFLAGS_DONT_REMOVE);
+				break;
+			}
+	}
+	else {
+		SetModelIsDeletable(MI_VICECHEE);
+		SetModelIsDeletable(MI_VICE1);
+		SetModelIsDeletable(MI_VICE2);
+		SetModelIsDeletable(MI_VICE3);
+		SetModelIsDeletable(MI_VICE4);
+		SetModelIsDeletable(MI_VICE5);
+		SetModelIsDeletable(MI_VICE6);
+		SetModelIsDeletable(MI_VICE7);
+		SetModelIsDeletable(MI_VICE8);
+	}
+
+	if(timeBeforeNextLoad >= 0)
+		timeBeforeNextLoad--;
+	else if(ms_numVehiclesLoaded <= desiredNumVehiclesLoaded){
+		CZoneInfo zone;
+		CVector coors = FindPlayerCoors();
+		CTheZones::GetZoneInfoForTimeOfDay(&coors, &zone);
+		int32 maxReq = -1;
+		int32 mostRequestedRating = 0;
+		for(i = 0; i < CCarCtrl::TOTAL_CUSTOM_CLASSES; i++){
+			if(CCarCtrl::NumRequestsOfCarRating[i] > maxReq &&
+				((i == 0 && zone.carThreshold[0] != 0) ||
+				(i != 0 && zone.carThreshold[i] != zone.carThreshold[i-1]))) {
+				maxReq = CCarCtrl::NumRequestsOfCarRating[i];
+				mostRequestedRating = i;
+			}
+		}
+		model = CCarCtrl::ChooseCarModelToLoad(mostRequestedRating);
+		if(!HasModelLoaded(model)){
+			RequestModel(model, STREAMFLAGS_DEPENDENCY);
+			timeBeforeNextLoad = 350;
+		}
+		CCarCtrl::NumRequestsOfCarRating[mostRequestedRating] = 0;
+	}
+}
+
+void
+CStreaming::StreamZoneModels(const CVector &pos)
+{
+	int i, j;
+	uint16 gangsToLoad, gangCarsToLoad, bit;
+	CZoneInfo info;
+	static int timeBeforeNextLoad = 0;
+
+	CTheZones::GetZoneInfoForTimeOfDay(&pos, &info);
+
+	if(info.pedGroup != ms_currentPedGrp){
+
+		// unload pevious group
+		if(ms_currentPedGrp != -1)
+			for(i = 0; i < NUMMODELSPERPEDGROUP; i++){
+				ms_bIsPedFromPedGroupLoaded[i] = false;
+				if(CPopulation::ms_pPedGroups[ms_currentPedGrp].models[i] != -1){
+					SetModelIsDeletable(CPopulation::ms_pPedGroups[ms_currentPedGrp].models[i]);
+					SetModelTxdIsDeletable(CPopulation::ms_pPedGroups[ms_currentPedGrp].models[i]);
+				}
+			}
+
+		ms_currentPedGrp = info.pedGroup;
+
+		for(i = 0; i < MAXZONEPEDSLOADED; i++){
+			do
+				j = CGeneral::GetRandomNumberInRange(0, NUMMODELSPERPEDGROUP);
+			while(ms_bIsPedFromPedGroupLoaded[j]);
+			ms_bIsPedFromPedGroupLoaded[j] = true;
+			if(CPopulation::ms_pPedGroups[ms_currentPedGrp].models[j] != -1)
+				RequestModel(CPopulation::ms_pPedGroups[ms_currentPedGrp].models[j], STREAMFLAGS_DEPENDENCY);
+		}
+		ms_numPedsLoaded = MAXZONEPEDSLOADED;
+		timeBeforeNextLoad = 300;
+	}
+
+	if(timeBeforeNextLoad >= 0)
+		timeBeforeNextLoad--;
+	else{
+		// Switch a ped
+		int oldMI;
+		// Find a ped to unload
+		for(i = 0; i < NUMMODELSPERPEDGROUP; i++)
+			if(ms_bIsPedFromPedGroupLoaded[i]){
+				oldMI = CPopulation::ms_pPedGroups[ms_currentPedGrp].models[i];
+				if(oldMI != -1 && CModelInfo::GetModelInfo(oldMI)->GetNumRefs() == 0)
+					break;
+			}
+		// And load a new one
+		if(i != NUMMODELSPERPEDGROUP || ms_numPedsLoaded < MAXZONEPEDSLOADED){
+			do
+				j = CGeneral::GetRandomNumberInRange(0, NUMMODELSPERPEDGROUP);
+			while(ms_bIsPedFromPedGroupLoaded[j]);
+			if(ms_numPedsLoaded == MAXZONEPEDSLOADED)
+				ms_bIsPedFromPedGroupLoaded[i] = false;
+			ms_bIsPedFromPedGroupLoaded[j] = true;
+			int newMI = CPopulation::ms_pPedGroups[ms_currentPedGrp].models[j];
+			if(newMI != oldMI){
+				RequestModel(newMI, STREAMFLAGS_DEPENDENCY);
+				debug("Request Ped %s\n", CModelInfo::GetModelInfo(newMI)->GetModelName());
+				if(ms_numPedsLoaded == MAXZONEPEDSLOADED){
+					SetModelIsDeletable(oldMI);
+					SetModelTxdIsDeletable(oldMI);
+					debug("Remove Ped %s\n", CModelInfo::GetModelInfo(oldMI)->GetModelName());
+				}else
+					ms_numPedsLoaded++;
+				timeBeforeNextLoad = 300;
+			}
+		}
+	}
+
+	RequestModel(MI_MALE01, STREAMFLAGS_DONT_REMOVE);
+	RequestModel(MI_TAXI_D, STREAMFLAGS_DONT_REMOVE);
+
+	gangsToLoad = 0;
+	gangCarsToLoad = 0;
+	if(info.gangPedThreshold[0] != info.copPedThreshold)
+		gangsToLoad = 1;
+	for(i = 1; i < NUM_GANGS; i++)
+		if(info.gangPedThreshold[i] != info.gangPedThreshold[i-1])
+			gangsToLoad |= 1<<i;
+	if(info.gangThreshold[0] != info.copThreshold)
+		gangCarsToLoad = 1;
+	for(i = 1; i < NUM_GANGS; i++)
+		if(info.gangThreshold[i] != info.gangThreshold[i-1])
+			gangCarsToLoad |= 1<<i;
+
+	if(gangsToLoad == ms_loadedGangs && gangCarsToLoad == ms_loadedGangCars)
+		return;
+
+	int gangModelsToload = gangsToLoad | gangCarsToLoad;
+
+	if(gangsToLoad != ms_loadedGangs || gangCarsToLoad != ms_loadedGangCars){
+		for(i = 0; i < NUM_GANGS; i++){
+			bit = 1<<i;
+
+			if(gangModelsToload & bit && (ms_loadedGangs & bit) == 0){
+				RequestModel(CGangs::GetGangPedModel1(i), STREAMFLAGS_DEPENDENCY);
+				RequestModel(CGangs::GetGangPedModel2(i), STREAMFLAGS_DEPENDENCY);
+				ms_loadedGangs |= bit;
+			}else if((gangModelsToload & bit) == 0 && ms_loadedGangs & bit){
+				SetModelIsDeletable(CGangs::GetGangPedModel1(i));
+				SetModelIsDeletable(CGangs::GetGangPedModel2(i));
+				SetModelTxdIsDeletable(CGangs::GetGangPedModel1(i));
+				SetModelTxdIsDeletable(CGangs::GetGangPedModel2(i));
+				ms_loadedGangs &= ~bit;
+			}
+
+			if(CGangs::GetGangVehicleModel(i) != -1){
+				if((gangCarsToLoad & bit) && (ms_loadedGangCars & bit) == 0){
+					RequestModel(CGangs::GetGangVehicleModel(i), STREAMFLAGS_DEPENDENCY);
+				}else if((gangCarsToLoad & bit) == 0 && ms_loadedGangCars & bit){
+					SetModelIsDeletable(CGangs::GetGangVehicleModel(i));
+					SetModelTxdIsDeletable(CGangs::GetGangVehicleModel(i));
+				}
+			}
+		}
+		ms_loadedGangCars = gangCarsToLoad;
+	}
+}
+
+void
+CStreaming::RemoveCurrentZonesModels(void)
+{
+	int i;
+
+	if (ms_currentPedGrp != -1)
+		for (i = 0; i < NUMMODELSPERPEDGROUP; i++) {
+			ms_bIsPedFromPedGroupLoaded[i] = false;
+			if (CPopulation::ms_pPedGroups[ms_currentPedGrp].models[i] != -1 &&
+			    CPopulation::ms_pPedGroups[ms_currentPedGrp].models[i] != MI_MALE01) {
+				SetModelIsDeletable(CPopulation::ms_pPedGroups[ms_currentPedGrp].models[i]);
+				SetModelTxdIsDeletable(CPopulation::ms_pPedGroups[ms_currentPedGrp].models[i]);
+			}
+		}
+
+	CStreaming::RequestModel(MI_MALE01, STREAMFLAGS_DONT_REMOVE);
+	CStreaming::RequestModel(MI_TAXI_D, STREAMFLAGS_DONT_REMOVE);
+
+	for (i = 0; i < NUM_GANGS; i++) {
+		if (CGangs::GetGangPedModel1(i) != -1) {
+			SetModelIsDeletable(CGangs::GetGangPedModel1(i));
+			SetModelTxdIsDeletable(CGangs::GetGangPedModel1(i));
+		}
+		if (CGangs::GetGangPedModel2(i) != -1) {
+			SetModelIsDeletable(CGangs::GetGangPedModel2(i));
+			SetModelTxdIsDeletable(CGangs::GetGangPedModel2(i));
+		}
+		if (CGangs::GetGangVehicleModel(i) != -1) {
+			SetModelIsDeletable(CGangs::GetGangVehicleModel(i));
+			SetModelTxdIsDeletable(CGangs::GetGangVehicleModel(i));
+		}
+	}
+
+	ms_currentPedGrp = -1;
+	ms_loadedGangs = 0;
+	ms_loadedGangCars = 0;
+}
+
+void
+CStreaming::LoadBigBuildingsWhenNeeded(void)
+{
+	// Very much like CCollision::Update and CCollision::LoadCollisionWhenINeedIt
+	if(CCutsceneMgr::IsCutsceneProcessing())
+		return;
+
+	if(CTheZones::m_CurrLevel == LEVEL_GENERIC || 
+	   CTheZones::m_CurrLevel == CGame::currLevel)
+		return;
+
+	CTimer::Suspend();
+	CGame::currLevel = CTheZones::m_CurrLevel;
+	ISLAND_LOADING_IS(LOW)
+	{
+		DMAudio.SetEffectsFadeVol(0);
+		CPad::StopPadsShaking();
+		CCollision::LoadCollisionScreen(CGame::currLevel);
+		DMAudio.Service();
+
+		RemoveUnusedBigBuildings(CGame::currLevel);
+		RemoveUnusedBuildings(CGame::currLevel);
+		RemoveUnusedModelsInLoadedList();
+		CGame::TidyUpMemory(true, true);
+	}
+	CReplay::EmptyReplayBuffer();
+	if(CGame::currLevel != LEVEL_GENERIC)
+		LoadSplash(GetLevelSplashScreen(CGame::currLevel));
+
+	ISLAND_LOADING_IS(LOW)
+		CStreaming::RequestBigBuildings(CGame::currLevel, TheCamera.GetPosition());
+#ifdef NO_ISLAND_LOADING
+	else if(FrontEndMenuManager.m_PrefsIslandLoading == CMenuManager::ISLAND_LOADING_MEDIUM) {
+		RemoveIslandsNotUsed(CGame::currLevel);
+		CStreaming::RequestIslands(CGame::currLevel);
+	}
+#endif
+
+	CStreaming::LoadAllRequestedModels(false);
+
+	CGame::TidyUpMemory(true, true);
+	CTimer::Resume();
+
+	ISLAND_LOADING_IS(LOW)
+		DMAudio.SetEffectsFadeVol(127);
+}
+
+
+// Find starting offset of the cdimage we next want to read
+// Not useful at all on PC...
+int32
+CStreaming::GetCdImageOffset(int32 lastPosn)
+{
+	int offset, off;
+	int i, img;
+	int dist, mindist;
+
+	img = -1;
+	mindist = INT32_MAX;
+	offset = ms_imageOffsets[ms_lastImageRead];
+	if(lastPosn <= offset || lastPosn > offset + ms_imageSize){
+		// last read position is not in last image
+		for(i = 0; i < NUMCDIMAGES; i++){
+			off = ms_imageOffsets[i];
+			if(off == -1) continue;
+			if((uint32)lastPosn > (uint32)off)
+				// after start of image, get distance from end
+				// negative if before end!
+				dist = lastPosn - (off + ms_imageSize);
+			else
+				// before image, get offset to start
+				// this will never be negative
+				dist = off - lastPosn;
+			if(dist < mindist){
+				img = i;
+				mindist = dist;
+			}
+		}
+		assert(img >= 0);
+		offset = ms_imageOffsets[img];
+		ms_lastImageRead = img;
+	}
+	return offset;
+}
+
+inline bool
+ModelNotLoaded(int32 modelId)
+{
+	CStreamingInfo *si = &CStreaming::ms_aInfoForModel[modelId];
+	return si->m_loadState != STREAMSTATE_LOADED && si->m_loadState != STREAMSTATE_READING;
+}
+
+inline bool TxdNotLoaded(int32 txdId) { return ModelNotLoaded(txdId + STREAM_OFFSET_TXD); }
+inline bool AnimNotLoaded(int32 animId) { return animId != -1 && ModelNotLoaded(animId + STREAM_OFFSET_ANIM); }
+
+// Find stream id of next requested file in cdimage
+int32
+CStreaming::GetNextFileOnCd(int32 lastPosn, bool priority)
+{
+	CStreamingInfo *si, *next;
+	int streamId;
+	uint32 posn, size;
+	int streamIdFirst, streamIdNext;
+	uint32 posnFirst, posnNext;
+
+	streamIdFirst = -1;
+	streamIdNext = -1;
+	posnFirst = UINT32_MAX;
+	posnNext = UINT32_MAX;
+
+	for(si = ms_startRequestedList.m_next; si != &ms_endRequestedList; si = next){
+		next = si->m_next;
+		streamId = si - ms_aInfoForModel;
+
+		// only priority requests if there are any
+		if(priority && ms_numPriorityRequests != 0 && !si->IsPriority())
+			continue;
+
+		// request Txds or anims if necessary
+		if(streamId < STREAM_OFFSET_TXD){
+			int txdId = CModelInfo::GetModelInfo(streamId)->GetTxdSlot();
+			if(TxdNotLoaded(txdId)){
+				ReRequestTxd(txdId);
+				continue;
+			}
+			int animId = CModelInfo::GetModelInfo(streamId)->GetAnimFileIndex();
+			if(AnimNotLoaded(animId)){
+				ReRequestAnim(animId);
+				continue;
+			}
+		}else if(streamId >= STREAM_OFFSET_ANIM && CCutsceneMgr::IsCutsceneProcessing())
+			continue;
+
+		if(ms_aInfoForModel[streamId].GetCdPosnAndSize(posn, size)){
+			if(posn < posnFirst){
+				// find first requested file in image
+				streamIdFirst = streamId;
+				posnFirst = posn;
+			}
+			if(posn < posnNext && posn >= (uint32)lastPosn){
+				// find first requested file after last read position
+				streamIdNext = streamId;
+				posnNext = posn;
+			}
+		}else{
+			// empty file
+			DecrementRef(streamId);
+			si->RemoveFromList();
+			si->m_loadState = STREAMSTATE_LOADED;
+		}
+	}
+
+	// wrap around
+	if(streamIdNext == -1)
+		streamIdNext = streamIdFirst;
+
+	if(streamIdNext == -1 && ms_numPriorityRequests != 0){
+		// try non-priority files
+		ms_numPriorityRequests = 0;
+		streamIdNext = GetNextFileOnCd(lastPosn, false);
+	}
+
+	return streamIdNext;
+}
+
+/*
+ * Streaming buffer size is half of the largest file.
+ * Files larger than the buffer size can only be loaded by channel 0,
+ * which then uses both buffers, while channel 1 is idle.
+ * ms_bLoadingBigModel is set to true to indicate this state.
+ */
+
+// Make channel read from disc
+void
+CStreaming::RequestModelStream(int32 ch)
+{
+	int lastPosn, imgOffset, streamId;
+	int totalSize;
+	uint32 posn, size, unused;
+	int i;
+	int haveBigFile, havePed;
+
+	lastPosn = CdStreamGetLastPosn();
+	imgOffset = GetCdImageOffset(lastPosn);
+	streamId = GetNextFileOnCd(lastPosn - imgOffset, true);
+
+	// remove Txds and Anims that aren't requested anymore
+	while(streamId != -1){
+		if(ms_aInfoForModel[streamId].m_flags & STREAMFLAGS_KEEP_IN_MEMORY)
+			break;
+		if(streamId >= STREAM_OFFSET_TXD && streamId < STREAM_OFFSET_COL){
+			if(IsTxdUsedByRequestedModels(streamId - STREAM_OFFSET_TXD))
+				break;
+		}else if(streamId >= STREAM_OFFSET_ANIM){
+			assert(streamId < NUMSTREAMINFO);
+			if(AreAnimsUsedByRequestedModels(streamId - STREAM_OFFSET_ANIM))
+				break;
+		}else
+			break;
+		RemoveModel(streamId);
+		// so try next file
+		ms_aInfoForModel[streamId].GetCdPosnAndSize(posn, size);
+		streamId = GetNextFileOnCd(posn + size, true);
+	}
+
+	if(streamId == -1)
+		return;
+
+	ms_aInfoForModel[streamId].GetCdPosnAndSize(posn, size);
+	if(size > (uint32)ms_streamingBufferSize){
+		// Can only load big models on channel 0, and 1 has to be idle
+		if(ch == 1 || ms_channel[1].state != CHANNELSTATE_IDLE)
+			return;
+		ms_bLoadingBigModel = true;
+	}
+
+	// Load up to 4 adjacent files
+	haveBigFile = 0;
+	havePed = 0;
+	totalSize = 0;
+	for(i = 0; i < 4; i++){
+		// no more files we can read
+		if(streamId == -1 || ms_aInfoForModel[streamId].m_loadState != STREAMSTATE_INQUEUE)
+			break;
+
+		// also stop at non-priority files
+		ms_aInfoForModel[streamId].GetCdPosnAndSize(unused, size);
+		if(ms_numPriorityRequests != 0 && !ms_aInfoForModel[streamId].IsPriority())
+			break;
+
+		// Can't load certain combinations of files together
+		if(streamId < STREAM_OFFSET_TXD){
+			if (havePed && CModelInfo::GetModelInfo(streamId)->GetModelType() == MITYPE_PED ||
+			    haveBigFile && CModelInfo::GetModelInfo(streamId)->GetModelType() == MITYPE_VEHICLE ||
+			    TxdNotLoaded(CModelInfo::GetModelInfo(streamId)->GetTxdSlot()) ||
+			    AnimNotLoaded(CModelInfo::GetModelInfo(streamId)->GetAnimFileIndex()))
+				break;
+		}else{
+			if(haveBigFile && size > 200)
+				break;
+		}
+
+		// Now add the file
+		ms_channel[ch].streamIds[i] = streamId;
+		ms_channel[ch].offsets[i] = totalSize;
+		totalSize += size;
+
+		// To big for buffer, remove again
+		if(totalSize > ms_streamingBufferSize && i > 0){
+			totalSize -= size;
+			break;
+		}
+		if(streamId < STREAM_OFFSET_TXD){
+			if (CModelInfo::GetModelInfo(streamId)->GetModelType() == MITYPE_PED)
+				havePed = 1;
+			if (CModelInfo::GetModelInfo(streamId)->GetModelType() == MITYPE_VEHICLE)
+				haveBigFile = 1;
+		}else{
+			if(size > 200)
+				haveBigFile = 1;
+		}
+		ms_aInfoForModel[streamId].m_loadState = STREAMSTATE_READING;
+		ms_aInfoForModel[streamId].RemoveFromList();
+		DecrementRef(streamId);
+
+		streamId = ms_aInfoForModel[streamId].m_nextID;
+	}
+
+	// clear remaining slots
+	for(; i < 4; i++)
+		ms_channel[ch].streamIds[i] = -1;
+	// Now read the data
+	assert(!(ms_bLoadingBigModel && ch == 1));	// this would clobber the buffer
+	if(CdStreamRead(ch, ms_pStreamingBuffer[ch], imgOffset+posn, totalSize) == STREAM_NONE)
+		debug("FUCKFUCKFUCK\n");
+	ms_channel[ch].state = CHANNELSTATE_READING;
+	ms_channel[ch].field24 = 0;
+	ms_channel[ch].size = totalSize;
+	ms_channel[ch].position = imgOffset+posn;
+	ms_channel[ch].numTries = 0;
+}
+
+// Load data previously read from disc
+bool
+CStreaming::ProcessLoadingChannel(int32 ch)
+{
+	int status;
+	int i, id, cdsize;
+
+	status = CdStreamGetStatus(ch);
+	if(status != STREAM_NONE){
+		// busy
+		if(status != STREAM_READING && status != STREAM_WAITING){
+			ms_channelError = ch;
+			ms_channel[ch].state = CHANNELSTATE_ERROR;
+			ms_channel[ch].status = status;
+		}
+		return false;
+	}
+
+	if(ms_channel[ch].state == CHANNELSTATE_STARTED){
+		ms_channel[ch].state = CHANNELSTATE_IDLE;
+		FinishLoadingLargeFile(&ms_pStreamingBuffer[ch][ms_channel[ch].offsets[0]*CDSTREAM_SECTOR_SIZE],
+			ms_channel[ch].streamIds[0]);
+		ms_channel[ch].streamIds[0] = -1;
+	}else{
+		ms_channel[ch].state = CHANNELSTATE_IDLE;
+		for(i = 0; i < 4; i++){
+			id = ms_channel[ch].streamIds[i];
+			if(id == -1)
+				continue;
+
+			cdsize = ms_aInfoForModel[id].GetCdSize();
+			if(id < STREAM_OFFSET_TXD && CModelInfo::GetModelInfo(id)->GetModelType() == MITYPE_VEHICLE &&
+			   ms_numVehiclesLoaded >= desiredNumVehiclesLoaded &&
+			   !RemoveLoadedVehicle() &&
+			   (CanRemoveModel(id) || GetAvailableVehicleSlot() == -1)){
+				// can't load vehicle
+				RemoveModel(id);
+				if(!CanRemoveModel(id))
+					ReRequestModel(id);
+				else if(CTxdStore::GetNumRefs(CModelInfo::GetModelInfo(id)->GetTxdSlot()) == 0)
+					RemoveTxd(CModelInfo::GetModelInfo(id)->GetTxdSlot());
+			}else{
+				MakeSpaceFor(cdsize * CDSTREAM_SECTOR_SIZE);
+				ConvertBufferToObject(&ms_pStreamingBuffer[ch][ms_channel[ch].offsets[i]*CDSTREAM_SECTOR_SIZE],
+					id);
+				if(ms_aInfoForModel[id].m_loadState == STREAMSTATE_STARTED){
+					// queue for second part
+					ms_channel[ch].state = CHANNELSTATE_STARTED;
+					ms_channel[ch].offsets[0] = ms_channel[ch].offsets[i];
+					ms_channel[ch].streamIds[0] = id;
+					if(i != 0)
+						ms_channel[ch].streamIds[i] = -1;
+				}else
+					ms_channel[ch].streamIds[i] = -1;
+			}
+		}
+	}
+
+	if(ms_bLoadingBigModel && ms_channel[ch].state != CHANNELSTATE_STARTED){
+		ms_bLoadingBigModel = false;
+		// reset channel 1 after loading a big model
+		for(i = 0; i < 4; i++)
+			ms_channel[1].streamIds[i] = -1;
+		ms_channel[1].state = CHANNELSTATE_IDLE;
+	}
+
+	return true;
+}
+
+void
+CStreaming::RetryLoadFile(int32 ch)
+{
+	Const char *key;
+
+	CPad::StopPadsShaking();
+
+	if(ms_channel[ch].numTries >= 3){
+		switch(ms_channel[ch].status){
+		case STREAM_ERROR_NOCD: key = "NOCD"; break;
+		case STREAM_ERROR_OPENCD: key = "OPENCD"; break;
+		case STREAM_ERROR_WRONGCD: key = "WRONGCD"; break;
+		default: key = "CDERROR"; break;
+		}
+		CHud::SetMessage(TheText.Get(key));
+		CTimer::SetCodePause(true);
+	}
+
+	switch(ms_channel[ch].state){
+	case CHANNELSTATE_ERROR:
+		ms_channel[ch].numTries++;
+		if (CdStreamGetStatus(ch) == STREAM_READING || CdStreamGetStatus(ch) == STREAM_WAITING) break;
+	case CHANNELSTATE_IDLE:
+		CdStreamRead(ch, ms_pStreamingBuffer[ch], ms_channel[ch].position, ms_channel[ch].size);
+		ms_channel[ch].state = CHANNELSTATE_READING;
+		ms_channel[ch].field24 = -600;
+		break;
+	case CHANNELSTATE_READING:
+		if(ProcessLoadingChannel(ch)){
+			ms_channelError = -1;
+			CTimer::SetCodePause(false);
+		}
+		break;
+	}
+}
+
+void
+CStreaming::LoadRequestedModels(void)
+{
+	static int currentChannel = 0;
+
+	// We can't read with channel 1 while channel 0 is using its buffer
+	if(ms_bLoadingBigModel)
+		currentChannel = 0;
+
+	// We have data, load
+	if(ms_channel[currentChannel].state == CHANNELSTATE_READING ||
+	   ms_channel[currentChannel].state == CHANNELSTATE_STARTED)
+		ProcessLoadingChannel(currentChannel);
+
+	if(ms_channelError == -1){
+		// Channel is idle, read more data
+		if(ms_channel[currentChannel].state == CHANNELSTATE_IDLE)
+			RequestModelStream(currentChannel);
+		// Switch channel
+		if(ms_channel[currentChannel].state != CHANNELSTATE_STARTED)
+			currentChannel = 1 - currentChannel;
+	}
+}
+
+
+// Let's load models in 4 threads; when one of them becomes idle, process the file, and fill thread with another file. Unfortunately processing models are still single-threaded.
+// Currently only supported on POSIX streamer.
+// WIP - some files are loaded swapped (CdStreamPosix problem?)
+#if 0 //def ONE_THREAD_PER_CHANNEL
+void
+CStreaming::LoadAllRequestedModels(bool priority)
+{
+	static bool bInsideLoadAll = false;
+	int imgOffset, streamId, status;
+	int i;
+	uint32 posn, size;
+
+	if(bInsideLoadAll)
+		return;
+	bInsideLoadAll = true;
+
+	FlushChannels();
+	imgOffset = GetCdImageOffset(CdStreamGetLastPosn());
+
+	int streamIds[ARRAY_SIZE(ms_pStreamingBuffer)];
+	int streamSizes[ARRAY_SIZE(ms_pStreamingBuffer)];
+	int streamPoses[ARRAY_SIZE(ms_pStreamingBuffer)];
+	int readOrder[4] = {-1}; // Channel IDs ordered by read time
+	int readI = 0;
+	int processI = 0;
+	bool first = true;
+
+	// All those "first" checks are because of variables aren't initialized in first pass.
+
+	while (true) {
+		for (int i=0; i<ARRAY_SIZE(ms_pStreamingBuffer); i++) {
+
+			// Channel has file to load
+			if (!first && streamIds[i] != -1) {
+				continue;
+			}
+
+			if(ms_endRequestedList.m_prev != &ms_startRequestedList){
+				streamId = GetNextFileOnCd(0, priority);
+				if(streamId == -1){
+					streamIds[i] = -1;
+					break;
+				}
+
+				if (ms_aInfoForModel[streamId].GetCdPosnAndSize(posn, size)) {
+					streamIds[i] = -1;
+
+					// Big file, needs 2 buffer
+					if (size > (uint32)ms_streamingBufferSize) {
+						if (i + 1 == ARRAY_SIZE(ms_pStreamingBuffer))
+							break;
+						else if (!first && streamIds[i+1] != -1)
+							continue;
+
+					} else {
+						// Buffer of current channel is part of a "big file", pass
+						if (i != 0 && streamIds[i-1] != -1 && streamSizes[i-1] > (uint32)ms_streamingBufferSize)
+							continue;
+					}
+					ms_aInfoForModel[streamId].RemoveFromList();
+					DecrementRef(streamId);
+
+					streamIds[i] = streamId;
+					streamSizes[i] = size;
+					streamPoses[i] = posn;
+
+					if (!first)
+						assert(readOrder[readI] == -1);
+
+					//printf("read: order %d, ch %d, id %d, size %d\n", readI, i, streamId, size);
+
+					CdStreamRead(i, ms_pStreamingBuffer[i], imgOffset+posn, size);
+					readOrder[readI] = i;
+					if (first && readI+1 != ARRAY_SIZE(readOrder))
+						readOrder[readI+1] = -1;
+
+					readI = (readI + 1) % ARRAY_SIZE(readOrder);
+				} else {
+					ms_aInfoForModel[streamId].RemoveFromList();
+					DecrementRef(streamId);
+
+					ms_aInfoForModel[streamId].m_loadState = STREAMSTATE_LOADED;
+					streamIds[i] = -1;
+				}
+			} else {
+				streamIds[i] = -1;
+				break;
+			}
+		}
+
+		first = false;
+		int nextChannel = readOrder[processI];
+
+		// Now start processing
+		if (nextChannel == -1 || streamIds[nextChannel] == -1)
+			break;
+
+		//printf("process: order %d, ch %d, id %d\n", processI, nextChannel, streamIds[nextChannel]);
+
+		// Try again on error
+		while (CdStreamSync(nextChannel) != STREAM_NONE) {
+			CdStreamRead(nextChannel, ms_pStreamingBuffer[nextChannel], imgOffset+streamPoses[nextChannel], streamSizes[nextChannel]);
+		}
+		ms_aInfoForModel[streamIds[nextChannel]].m_loadState = STREAMSTATE_READING;
+
+		MakeSpaceFor(streamSizes[nextChannel] * CDSTREAM_SECTOR_SIZE);
+		ConvertBufferToObject(ms_pStreamingBuffer[nextChannel], streamIds[nextChannel]);
+		if(ms_aInfoForModel[streamIds[nextChannel]].m_loadState == STREAMSTATE_STARTED)
+			FinishLoadingLargeFile(ms_pStreamingBuffer[nextChannel], streamIds[nextChannel]);
+
+		if(streamIds[nextChannel] < STREAM_OFFSET_TXD){
+			CSimpleModelInfo *mi = (CSimpleModelInfo*)CModelInfo::GetModelInfo(streamIds[nextChannel]);
+			if(mi->IsSimple())
+				mi->m_alpha = 255;
+		}
+		streamIds[nextChannel] = -1;
+		readOrder[processI] = -1;
+		processI = (processI + 1) % ARRAY_SIZE(readOrder);
+	}
+
+	ms_bLoadingBigModel = false;
+	for(i = 0; i < 4; i++){
+		ms_channel[1].streamIds[i] = -1;
+		ms_channel[1].offsets[i] = -1;
+	}
+	ms_channel[1].state = CHANNELSTATE_IDLE;
+	bInsideLoadAll = false;
+}
+#else
+void
+CStreaming::LoadAllRequestedModels(bool priority)
+{
+	static bool bInsideLoadAll = false;
+	int imgOffset, streamId, status;
+	int i;
+	uint32 posn, size;
+
+	int numRequests = 4*ms_numModelsRequested;
+
+	if(bInsideLoadAll)
+		return;
+	bInsideLoadAll = true;
+
+	if(priority)
+		numRequests = ms_numPriorityRequests;
+
+	FlushChannels();
+	imgOffset = GetCdImageOffset(CdStreamGetLastPosn());
+
+	while(ms_endRequestedList.m_prev != &ms_startRequestedList && numRequests > 0){
+		numRequests--;
+		streamId = GetNextFileOnCd(0, priority);
+		if(streamId == -1)
+			break;
+
+		ms_aInfoForModel[streamId].RemoveFromList();
+		ms_channel[0].streamIds[0] = streamId;
+		DecrementRef(streamId);
+
+		if(ms_aInfoForModel[streamId].GetCdPosnAndSize(posn, size)){
+			do
+				status = CdStreamRead(0, ms_pStreamingBuffer[0], imgOffset+posn, size);
+			while(CdStreamSync(0) || status == STREAM_NONE);
+			ms_aInfoForModel[streamId].m_loadState = STREAMSTATE_READING;
+
+			MakeSpaceFor(size * CDSTREAM_SECTOR_SIZE);
+			ConvertBufferToObject(ms_pStreamingBuffer[0], streamId);
+			if(ms_aInfoForModel[streamId].m_loadState == STREAMSTATE_STARTED)
+				FinishLoadingLargeFile(ms_pStreamingBuffer[0], streamId);
+
+			if(streamId < STREAM_OFFSET_TXD){
+				CSimpleModelInfo *mi = (CSimpleModelInfo*)CModelInfo::GetModelInfo(streamId);
+				if(mi->IsSimple())
+					mi->m_alpha = 255;
+			}
+		}else{
+			// empty
+			ms_aInfoForModel[streamId].m_loadState = STREAMSTATE_LOADED;
+		}
+	}
+
+	ms_bLoadingBigModel = false;
+	for(i = 0; i < 4; i++){
+		ms_channel[1].streamIds[i] = -1;
+		ms_channel[1].offsets[i] = -1;
+	}
+	ms_channel[1].state = CHANNELSTATE_IDLE;
+	bInsideLoadAll = false;
+}
+#endif
+
+void
+CStreaming::FlushChannels(void)
+{
+	if(ms_channel[1].state == CHANNELSTATE_STARTED)
+		ProcessLoadingChannel(1);
+
+	if(ms_channel[0].state == CHANNELSTATE_READING){
+		CdStreamSync(0);
+		ProcessLoadingChannel(0);
+	}
+	if(ms_channel[0].state == CHANNELSTATE_STARTED)
+		ProcessLoadingChannel(0);
+
+	if(ms_channel[1].state == CHANNELSTATE_READING){
+		CdStreamSync(1);
+		ProcessLoadingChannel(1);
+	}
+	if(ms_channel[1].state == CHANNELSTATE_STARTED)
+		ProcessLoadingChannel(1);
+}
+
+void
+CStreaming::FlushRequestList(void)
+{
+	CStreamingInfo *si, *next;
+
+	for(si = ms_startRequestedList.m_next; si != &ms_endRequestedList; si = next){
+		next = si->m_next;
+		RemoveModel(si - ms_aInfoForModel);
+	}
+#ifdef FLUSHABLE_STREAMING
+	if(ms_channel[0].state == CHANNELSTATE_READING) {
+		flushStream[0] = 1;
+	}
+	if(ms_channel[1].state == CHANNELSTATE_READING) {
+		flushStream[1] = 1;
+	}
+#endif
+	FlushChannels();
+}
+
+
+void
+CStreaming::ImGonnaUseStreamingMemory(void)
+{
+	PUSH_MEMID(MEMID_STREAM);
+}
+
+void
+CStreaming::IHaveUsedStreamingMemory(void)
+{
+	POP_MEMID();
+	UpdateMemoryUsed();
+}
+
+void
+CStreaming::UpdateMemoryUsed(void)
+{
+#ifdef USE_CUSTOM_ALLOCATOR
+	ms_memoryUsed =
+		gMainHeap.GetMemoryUsed(MEMID_STREAM) +
+		gMainHeap.GetMemoryUsed(MEMID_STREAM_MODELS) +
+		gMainHeap.GetMemoryUsed(MEMID_STREAM_TEXUTRES) +
+		gMainHeap.GetMemoryUsed(MEMID_STREAM_COLLISION) +
+		gMainHeap.GetMemoryUsed(MEMID_STREAM_ANIMATION);
+#endif
+}
+
+#define STREAM_DIST 80.0f
+
+void
+CStreaming::AddModelsToRequestList(const CVector &pos, int32 flags)
+{
+	float xmin, xmax, ymin, ymax;
+	int ixmin, ixmax, iymin, iymax;
+	int ix, iy;
+	int dx, dy, d;
+	CSector *sect;
+
+	xmin = pos.x - STREAM_DIST;
+	ymin = pos.y - STREAM_DIST;
+	xmax = pos.x + STREAM_DIST;
+	ymax = pos.y + STREAM_DIST;
+
+	ixmin = CWorld::GetSectorIndexX(xmin);
+	if(ixmin < 0) ixmin = 0;
+	ixmax = CWorld::GetSectorIndexX(xmax);
+	if(ixmax >= NUMSECTORS_X) ixmax = NUMSECTORS_X-1;
+	iymin = CWorld::GetSectorIndexY(ymin);
+	if(iymin < 0) iymin = 0;
+	iymax = CWorld::GetSectorIndexY(ymax);
+	if(iymax >= NUMSECTORS_Y) iymax = NUMSECTORS_Y-1;
+
+	CWorld::AdvanceCurrentScanCode();
+
+	for(iy = iymin; iy <= iymax; iy++){
+		dy = iy - CWorld::GetSectorIndexY(pos.y);
+		for(ix = ixmin; ix <= ixmax; ix++){
+
+			if(CRenderer::m_loadingPriority && ms_numModelsRequested > 5)
+				return;
+
+			dx = ix - CWorld::GetSectorIndexX(pos.x);
+			d = dx*dx + dy*dy;
+			sect = CWorld::GetSector(ix, iy);
+			if(d <= 0){
+				ProcessEntitiesInSectorList(sect->m_lists[ENTITYLIST_BUILDINGS], flags);
+				ProcessEntitiesInSectorList(sect->m_lists[ENTITYLIST_BUILDINGS_OVERLAP], flags);
+				ProcessEntitiesInSectorList(sect->m_lists[ENTITYLIST_OBJECTS], flags);
+				ProcessEntitiesInSectorList(sect->m_lists[ENTITYLIST_DUMMIES], flags);
+			}else if(d <= 3*3){
+				ProcessEntitiesInSectorList(sect->m_lists[ENTITYLIST_BUILDINGS], pos.x, pos.y, xmin, ymin, xmax, ymax, flags);
+				ProcessEntitiesInSectorList(sect->m_lists[ENTITYLIST_BUILDINGS_OVERLAP], pos.x, pos.y, xmin, ymin, xmax, ymax, flags);
+				ProcessEntitiesInSectorList(sect->m_lists[ENTITYLIST_OBJECTS], pos.x, pos.y, xmin, ymin, xmax, ymax, flags);
+				ProcessEntitiesInSectorList(sect->m_lists[ENTITYLIST_DUMMIES], pos.x, pos.y, xmin, ymin, xmax, ymax, flags);
+			}
+		}
+	}
+}
+
+void
+CStreaming::ProcessEntitiesInSectorList(CPtrList &list, float x, float y, float xmin, float ymin, float xmax, float ymax, int32 flags)
+{
+	CPtrNode *node;
+	CEntity *e;
+	float lodDistSq;
+	CVector2D pos;
+
+	for(node = list.first; node; node = node->next){
+		e = (CEntity*)node->item;
+
+		if(e->m_scanCode == CWorld::GetCurrentScanCode())
+			continue;
+
+		e->m_scanCode = CWorld::GetCurrentScanCode();
+		if(!e->bStreamingDontDelete && IsAreaVisible(e->m_area) && !e->bDontStream && e->bIsVisible){
+			CTimeModelInfo *mi = (CTimeModelInfo*)CModelInfo::GetModelInfo(e->GetModelIndex());
+			if (mi->GetModelType() != MITYPE_TIME || CClock::GetIsTimeInRange(mi->GetTimeOn(), mi->GetTimeOff())) {
+				lodDistSq = sq(mi->GetLargestLodDistance());
+				lodDistSq = Min(lodDistSq, sq(STREAM_DIST));
+				pos = CVector2D(e->GetPosition());
+				if(xmin < pos.x && pos.x < xmax &&
+				   ymin < pos.y && pos.y < ymax &&
+				   (CVector2D(x, y) - pos).MagnitudeSqr() < lodDistSq)
+					RequestModel(e->GetModelIndex(), flags);
+			}
+		}
+	}
+}
+
+void
+CStreaming::ProcessEntitiesInSectorList(CPtrList &list, int32 flags)
+{
+	CPtrNode *node;
+	CEntity *e;
+
+	for(node = list.first; node; node = node->next){
+		e = (CEntity*)node->item;
+
+		if(e->m_scanCode == CWorld::GetCurrentScanCode())
+			continue;
+
+		e->m_scanCode = CWorld::GetCurrentScanCode();
+		if(!e->bStreamingDontDelete && IsAreaVisible(e->m_area) && !e->bDontStream && e->bIsVisible){
+			CTimeModelInfo *mi = (CTimeModelInfo*)CModelInfo::GetModelInfo(e->GetModelIndex());
+			if (mi->GetModelType() != MITYPE_TIME || CClock::GetIsTimeInRange(mi->GetTimeOn(), mi->GetTimeOff()))
+				RequestModel(e->GetModelIndex(), flags);
+		}
+	}
+}
+
+void
+CStreaming::DeleteFarAwayRwObjects(const CVector &pos)
+{
+	int posx, posy;
+	int x, y;
+	int r, i;
+	CSector *sect;
+
+	posx = CWorld::GetSectorIndexX(pos.x);
+	posy = CWorld::GetSectorIndexY(pos.y);
+
+	// Move oldSectorX/Y to new sector and delete RW objects in its "wake" for every step:
+	// O is the old sector, <- is the direction in which we move it,
+	// X are the sectors we delete RW objects from (except we go up to 10)
+	//            X
+	//          X X
+	//        X X X
+	//        X X X
+	// <- O   X X X
+	//        X X X
+	//        X X X
+	//          X X
+	//            X
+
+	while(posx != ms_oldSectorX){
+		if(posx < ms_oldSectorX){
+			for(r = 2; r <= 10; r++){
+				x = ms_oldSectorX + r;
+				if(x < 0)
+					continue;
+				if(x >= NUMSECTORS_X)
+					break;
+
+				for(i = -r; i <= r; i++){
+					y = ms_oldSectorY + i;
+					if(y < 0)
+						continue;
+					if(y >= NUMSECTORS_Y)
+						break;
+
+					sect = CWorld::GetSector(x, y);
+					DeleteRwObjectsInSectorList(sect->m_lists[ENTITYLIST_BUILDINGS]);
+					DeleteRwObjectsInOverlapSectorList(sect->m_lists[ENTITYLIST_BUILDINGS_OVERLAP], ms_oldSectorX, ms_oldSectorY);
+					DeleteRwObjectsInSectorList(sect->m_lists[ENTITYLIST_OBJECTS]);
+					DeleteRwObjectsInSectorList(sect->m_lists[ENTITYLIST_DUMMIES]);
+				}
+			}
+			ms_oldSectorX--;
+		}else{
+			for(r = 2; r <= 10; r++){
+				x = ms_oldSectorX - r;
+				if(x < 0)
+					break;
+				if(x >= NUMSECTORS_X)
+					continue;
+
+				for(i = -r; i <= r; i++){
+					y = ms_oldSectorY + i;
+					if(y < 0)
+						continue;
+					if(y >= NUMSECTORS_Y)
+						break;
+
+					sect = CWorld::GetSector(x, y);
+					DeleteRwObjectsInSectorList(sect->m_lists[ENTITYLIST_BUILDINGS]);
+					DeleteRwObjectsInOverlapSectorList(sect->m_lists[ENTITYLIST_BUILDINGS_OVERLAP], ms_oldSectorX, ms_oldSectorY);
+					DeleteRwObjectsInSectorList(sect->m_lists[ENTITYLIST_OBJECTS]);
+					DeleteRwObjectsInSectorList(sect->m_lists[ENTITYLIST_DUMMIES]);
+				}
+			}
+			ms_oldSectorX++;
+		}
+	}
+
+	while(posy != ms_oldSectorY){
+		if(posy < ms_oldSectorY){
+			for(r = 2; r <= 10; r++){
+				y = ms_oldSectorY + r;
+				if(y < 0)
+					continue;
+				if(y >= NUMSECTORS_Y)
+					break;
+
+				for(i = -r; i <= r; i++){
+					x = ms_oldSectorX + i;
+					if(x < 0)
+						continue;
+					if(x >= NUMSECTORS_X)
+						break;
+
+					sect = CWorld::GetSector(x, y);
+					DeleteRwObjectsInSectorList(sect->m_lists[ENTITYLIST_BUILDINGS]);
+					DeleteRwObjectsInOverlapSectorList(sect->m_lists[ENTITYLIST_BUILDINGS_OVERLAP], ms_oldSectorX, ms_oldSectorY);
+					DeleteRwObjectsInSectorList(sect->m_lists[ENTITYLIST_OBJECTS]);
+					DeleteRwObjectsInSectorList(sect->m_lists[ENTITYLIST_DUMMIES]);
+				}
+			}
+			ms_oldSectorY--;
+		}else{
+			for(r = 2; r <= 10; r++){
+				y = ms_oldSectorY - r;
+				if(y < 0)
+					break;
+				if(y >= NUMSECTORS_Y)
+					continue;
+
+				for(i = -r; i <= r; i++){
+					x = ms_oldSectorX + i;
+					if(x < 0)
+						continue;
+					if(x >= NUMSECTORS_X)
+						break;
+
+					sect = CWorld::GetSector(x, y);
+					DeleteRwObjectsInSectorList(sect->m_lists[ENTITYLIST_BUILDINGS]);
+					DeleteRwObjectsInOverlapSectorList(sect->m_lists[ENTITYLIST_BUILDINGS_OVERLAP], ms_oldSectorX, ms_oldSectorY);
+					DeleteRwObjectsInSectorList(sect->m_lists[ENTITYLIST_OBJECTS]);
+					DeleteRwObjectsInSectorList(sect->m_lists[ENTITYLIST_DUMMIES]);
+				}
+			}
+			ms_oldSectorY++;
+		}
+	}
+}
+
+void
+CStreaming::DeleteAllRwObjects(void)
+{
+	int x, y;
+	CSector *sect;
+
+	for(x = 0; x < NUMSECTORS_X; x++)
+		for(y = 0; y < NUMSECTORS_Y; y++){
+			sect = CWorld::GetSector(x, y);
+			DeleteRwObjectsInSectorList(sect->m_lists[ENTITYLIST_BUILDINGS]);
+			DeleteRwObjectsInSectorList(sect->m_lists[ENTITYLIST_BUILDINGS_OVERLAP]);
+			DeleteRwObjectsInSectorList(sect->m_lists[ENTITYLIST_OBJECTS]);
+			DeleteRwObjectsInSectorList(sect->m_lists[ENTITYLIST_OBJECTS_OVERLAP]);
+			DeleteRwObjectsInSectorList(sect->m_lists[ENTITYLIST_DUMMIES]);
+			DeleteRwObjectsInSectorList(sect->m_lists[ENTITYLIST_DUMMIES_OVERLAP]);
+		}
+}
+
+void
+CStreaming::DeleteRwObjectsAfterDeath(const CVector &pos)
+{
+	int ix, iy;
+	int x, y;
+	CSector *sect;
+
+	ix = CWorld::GetSectorIndexX(pos.x);
+	iy = CWorld::GetSectorIndexY(pos.y);
+
+	for(x = 0; x < NUMSECTORS_X; x++)
+		for(y = 0; y < NUMSECTORS_Y; y++)
+			if(Abs(ix - x) > 3.0f &&
+			   Abs(iy - y) > 3.0f){
+				sect = CWorld::GetSector(x, y);
+				DeleteRwObjectsInSectorList(sect->m_lists[ENTITYLIST_BUILDINGS]);
+				DeleteRwObjectsInSectorList(sect->m_lists[ENTITYLIST_BUILDINGS_OVERLAP]);
+				DeleteRwObjectsInSectorList(sect->m_lists[ENTITYLIST_OBJECTS]);
+				DeleteRwObjectsInSectorList(sect->m_lists[ENTITYLIST_OBJECTS_OVERLAP]);
+				DeleteRwObjectsInSectorList(sect->m_lists[ENTITYLIST_DUMMIES]);
+				DeleteRwObjectsInSectorList(sect->m_lists[ENTITYLIST_DUMMIES_OVERLAP]);
+			}
+}
+
+void
+CStreaming::DeleteRwObjectsBehindCamera(size_t mem)
+{
+	int ix, iy;
+	int x, y;
+	int xmin, xmax, ymin, ymax;
+	int inc;
+	CSector *sect;
+
+	if(ms_memoryUsed < mem)
+		return;
+
+	ix = CWorld::GetSectorIndexX(TheCamera.GetPosition().x);
+	iy = CWorld::GetSectorIndexY(TheCamera.GetPosition().y);
+
+	if(Abs(TheCamera.GetForward().x) > Abs(TheCamera.GetForward().y)){
+		// looking west/east
+
+		ymin = Max(iy - 10, 0);
+		ymax = Min(iy + 10, NUMSECTORS_Y - 1);
+		assert(ymin <= ymax);
+
+		// Delete a block of sectors that we know is behind the camera
+		if(TheCamera.GetForward().x > 0.0f){
+			// looking east
+			xmax = Max(ix - 2, 0);
+			xmin = Max(ix - 10, 0);
+			inc = 1;
+		}else{
+			// looking west
+			xmax = Min(ix + 2, NUMSECTORS_X - 1);
+			xmin = Min(ix + 10, NUMSECTORS_X - 1);
+			inc = -1;
+		}
+		for(y = ymin; y <= ymax; y++){
+			for(x = xmin; x != xmax; x += inc){
+				sect = CWorld::GetSector(x, y);
+				if(DeleteRwObjectsBehindCameraInSectorList(sect->m_lists[ENTITYLIST_BUILDINGS], mem) ||
+				   DeleteRwObjectsBehindCameraInSectorList(sect->m_lists[ENTITYLIST_DUMMIES], mem) ||
+				   DeleteRwObjectsBehindCameraInSectorList(sect->m_lists[ENTITYLIST_OBJECTS], mem))
+					return;
+			}
+		}
+
+		
+		while(RemoveLoadedZoneModel())
+			if(ms_memoryUsed < mem)
+				return;
+
+		// Now a block that intersects with the camera's frustum
+		if(TheCamera.GetForward().x > 0.0f){
+			// looking east
+			xmax = Max(ix + 10, 0);
+			xmin = Max(ix - 2, 0);
+			inc = 1;
+		}else{
+			// looking west
+			xmax = Min(ix - 10, NUMSECTORS_X - 1);
+			xmin = Min(ix + 2, NUMSECTORS_X - 1);
+			inc = -1;
+		}
+		for(y = ymin; y <= ymax; y++){
+			for(x = xmin; x != xmax; x += inc){
+				sect = CWorld::GetSector(x, y);
+				if(DeleteRwObjectsNotInFrustumInSectorList(sect->m_lists[ENTITYLIST_BUILDINGS], mem) ||
+				   DeleteRwObjectsNotInFrustumInSectorList(sect->m_lists[ENTITYLIST_DUMMIES], mem) ||
+				   DeleteRwObjectsNotInFrustumInSectorList(sect->m_lists[ENTITYLIST_OBJECTS], mem))
+					return;
+			}
+		}
+
+		// As last resort, delete objects from the last step more aggressively
+		for(y = ymin; y <= ymax; y++){
+			for(x = xmax; x != xmin; x -= inc){
+				sect = CWorld::GetSector(x, y);
+				if(DeleteRwObjectsBehindCameraInSectorList(sect->m_lists[ENTITYLIST_BUILDINGS], mem) ||
+				   DeleteRwObjectsBehindCameraInSectorList(sect->m_lists[ENTITYLIST_DUMMIES], mem) ||
+				   DeleteRwObjectsBehindCameraInSectorList(sect->m_lists[ENTITYLIST_OBJECTS], mem))
+					return;
+			}
+		}
+	}else{
+		// looking north/south
+
+		xmin = Max(ix - 10, 0);
+		xmax = Min(ix + 10, NUMSECTORS_X - 1);
+		assert(xmin <= xmax);
+
+		// Delete a block of sectors that we know is behind the camera
+		if(TheCamera.GetForward().y > 0.0f){
+			// looking north
+			ymax = Max(iy - 2, 0);
+			ymin = Max(iy - 10, 0);
+			inc = 1;
+		}else{
+			// looking south
+			ymax = Min(iy + 2, NUMSECTORS_Y - 1);
+			ymin = Min(iy + 10, NUMSECTORS_Y - 1);
+			inc = -1;
+		}
+		for(x = xmin; x <= xmax; x++){
+			for(y = ymin; y != ymax; y += inc){
+				sect = CWorld::GetSector(x, y);
+				if(DeleteRwObjectsBehindCameraInSectorList(sect->m_lists[ENTITYLIST_BUILDINGS], mem) ||
+				   DeleteRwObjectsBehindCameraInSectorList(sect->m_lists[ENTITYLIST_DUMMIES], mem) ||
+				   DeleteRwObjectsBehindCameraInSectorList(sect->m_lists[ENTITYLIST_OBJECTS], mem))
+					return;
+			}
+		}
+
+		while(RemoveLoadedZoneModel())
+			if(ms_memoryUsed < mem)
+				return;
+
+		// Now a block that intersects with the camera's frustum
+		if(TheCamera.GetForward().y > 0.0f){
+			// looking north
+			ymax = Max(iy + 10, 0);
+			ymin = Max(iy - 2, 0);
+			inc = 1;
+		}else{
+			// looking south
+			ymax = Min(iy - 10, NUMSECTORS_Y - 1);
+			ymin = Min(iy + 2, NUMSECTORS_Y - 1);
+			inc = -1;
+		}
+		for(x = xmin; x <= xmax; x++){
+			for(y = ymin; y != ymax; y += inc){
+				sect = CWorld::GetSector(x, y);
+				if(DeleteRwObjectsNotInFrustumInSectorList(sect->m_lists[ENTITYLIST_BUILDINGS], mem) ||
+				   DeleteRwObjectsNotInFrustumInSectorList(sect->m_lists[ENTITYLIST_DUMMIES], mem) ||
+				   DeleteRwObjectsNotInFrustumInSectorList(sect->m_lists[ENTITYLIST_OBJECTS], mem))
+					return;
+			}
+		}
+
+// this is gone in mobile together with RemoveReferencedTxds
+//		if(RemoveReferencedTxds(mem))
+//			return;
+
+		// As last resort, delete objects from the last step more aggressively
+		for(x = xmin; x <= xmax; x++){
+			for(y = ymax; y != ymin; y -= inc){
+				sect = CWorld::GetSector(x, y);
+				if(DeleteRwObjectsBehindCameraInSectorList(sect->m_lists[ENTITYLIST_BUILDINGS], mem) ||
+				   DeleteRwObjectsBehindCameraInSectorList(sect->m_lists[ENTITYLIST_DUMMIES], mem) ||
+				   DeleteRwObjectsBehindCameraInSectorList(sect->m_lists[ENTITYLIST_OBJECTS], mem))
+					return;
+			}
+		}
+	}
+
+	while(ms_memoryUsed >= mem && RemoveLeastUsedModel(0));
+}
+
+void
+CStreaming::DeleteRwObjectsInSectorList(CPtrList &list)
+{
+	CPtrNode *node;
+	CEntity *e;
+
+	for(node = list.first; node; node = node->next){
+		e = (CEntity*)node->item;
+		if(!e->bStreamingDontDelete && !e->bImBeingRendered)
+			e->DeleteRwObject();
+	}
+}
+
+void
+CStreaming::DeleteRwObjectsInOverlapSectorList(CPtrList &list, int32 x, int32 y)
+{
+	CPtrNode *node;
+	CEntity *e;
+
+	for(node = list.first; node; node = node->next){
+		e = (CEntity*)node->item;
+		if(e->m_rwObject && !e->bStreamingDontDelete && !e->bImBeingRendered){
+			// Now this is pretty weird...
+			if(Abs(CWorld::GetSectorIndexX(e->GetPosition().x) - x) >= 1.6f)
+//			{
+				e->DeleteRwObject();
+//				return;		// BUG?
+//			}
+			else	// FIX?
+			if(Abs(CWorld::GetSectorIndexY(e->GetPosition().y) - y) >= 1.6f)
+				e->DeleteRwObject();
+		}
+	}
+}
+
+bool
+CStreaming::DeleteRwObjectsBehindCameraInSectorList(CPtrList &list, size_t mem)
+{
+	CPtrNode *node;
+	CEntity *e;
+
+	for(node = list.first; node; node = node->next){
+		e = (CEntity*)node->item;
+		if(!e->bStreamingDontDelete && !e->bImBeingRendered &&
+		   e->m_rwObject && ms_aInfoForModel[e->GetModelIndex()].m_next &&
+		   FindPlayerPed()->m_pCurSurface != e){
+			e->DeleteRwObject();
+			if (CModelInfo::GetModelInfo(e->GetModelIndex())->GetNumRefs() == 0) {
+				RemoveModel(e->GetModelIndex());
+				if(ms_memoryUsed < mem)
+					return true;
+			}
+		}
+	}
+	return false;
+}
+
+bool
+CStreaming::DeleteRwObjectsNotInFrustumInSectorList(CPtrList &list, size_t mem)
+{
+	CPtrNode *node;
+	CEntity *e;
+
+	for(node = list.first; node; node = node->next){
+		e = (CEntity*)node->item;
+		if(!e->bStreamingDontDelete && !e->bImBeingRendered &&
+		   e->m_rwObject && (!e->IsVisible() || e->bOffscreen) && ms_aInfoForModel[e->GetModelIndex()].m_next){
+			e->DeleteRwObject();
+			if (CModelInfo::GetModelInfo(e->GetModelIndex())->GetNumRefs() == 0) {
+				RemoveModel(e->GetModelIndex());
+				if(ms_memoryUsed < mem)
+					return true;
+			}
+		}
+	}
+	return false;
+}
+
+void
+CStreaming::MakeSpaceFor(int32 size)
+{
+#ifdef FIX_BUGS
+#define MB (1024 * 1024)
+	if(ms_memoryAvailable == 0) {
+		extern size_t _dwMemAvailPhys;
+		ms_memoryAvailable = (_dwMemAvailPhys - 10 * MB) / 2;
+		if(ms_memoryAvailable < 65 * MB) ms_memoryAvailable = 65 * MB;
+	}
+#undef MB
+#endif
+	while(ms_memoryUsed >= ms_memoryAvailable - size)
+		if(!RemoveLeastUsedModel(STREAMFLAGS_20)){
+			DeleteRwObjectsBehindCamera(ms_memoryAvailable - size);
+			return;
+		}
+}
+
+void
+CStreaming::LoadScene(const CVector &pos)
+{
+	CStreamingInfo *si, *prev;
+	eLevelName level;
+
+	level = CTheZones::GetLevelFromPosition(&pos);
+	debug("Start load scene\n");
+	for(si = ms_endRequestedList.m_prev; si != &ms_startRequestedList; si = prev){
+		prev = si->m_prev;
+		if((si->m_flags & (STREAMFLAGS_KEEP_IN_MEMORY|STREAMFLAGS_PRIORITY)) == 0)
+			RemoveModel(si - ms_aInfoForModel);
+	}
+	CRenderer::m_loadingPriority = false;
+	DeleteAllRwObjects();
+	if(level == LEVEL_GENERIC)
+		level = CGame::currLevel;
+	CGame::currLevel = level;
+	RemoveUnusedBigBuildings(level);
+	RequestBigBuildings(level, pos);
+	RequestBigBuildings(LEVEL_GENERIC, pos);
+	RemoveIslandsNotUsed(level);
+	LoadAllRequestedModels(false);
+	InstanceBigBuildings(level, pos);
+	InstanceBigBuildings(LEVEL_GENERIC, pos);
+	AddModelsToRequestList(pos, STREAMFLAGS_20);
+	CRadar::StreamRadarSections(pos);
+
+	if (!CGame::IsInInterior()) {
+		for (int i = 0; i < 5; i++) {
+			CZoneInfo zone;
+			CTheZones::GetZoneInfoForTimeOfDay(&pos, &zone);
+			int32 model = CCarCtrl::ChooseCarModelToLoad(CCarCtrl::ChooseCarRating(&zone));
+			CStreaming::RequestModel(model, STREAMFLAGS_DEPENDENCY);
+		}
+	}
+	LoadAllRequestedModels(false);
+	InstanceLoadedModels(pos);
+
+	for(int i = 0; i < NUMSTREAMINFO; i++)
+		ms_aInfoForModel[i].m_flags &= ~STREAMFLAGS_20;
+	debug("End load scene\n");
+}
+
+void
+CStreaming::LoadSceneCollision(const CVector &pos)
+{
+	CColStore::LoadCollision(pos);
+	CStreaming::LoadAllRequestedModels(false);
+}
+
+void
+CStreaming::MemoryCardSave(uint8 *buf, uint32 *size)
+{
+	int i;
+
+	*size = NUM_DEFAULT_MODELS;
+	for(i = 0; i < NUM_DEFAULT_MODELS; i++)
+		if(ms_aInfoForModel[i].m_loadState == STREAMSTATE_LOADED)
+			buf[i] = ms_aInfoForModel[i].m_flags;
+		else
+			buf[i] = 0xFF;
+}
+
+void 
+CStreaming::MemoryCardLoad(uint8 *buf, uint32 size)
+{
+	uint32 i;
+
+	assert(size == NUM_DEFAULT_MODELS);
+	for(i = 0; i < size; i++)
+		if(ms_aInfoForModel[i].m_loadState == STREAMSTATE_LOADED)
+			if(buf[i] != 0xFF)
+				ms_aInfoForModel[i].m_flags = buf[i];
+}
+
+void
+CStreaming::UpdateForAnimViewer(void)
+{
+	if (CStreaming::ms_channelError == -1) {
+		CStreaming::AddModelsToRequestList(CVector(0.0f, 0.0f, 0.0f), 0);
+		CStreaming::LoadRequestedModels();
+		// original modifier was %d
+		sprintf(gString, "Requested %d, memory size %zuK\n", CStreaming::ms_numModelsRequested, 2 * CStreaming::ms_memoryUsed);
+	}
+	else {
+		CStreaming::RetryLoadFile(CStreaming::ms_channelError);
+	}
+}
+
+
+void
+CStreaming::PrintStreamingBufferState()
+{
+	char str[128];
+	wchar wstr[128];
+	uint32 offset, size;
+
+	CTimer::Stop();
+	int i = 0;
+	while (i < NUMSTREAMINFO) {
+		while (true) {
+			int j = 0;
+			DoRWStuffStartOfFrame(50, 50, 50, 0, 0, 0, 255);
+			CPad::UpdatePads();
+			CSprite2d::InitPerFrame();
+			CFont::InitPerFrame();
+			DefinedState();
+
+			CRect unusedRect(0, 0, RsGlobal.maximumWidth, RsGlobal.maximumHeight);
+			CRGBA unusedColor(255, 255, 255, 255);
+			CFont::SetFontStyle(FONT_BANK);
+			CFont::SetBackgroundOff();
+			CFont::SetWrapx(DEFAULT_SCREEN_WIDTH);
+			CFont::SetScale(0.5f, 0.75f);
+			CFont::SetCentreOff();
+			CFont::SetCentreSize(DEFAULT_SCREEN_WIDTH);
+			CFont::SetJustifyOff();
+			CFont::SetColor(CRGBA(200, 200, 200, 200));
+			CFont::SetBackGroundOnlyTextOff();
+			int modelIndex = i;
+			if (modelIndex < NUMSTREAMINFO) {
+				int y = 24;
+				for ( ; j < 34 && modelIndex < NUMSTREAMINFO; modelIndex++) {
+					CStreamingInfo *streamingInfo = &ms_aInfoForModel[modelIndex];
+					CBaseModelInfo *modelInfo = CModelInfo::GetModelInfo(modelIndex);
+					if (streamingInfo->m_loadState != STREAMSTATE_LOADED || !streamingInfo->GetCdPosnAndSize(offset, size))
+						continue;
+
+					if (modelIndex >= STREAM_OFFSET_TXD)
+						sprintf(str, "txd %s, refs %d, size %dK, flags 0x%x", CTxdStore::GetTxdName(modelIndex - STREAM_OFFSET_TXD),
+						        CTxdStore::GetNumRefs(modelIndex - STREAM_OFFSET_TXD), 2 * size, streamingInfo->m_flags);
+					else
+						sprintf(str, "model %d,%s, refs%d, size%dK, flags%x", modelIndex, modelInfo->GetModelName(), modelInfo->GetNumRefs(), 2 * size,
+						        streamingInfo->m_flags);
+					AsciiToUnicode(str, wstr);
+					CFont::PrintString(24.0f, y, wstr);
+					y += 12;
+					j++;
+				}
+			}
+
+			if (CPad::GetPad(1)->GetCrossJustDown())
+				i = modelIndex;
+
+			if (!CPad::GetPad(1)->GetTriangleJustDown())
+				break;
+
+			i = 0;
+			CFont::DrawFonts();
+			DoRWStuffEndOfFrame();
+		}
+		CFont::DrawFonts();
+		DoRWStuffEndOfFrame();
+	}
+	CTimer::Update();
+}
diff --git a/src/core/Streaming.h b/src/core/Streaming.h
new file mode 100644
index 0000000..4ddf0b3
--- /dev/null
+++ b/src/core/Streaming.h
@@ -0,0 +1,219 @@
+#pragma once
+
+#include "Game.h"
+
+enum {
+	STREAM_OFFSET_TXD = MODELINFOSIZE,
+	STREAM_OFFSET_COL = STREAM_OFFSET_TXD+TXDSTORESIZE,
+	STREAM_OFFSET_ANIM = STREAM_OFFSET_COL+COLSTORESIZE,
+	NUMSTREAMINFO = STREAM_OFFSET_ANIM+NUMANIMBLOCKS
+};
+
+enum StreamFlags
+{
+	STREAMFLAGS_DONT_REMOVE = 0x01,
+	STREAMFLAGS_SCRIPTOWNED = 0x02,
+	STREAMFLAGS_DEPENDENCY  = 0x04,	// Is this right?
+	STREAMFLAGS_PRIORITY    = 0x08,
+	STREAMFLAGS_NOFADE      = 0x10,
+	STREAMFLAGS_20          = 0x20,	// TODO(MIAMI): what's this
+
+	STREAMFLAGS_CANT_REMOVE = STREAMFLAGS_DONT_REMOVE|STREAMFLAGS_SCRIPTOWNED,
+	STREAMFLAGS_KEEP_IN_MEMORY = STREAMFLAGS_DONT_REMOVE|STREAMFLAGS_SCRIPTOWNED|STREAMFLAGS_DEPENDENCY,
+};
+
+enum StreamLoadState
+{
+	STREAMSTATE_NOTLOADED = 0,
+	STREAMSTATE_LOADED    = 1,
+	STREAMSTATE_INQUEUE   = 2,
+	STREAMSTATE_READING   = 3,	// channel is reading
+	STREAMSTATE_STARTED   = 4,	// first part loaded
+};
+
+enum ChannelState
+{
+	CHANNELSTATE_IDLE = 0,
+	CHANNELSTATE_READING = 1,
+	CHANNELSTATE_STARTED = 2,
+	CHANNELSTATE_ERROR = 3,
+};
+
+class CStreamingInfo
+{
+public:
+	CStreamingInfo *m_next;
+	CStreamingInfo *m_prev;
+	uint8 m_loadState;
+	uint8 m_flags;
+
+	int16  m_nextID;
+	uint32 m_position;
+	uint32 m_size;
+
+	bool GetCdPosnAndSize(uint32 &posn, uint32 &size);
+	void SetCdPosnAndSize(uint32 posn, uint32 size);
+	void AddToList(CStreamingInfo *link);
+	void RemoveFromList(void);
+	uint32 GetCdSize(void) { return m_size; }
+	bool IsPriority(void) { return !!(m_flags & STREAMFLAGS_PRIORITY); }
+};
+
+struct CStreamingChannel
+{
+	int32 streamIds[4];
+	int32 offsets[4];
+	int32 state;
+	int32 field24;
+	int32 position;
+	int32 size;
+	int32 numTries;
+	int32 status;	// from CdStream
+};
+
+class CDirectory;
+class CPtrList;
+
+class CStreaming
+{
+public:
+	static bool ms_disableStreaming;
+	static bool ms_bLoadingBigModel;
+	static int32 ms_numModelsRequested;
+	static CStreamingInfo ms_aInfoForModel[NUMSTREAMINFO];
+	static CStreamingInfo ms_startLoadedList;
+	static CStreamingInfo ms_endLoadedList;
+	static CStreamingInfo ms_startRequestedList;
+	static CStreamingInfo ms_endRequestedList;
+	static int32 ms_oldSectorX;
+	static int32 ms_oldSectorY;
+	static int32 ms_streamingBufferSize;
+#ifndef ONE_THREAD_PER_CHANNEL
+	static int8 *ms_pStreamingBuffer[2];
+#else
+	static int8 *ms_pStreamingBuffer[4];
+#endif
+	static size_t ms_memoryUsed;
+	static CStreamingChannel ms_channel[2];
+	static int32 ms_channelError;
+	static int32 ms_numVehiclesLoaded;
+	static int32 ms_numPedsLoaded;
+	static int32 ms_vehiclesLoaded[MAXVEHICLESLOADED];
+	static int32 ms_lastVehicleDeleted;
+	static bool ms_bIsPedFromPedGroupLoaded[NUMMODELSPERPEDGROUP];
+	static CDirectory *ms_pExtraObjectsDir;
+	static int32 ms_numPriorityRequests;
+	static int32 ms_currentPedGrp;
+	static int32 ms_lastCullZone;
+	static uint16 ms_loadedGangs;
+	static uint16 ms_loadedGangCars;
+	static int32 ms_currentPedLoading;
+	static int32 ms_imageOffsets[NUMCDIMAGES];
+	static int32 ms_lastImageRead;
+	static int32 ms_imageSize;
+	static size_t ms_memoryAvailable;
+
+	static void Init(void);
+	static void Init2(void);
+	static void ReInit(void);
+	static void Shutdown(void);
+	static void Update(void);
+	static void LoadCdDirectory(void);
+	static void LoadCdDirectory(const char *dirname, int32 n);
+	static bool ConvertBufferToObject(int8 *buf, int32 streamId);
+	static bool FinishLoadingLargeFile(int8 *buf, int32 streamId);
+	static bool HasModelLoaded(int32 id) { return ms_aInfoForModel[id].m_loadState == STREAMSTATE_LOADED; }
+	static bool HasTxdLoaded(int32 id) { return HasModelLoaded(id+STREAM_OFFSET_TXD); }
+	static bool HasColLoaded(int32 id) { return HasModelLoaded(id+STREAM_OFFSET_COL); }
+	static bool HasAnimLoaded(int32 id) { return HasModelLoaded(id+STREAM_OFFSET_ANIM); }
+	static bool CanRemoveModel(int32 id) { return (ms_aInfoForModel[id].m_flags & STREAMFLAGS_CANT_REMOVE) == 0; }
+	static bool CanRemoveTxd(int32 id) { return CanRemoveModel(id+STREAM_OFFSET_TXD); }
+	static bool CanRemoveCol(int32 id) { return CanRemoveModel(id+STREAM_OFFSET_COL); }
+	static bool CanRemoveAnim(int32 id) { return CanRemoveModel(id+STREAM_OFFSET_ANIM); }
+	static void RequestModel(int32 model, int32 flags);
+	static void ReRequestModel(int32 model) { RequestModel(model, ms_aInfoForModel[model].m_flags); }
+	static void RequestTxd(int32 txd, int32 flags) { RequestModel(txd + STREAM_OFFSET_TXD, flags); }
+	static void ReRequestTxd(int32 txd) { ReRequestModel(txd + STREAM_OFFSET_TXD); }
+	static void RequestCol(int32 col, int32 flags) { RequestModel(col + STREAM_OFFSET_COL, flags); }
+	static void ReRequestCol(int32 col) { ReRequestModel(col + STREAM_OFFSET_COL); }
+	static void RequestAnim(int32 col, int32 flags) { RequestModel(col + STREAM_OFFSET_ANIM, flags); }
+	static void ReRequestAnim(int32 col) { ReRequestModel(col + STREAM_OFFSET_ANIM); }
+	static void RequestBigBuildings(eLevelName level);
+	static void RequestBigBuildings(eLevelName level, const CVector &pos);
+	static void InstanceBigBuildings(eLevelName level, const CVector &pos);
+	static void InstanceLoadedModelsInSectorList(CPtrList &list);
+	static void InstanceLoadedModels(const CVector &pos);
+	static void RequestIslands(eLevelName level);
+	static void RequestSpecialModel(int32 modelId, const char *modelName, int32 flags);
+	static void RequestSpecialChar(int32 charId, const char *modelName, int32 flags);
+	static bool HasSpecialCharLoaded(int32 id);
+	static void SetMissionDoesntRequireSpecialChar(int32 id);
+	static void DecrementRef(int32 id);
+	static void RemoveModel(int32 id);
+	static void RemoveTxd(int32 id) { RemoveModel(id + STREAM_OFFSET_TXD); }
+	static void RemoveCol(int32 id) { RemoveModel(id + STREAM_OFFSET_COL); }
+	static void RemoveAnim(int32 id) { RemoveModel(id + STREAM_OFFSET_ANIM); }
+	static void RemoveUnusedBuildings(eLevelName level);
+	static void RemoveBuildings(eLevelName level);
+	static void RemoveBuildingsNotInArea(int32 area);
+	static void RemoveUnusedBigBuildings(eLevelName level);
+	static void RemoveIslandsNotUsed(eLevelName level);
+	static void RemoveBigBuildings(eLevelName level);
+	static bool RemoveLoadedVehicle(void);
+	static bool RemoveLeastUsedModel(uint32 excludeMask);
+	static void RemoveAllUnusedModels(void);
+	static void RemoveUnusedModelsInLoadedList(void);
+	static bool RemoveLoadedZoneModel(void);
+	static int32 GetAvailableVehicleSlot(void);
+	static bool IsTxdUsedByRequestedModels(int32 txdId);
+	static bool AreAnimsUsedByRequestedModels(int32 animId);
+	static bool AddToLoadedVehiclesList(int32 modelId);
+	static bool IsObjectInCdImage(int32 id);
+	static void SetModelIsDeletable(int32 id);
+	static void SetModelTxdIsDeletable(int32 id);
+	static void SetMissionDoesntRequireModel(int32 id);
+	static void LoadInitialPeds(void);
+	static void LoadInitialWeapons(void);
+	static void LoadInitialVehicles(void);
+	static void StreamVehiclesAndPeds(void);
+	static void StreamZoneModels(const CVector &pos);
+	static void RemoveCurrentZonesModels(void);
+	static void LoadBigBuildingsWhenNeeded(void);
+
+	static int32 GetCdImageOffset(int32 lastPosn);
+	static int32 GetNextFileOnCd(int32 position, bool priority);
+	static void RequestModelStream(int32 ch);
+	static bool ProcessLoadingChannel(int32 ch);
+	static void RetryLoadFile(int32 ch);
+	static void LoadRequestedModels(void);
+	static void LoadAllRequestedModels(bool priority);
+	static void FlushChannels(void);
+	static void FlushRequestList(void);
+
+	static void MakeSpaceFor(int32 size);
+	static void ImGonnaUseStreamingMemory(void);
+	static void IHaveUsedStreamingMemory(void);
+	static void UpdateMemoryUsed(void);
+
+	static void AddModelsToRequestList(const CVector &pos, int32 flags);
+	static void ProcessEntitiesInSectorList(CPtrList &list, float x, float y, float xmin, float ymin, float xmax, float ymax, int32 flags);
+	static void ProcessEntitiesInSectorList(CPtrList &list, int32 flags);
+	static void DeleteFarAwayRwObjects(const CVector &pos);
+	static void DeleteAllRwObjects(void);
+	static void DeleteRwObjectsAfterDeath(const CVector &pos);
+	static void DeleteRwObjectsBehindCamera(size_t mem); // originally signed
+	static void DeleteRwObjectsInSectorList(CPtrList &list);
+	static void DeleteRwObjectsInOverlapSectorList(CPtrList &list, int32 x, int32 y);
+	static bool DeleteRwObjectsBehindCameraInSectorList(CPtrList &list, size_t mem); // originally signed
+	static bool DeleteRwObjectsNotInFrustumInSectorList(CPtrList &list, size_t mem); // originally signed
+
+	static void LoadScene(const CVector &pos);
+	static void LoadSceneCollision(const CVector &pos);
+
+	static void MemoryCardSave(uint8 *buffer, uint32 *length);
+	static void MemoryCardLoad(uint8 *buffer, uint32 length);
+
+	static void UpdateForAnimViewer(void);
+
+	static void PrintStreamingBufferState();
+};
diff --git a/src/core/SurfaceTable.cpp b/src/core/SurfaceTable.cpp
new file mode 100644
index 0000000..c4b184b
--- /dev/null
+++ b/src/core/SurfaceTable.cpp
@@ -0,0 +1,156 @@
+#include "common.h"
+
+#include "main.h"
+#include "FileMgr.h"
+#include "Weather.h"
+#include "Collision.h"
+#include "SurfaceTable.h"
+
+float CSurfaceTable::ms_aAdhesiveLimitTable[NUMADHESIVEGROUPS][NUMADHESIVEGROUPS];
+
+void
+CSurfaceTable::Initialise(Const char *filename)
+{
+	int lineno, fieldno;
+	char *line;
+	char surfname[256];
+	float adhesiveLimit;
+
+	CFileMgr::SetDir("");
+	CFileMgr::LoadFile(filename, work_buff, sizeof(work_buff), "r");
+
+	line = (char*)work_buff;
+	for(lineno = 0; lineno < NUMADHESIVEGROUPS; lineno++){
+		// skip white space and comments
+		while(*line == ' ' || *line == '\t' || *line == '\n' || *line == '\r' || *line == ';'){
+			if(*line == ';'){
+				while(*line != '\n' && *line != '\r')
+					line++;
+			}else
+				line++;
+		}
+
+		sscanf(line, "%s", surfname);
+		// skip what we just read
+		while(!(*line == ' ' || *line == '\t' || *line == ','))
+			line++;
+
+		for(fieldno = 0; fieldno <= lineno; fieldno++){
+			// skip white space
+			while(*line == ' ' || *line == '\t' || *line == ',')
+				line++;
+			adhesiveLimit = 0.0f;
+			if(*line != '-')
+				sscanf(line, "%f", &adhesiveLimit);
+			// skip what we just read
+			while(!(*line == ' ' || *line == '\t' || *line == ',' || *line == '\n'))
+				line++;
+
+			ms_aAdhesiveLimitTable[lineno][fieldno] = adhesiveLimit;
+			ms_aAdhesiveLimitTable[fieldno][lineno] = adhesiveLimit;
+		}
+	}
+}
+
+int
+CSurfaceTable::GetAdhesionGroup(uint8 surfaceType)
+{
+	switch(surfaceType){
+	case SURFACE_DEFAULT:		return ADHESIVE_ROAD;
+	case SURFACE_TARMAC:		return ADHESIVE_ROAD;
+	case SURFACE_GRASS:		return ADHESIVE_LOOSE;
+	case SURFACE_GRAVEL:		return ADHESIVE_LOOSE;
+	case SURFACE_MUD_DRY:		return ADHESIVE_HARD;
+	case SURFACE_PAVEMENT:		return ADHESIVE_ROAD;
+	case SURFACE_CAR:		return ADHESIVE_HARD;
+	case SURFACE_GLASS:		return ADHESIVE_HARD;
+	case SURFACE_TRANSPARENT_CLOTH:	return ADHESIVE_HARD;
+	case SURFACE_GARAGE_DOOR:	return ADHESIVE_HARD;
+	case SURFACE_CAR_PANEL:		return ADHESIVE_HARD;
+	case SURFACE_THICK_METAL_PLATE:	return ADHESIVE_HARD;
+	case SURFACE_SCAFFOLD_POLE:	return ADHESIVE_HARD;
+	case SURFACE_LAMP_POST:		return ADHESIVE_HARD;
+	case SURFACE_FIRE_HYDRANT:	return ADHESIVE_HARD;
+	case SURFACE_GIRDER:		return ADHESIVE_HARD;
+	case SURFACE_METAL_CHAIN_FENCE:	return ADHESIVE_HARD;
+	case SURFACE_PED:		return ADHESIVE_RUBBER;
+	case SURFACE_SAND:		return ADHESIVE_SAND;
+	case SURFACE_WATER:		return ADHESIVE_WET;
+	case SURFACE_WOOD_CRATES:	return ADHESIVE_ROAD;
+	case SURFACE_WOOD_BENCH:	return ADHESIVE_ROAD;
+	case SURFACE_WOOD_SOLID:	return ADHESIVE_ROAD;
+	case SURFACE_RUBBER:		return ADHESIVE_RUBBER;
+	case SURFACE_PLASTIC:		return ADHESIVE_HARD;
+	case SURFACE_HEDGE:		return ADHESIVE_LOOSE;
+	case SURFACE_STEEP_CLIFF:	return ADHESIVE_LOOSE;
+	case SURFACE_CONTAINER:		return ADHESIVE_HARD;
+	case SURFACE_NEWS_VENDOR:	return ADHESIVE_HARD;
+	case SURFACE_WHEELBASE:		return ADHESIVE_RUBBER;
+	case SURFACE_CARDBOARDBOX:	return ADHESIVE_LOOSE;
+	case SURFACE_TRANSPARENT_STONE:	return ADHESIVE_HARD;
+	case SURFACE_METAL_GATE:	return ADHESIVE_HARD;
+	case SURFACE_SAND_BEACH:	return ADHESIVE_SAND;
+	case SURFACE_CONCRETE_BEACH:	return ADHESIVE_ROAD;
+	default:			return ADHESIVE_ROAD;
+	}
+}
+
+float
+CSurfaceTable::GetWetMultiplier(uint8 surfaceType)
+{
+	switch(surfaceType){
+	case SURFACE_DEFAULT:
+	case SURFACE_TARMAC:
+	case SURFACE_MUD_DRY:
+	case SURFACE_PAVEMENT:
+	case SURFACE_TRANSPARENT_CLOTH:
+	case SURFACE_WOOD_CRATES:
+	case SURFACE_WOOD_BENCH:
+	case SURFACE_WOOD_SOLID:
+	case SURFACE_HEDGE:
+	case SURFACE_CARDBOARDBOX:
+	case SURFACE_TRANSPARENT_STONE:
+	case SURFACE_CONCRETE_BEACH:
+		return 1.0f - CWeather::WetRoads*0.25f;
+
+	case SURFACE_GRASS:
+	case SURFACE_CAR:
+	case SURFACE_GLASS:
+	case SURFACE_GARAGE_DOOR:
+	case SURFACE_CAR_PANEL:
+	case SURFACE_THICK_METAL_PLATE:
+	case SURFACE_SCAFFOLD_POLE:
+	case SURFACE_LAMP_POST:
+	case SURFACE_FIRE_HYDRANT:
+	case SURFACE_GIRDER:
+	case SURFACE_METAL_CHAIN_FENCE:
+	case SURFACE_PED:
+	case SURFACE_RUBBER:
+	case SURFACE_PLASTIC:
+	case SURFACE_STEEP_CLIFF:
+	case SURFACE_CONTAINER:
+	case SURFACE_NEWS_VENDOR:
+	case SURFACE_WHEELBASE:
+	case SURFACE_METAL_GATE:
+		return 1.0f - CWeather::WetRoads*0.4f;
+
+	case SURFACE_SAND:
+	case SURFACE_SAND_BEACH:
+		return 1.0f + CWeather::WetRoads*0.5f;
+
+	default:
+		return 1.0f;
+	}
+}
+
+float
+CSurfaceTable::GetAdhesiveLimit(CColPoint &colpoint)
+{
+	return ms_aAdhesiveLimitTable[GetAdhesionGroup(colpoint.surfaceB)][GetAdhesionGroup(colpoint.surfaceA)];
+}
+
+bool
+CSurfaceTable::IsSoftLanding(uint8 surf)
+{
+	return surf == SURFACE_GRASS || surf == SURFACE_SAND || surf == SURFACE_SAND_BEACH;
+}
diff --git a/src/core/SurfaceTable.h b/src/core/SurfaceTable.h
new file mode 100644
index 0000000..8ff4310
--- /dev/null
+++ b/src/core/SurfaceTable.h
@@ -0,0 +1,101 @@
+#pragma once
+
+enum eSurfaceType
+{
+	SURFACE_DEFAULT,
+	SURFACE_TARMAC,
+	SURFACE_GRASS,
+	SURFACE_GRAVEL,
+	SURFACE_MUD_DRY,
+	SURFACE_PAVEMENT,
+	SURFACE_CAR,
+	SURFACE_GLASS,
+	SURFACE_TRANSPARENT_CLOTH,
+	SURFACE_GARAGE_DOOR,
+	SURFACE_CAR_PANEL,
+	SURFACE_THICK_METAL_PLATE,
+	SURFACE_SCAFFOLD_POLE,
+	SURFACE_LAMP_POST,
+	SURFACE_FIRE_HYDRANT,
+	SURFACE_GIRDER,
+	SURFACE_METAL_CHAIN_FENCE,
+	SURFACE_PED,
+	SURFACE_SAND,
+	SURFACE_WATER,
+	SURFACE_WOOD_CRATES,
+	SURFACE_WOOD_BENCH,
+	SURFACE_WOOD_SOLID,
+	SURFACE_RUBBER,
+	SURFACE_PLASTIC,
+	SURFACE_HEDGE,
+	SURFACE_STEEP_CLIFF,
+	SURFACE_CONTAINER,
+	SURFACE_NEWS_VENDOR,
+	SURFACE_WHEELBASE,
+	SURFACE_CARDBOARDBOX,
+	SURFACE_TRANSPARENT_STONE,
+	SURFACE_METAL_GATE,
+	SURFACE_SAND_BEACH,
+	SURFACE_CONCRETE_BEACH,
+};
+
+enum
+{
+	ADHESIVE_RUBBER,
+	ADHESIVE_HARD,
+	ADHESIVE_ROAD,
+	ADHESIVE_LOOSE,
+	ADHESIVE_SAND,
+	ADHESIVE_WET,
+
+	NUMADHESIVEGROUPS
+};
+
+struct CColPoint;
+
+inline bool
+IsSeeThrough(uint8 surfType)
+{
+	switch(surfType)
+	case SURFACE_GLASS:
+	case SURFACE_TRANSPARENT_CLOTH:
+	case SURFACE_METAL_CHAIN_FENCE:
+	case SURFACE_TRANSPARENT_STONE:
+	case SURFACE_SCAFFOLD_POLE:
+		return true;
+	return false;
+}
+
+// I think the necessity of this function is really a bug
+inline bool
+IsSeeThroughVertical(uint8 surfType)
+{
+	switch(surfType)
+	case SURFACE_GLASS:
+	case SURFACE_TRANSPARENT_CLOTH:
+		return true;
+	return false;
+}
+
+inline bool
+IsShootThrough(uint8 surfType)
+{
+	switch(surfType)
+	case SURFACE_TRANSPARENT_CLOTH:
+	case SURFACE_METAL_CHAIN_FENCE:
+	case SURFACE_TRANSPARENT_STONE:
+	case SURFACE_SCAFFOLD_POLE:
+		return true;
+	return false;
+}
+
+class CSurfaceTable
+{
+	static float ms_aAdhesiveLimitTable[NUMADHESIVEGROUPS][NUMADHESIVEGROUPS];
+public:
+	static void Initialise(Const char *filename);
+	static int GetAdhesionGroup(uint8 surfaceType);
+	static float GetWetMultiplier(uint8 surfaceType);
+	static float GetAdhesiveLimit(CColPoint &colpoint);
+	static bool IsSoftLanding(uint8 surf);
+};
diff --git a/src/core/TimeStep.cpp b/src/core/TimeStep.cpp
new file mode 100644
index 0000000..09dae91
--- /dev/null
+++ b/src/core/TimeStep.cpp
@@ -0,0 +1,5 @@
+#include "TimeStep.h"
+
+float CTimeStep::ms_fTimeScale = 1.0f;
+float CTimeStep::ms_fFramesPerUpdate = 1.0f;
+float CTimeStep::ms_fTimeStep = 1.0f;
diff --git a/src/core/TimeStep.h b/src/core/TimeStep.h
new file mode 100644
index 0000000..6101b4c
--- /dev/null
+++ b/src/core/TimeStep.h
@@ -0,0 +1,10 @@
+#pragma once
+
+// Pretty sure this class is not used by the game
+class CTimeStep
+{
+public:
+	static float ms_fTimeScale;
+	static float ms_fFramesPerUpdate;
+	static float ms_fTimeStep;
+};
diff --git a/src/core/Timer.cpp b/src/core/Timer.cpp
new file mode 100644
index 0000000..5ebe3f5
--- /dev/null
+++ b/src/core/Timer.cpp
@@ -0,0 +1,246 @@
+#define WITHWINDOWS
+#include "common.h"
+#include "crossplatform.h"
+
+#include "DMAudio.h"
+#include "Record.h"
+#include "Timer.h"
+#include "SpecialFX.h"
+
+uint32 CTimer::m_snTimeInMilliseconds;
+PauseModeTime CTimer::m_snTimeInMillisecondsPauseMode = 1;
+
+uint32 CTimer::m_snTimeInMillisecondsNonClipped;
+uint32 CTimer::m_snPreviousTimeInMilliseconds;
+uint32 CTimer::m_FrameCounter;
+float CTimer::ms_fTimeScale;
+float CTimer::ms_fTimeStep;
+float CTimer::ms_fTimeStepNonClipped;
+bool  CTimer::m_UserPause;
+bool  CTimer::m_CodePause;
+
+uint32 _nCyclesPerMS = 1;
+
+#ifdef _WIN32
+LARGE_INTEGER _oldPerfCounter;
+LARGE_INTEGER perfSuspendCounter;
+#define RsTimerType uint32
+#else
+#define RsTimerType double
+#endif
+
+RsTimerType oldPcTimer;
+
+RsTimerType suspendPcTimer;
+
+uint32 suspendDepth;
+
+#ifdef FIX_HIGH_FPS_BUGS_ON_FRONTEND
+double frameTime;
+#endif
+
+void CTimer::Initialise(void)
+{
+	debug("Initialising CTimer...\n");
+	
+	ms_fTimeScale = 1.0f;
+	ms_fTimeStep = 1.0f;
+	suspendDepth = 0;
+	m_UserPause = false;
+	m_CodePause = false;
+	m_snTimeInMillisecondsNonClipped = 0;
+	m_snPreviousTimeInMilliseconds = 0;
+	m_snTimeInMilliseconds = 1;
+	
+#ifdef _WIN32
+	LARGE_INTEGER perfFreq;
+	if ( QueryPerformanceFrequency(&perfFreq) )
+	{
+		OutputDebugString("Performance counter available\n");
+		_nCyclesPerMS = uint32(perfFreq.QuadPart / 1000);
+		QueryPerformanceCounter(&_oldPerfCounter);
+	}
+	else
+#endif
+	{
+		OutputDebugString("Performance counter not available, using millesecond timer\n");
+		_nCyclesPerMS = 0;
+		oldPcTimer = RsTimer();
+	}
+	
+	m_snTimeInMilliseconds = m_snPreviousTimeInMilliseconds;
+	
+	m_FrameCounter = 0;
+	
+	DMAudio.ResetTimers(m_snPreviousTimeInMilliseconds);
+	
+	debug("CTimer ready\n");
+}
+
+void CTimer::Shutdown(void)
+{
+	;
+}
+
+void CTimer::Update(void)
+{
+	m_snPreviousTimeInMilliseconds = m_snTimeInMilliseconds;
+	
+#ifdef _WIN32
+	if ( (double)_nCyclesPerMS != 0.0 )
+	{
+		LARGE_INTEGER pc;
+		QueryPerformanceCounter(&pc);
+		
+		int32 updInCycles = (pc.LowPart - _oldPerfCounter.LowPart); // & 0x7FFFFFFF; pointless
+		
+		_oldPerfCounter = pc;
+		
+		float updInCyclesScaled = GetIsPaused() ? updInCycles : updInCycles * ms_fTimeScale;
+		
+		// We need that real frame time to fix transparent menu bug.
+#ifndef FIX_HIGH_FPS_BUGS_ON_FRONTEND
+		double
+#endif
+		frameTime = updInCyclesScaled / (double)_nCyclesPerMS;
+
+		m_snTimeInMillisecondsPauseMode = m_snTimeInMillisecondsPauseMode + frameTime;
+		
+		if ( GetIsPaused() )
+			ms_fTimeStep = 0.0f;
+		else
+		{
+			m_snTimeInMilliseconds = m_snTimeInMilliseconds + frameTime;
+			m_snTimeInMillisecondsNonClipped = m_snTimeInMillisecondsNonClipped + frameTime;
+			ms_fTimeStep = frameTime / 1000.0f * 50.0f;
+		}
+	}
+	else
+#endif
+	{
+		RsTimerType timer = RsTimer();
+		
+		RsTimerType updInMs = timer - oldPcTimer;
+		
+		// We need that real frame time to fix transparent menu bug.
+#ifndef FIX_HIGH_FPS_BUGS_ON_FRONTEND
+		double
+#endif
+		frameTime = (double)updInMs * ms_fTimeScale;
+		
+		oldPcTimer = timer;
+		
+		m_snTimeInMillisecondsPauseMode = m_snTimeInMillisecondsPauseMode + frameTime;
+															 
+		if ( GetIsPaused() )
+			ms_fTimeStep = 0.0f;
+		else
+		{
+			m_snTimeInMilliseconds = m_snTimeInMilliseconds + frameTime;
+			m_snTimeInMillisecondsNonClipped = m_snTimeInMillisecondsNonClipped + frameTime;
+			ms_fTimeStep = frameTime / 1000.0f * 50.0f;
+		}
+	}
+	
+	if ( ms_fTimeStep < 0.01f && !GetIsPaused() && !CSpecialFX::bSnapShotActive)
+		ms_fTimeStep = 0.01f;
+
+	ms_fTimeStepNonClipped = ms_fTimeStep;
+	
+	if ( !CRecordDataForGame::IsPlayingBack() )
+	{
+		ms_fTimeStep = Min(3.0f, ms_fTimeStep);
+
+		if ( (m_snTimeInMilliseconds - m_snPreviousTimeInMilliseconds) > 60 )
+			m_snTimeInMilliseconds = m_snPreviousTimeInMilliseconds + 60;
+	}
+  
+	if ( CRecordDataForChase::IsRecording() )
+	{
+		ms_fTimeStep = 1.0f;
+		m_snTimeInMilliseconds = m_snPreviousTimeInMilliseconds + 16;
+	}
+  
+	m_FrameCounter++;
+}
+
+void CTimer::Suspend(void)
+{
+	if ( ++suspendDepth > 1 )
+		return;
+	
+#ifdef _WIN32
+	if ( (double)_nCyclesPerMS != 0.0 )
+		QueryPerformanceCounter(&perfSuspendCounter);
+	else
+#endif
+		suspendPcTimer = RsTimer();
+}
+
+void CTimer::Resume(void)
+{
+	if ( --suspendDepth != 0 )
+		return;
+
+#ifdef _WIN32
+	if ( (double)_nCyclesPerMS != 0.0 )
+	{
+		LARGE_INTEGER pc;
+		QueryPerformanceCounter(&pc);
+
+		_oldPerfCounter.LowPart += pc.LowPart - perfSuspendCounter.LowPart;
+	}
+	else
+#endif
+		oldPcTimer += RsTimer() - suspendPcTimer;
+}
+
+uint32 CTimer::GetCyclesPerMillisecond(void)
+{
+#ifdef _WIN32
+	if (_nCyclesPerMS != 0)
+		return _nCyclesPerMS;
+	else 
+#endif
+		return 1;
+}
+
+uint32 CTimer::GetCurrentTimeInCycles(void)
+{
+#ifdef _WIN32
+	if ( _nCyclesPerMS != 0 )
+	{
+		LARGE_INTEGER pc;
+		QueryPerformanceCounter(&pc);
+		return (pc.LowPart - _oldPerfCounter.LowPart); // & 0x7FFFFFFF; pointless
+	}
+	else
+#endif
+		return RsTimer() - oldPcTimer;
+}
+
+bool CTimer::GetIsSlowMotionActive(void)
+{
+	return ms_fTimeScale < 1.0f;
+}
+
+void CTimer::Stop(void)
+{
+	m_snPreviousTimeInMilliseconds = m_snTimeInMilliseconds;
+}
+
+void CTimer::StartUserPause(void)
+{
+	m_UserPause = true;
+}
+
+void CTimer::EndUserPause(void)
+{
+	m_UserPause = false;
+}
+
+uint32 CTimer::GetCyclesPerFrame()
+{
+	return 20;
+}
+
diff --git a/src/core/Timer.h b/src/core/Timer.h
new file mode 100644
index 0000000..53591c4
--- /dev/null
+++ b/src/core/Timer.h
@@ -0,0 +1,75 @@
+#pragma once
+
+#ifdef FIX_HIGH_FPS_BUGS_ON_FRONTEND
+#define PauseModeTime double
+#else
+#define PauseModeTime uint32
+#endif
+
+class CTimer
+{
+
+	static uint32 m_snTimeInMilliseconds;
+	static PauseModeTime m_snTimeInMillisecondsPauseMode;
+	static uint32 m_snTimeInMillisecondsNonClipped;
+	static uint32 m_snPreviousTimeInMilliseconds;
+	static uint32 m_FrameCounter;
+	static float ms_fTimeScale;
+	static float ms_fTimeStep;
+	static float ms_fTimeStepNonClipped;
+public:
+	static bool  m_UserPause;
+	static bool  m_CodePause;
+
+	static const float &GetTimeStep(void) { return ms_fTimeStep; }
+	static void SetTimeStep(float ts) { ms_fTimeStep = ts; }
+	static float GetTimeStepInSeconds() { return ms_fTimeStep / 50.0f; }
+	static uint32 GetTimeStepInMilliseconds() { return ms_fTimeStep / 50.0f * 1000.0f; }
+	static const float &GetTimeStepNonClipped(void) { return ms_fTimeStepNonClipped; }
+	static float GetTimeStepNonClippedInSeconds(void) { return ms_fTimeStepNonClipped / 50.0f; }
+	static float GetTimeStepNonClippedInMilliseconds(void) { return ms_fTimeStepNonClipped / 50.0f * 1000.0f; }
+	static void SetTimeStepNonClipped(float ts) { ms_fTimeStepNonClipped = ts; }
+	static const uint32 &GetFrameCounter(void) { return m_FrameCounter; }
+	static void SetFrameCounter(uint32 fc) { m_FrameCounter = fc; }
+	static const uint32 &GetTimeInMilliseconds(void) { return m_snTimeInMilliseconds; }
+	static void SetTimeInMilliseconds(uint32 t) { m_snTimeInMilliseconds = t; }
+	static uint32 GetTimeInMillisecondsNonClipped(void) { return m_snTimeInMillisecondsNonClipped; }
+	static void SetTimeInMillisecondsNonClipped(uint32 t) { m_snTimeInMillisecondsNonClipped = t; }
+	static PauseModeTime GetTimeInMillisecondsPauseMode(void) { return m_snTimeInMillisecondsPauseMode; }
+	static void SetTimeInMillisecondsPauseMode(uint32 t) { m_snTimeInMillisecondsPauseMode = t; }
+	static uint32 GetPreviousTimeInMilliseconds(void) { return m_snPreviousTimeInMilliseconds; }
+	static void SetPreviousTimeInMilliseconds(uint32 t) { m_snPreviousTimeInMilliseconds = t; }
+	static const float &GetTimeScale(void) { return ms_fTimeScale; }
+	static void SetTimeScale(float ts) { ms_fTimeScale = ts; }
+	static uint32 GetCyclesPerFrame();
+
+	static bool GetIsPaused() { return m_UserPause || m_CodePause; }
+	static bool GetIsUserPaused() { return m_UserPause; }
+	static bool GetIsCodePaused() { return m_CodePause; }
+	static void SetCodePause(bool pause) { m_CodePause = pause; }
+	
+	static void Initialise(void);
+	static void Shutdown(void);
+	static void Update(void);
+	static void Suspend(void);
+	static void Resume(void);
+	static uint32 GetCyclesPerMillisecond(void);
+	static uint32 GetCurrentTimeInCycles(void);
+	static bool GetIsSlowMotionActive(void);
+	static void Stop(void);
+	static void StartUserPause(void);
+	static void EndUserPause(void);
+
+	friend bool GenericLoad(void);
+	friend bool GenericSave(int file);
+	friend class CMemoryCard;
+
+#ifdef FIX_BUGS
+	static float GetDefaultTimeStep(void) { return 50.0f / 30.0f; }
+	static float GetTimeStepFix(void) { return GetTimeStep() / GetDefaultTimeStep(); }
+#endif
+};
+
+#ifdef FIX_HIGH_FPS_BUGS_ON_FRONTEND
+extern double frameTime;
+#endif
diff --git a/src/core/User.cpp b/src/core/User.cpp
new file mode 100644
index 0000000..53196d0
--- /dev/null
+++ b/src/core/User.cpp
@@ -0,0 +1,135 @@
+#include "common.h"
+
+#include "GameLogic.h"
+#include "Hud.h"
+#include "PlayerPed.h"
+#include "Replay.h"
+#include "Text.h"
+#include "User.h"
+#include "Vehicle.h"
+#include "World.h"
+#include "Zones.h"
+
+CPlaceName CUserDisplay::PlaceName;
+COnscreenTimer CUserDisplay::OnscnTimer;
+CPager CUserDisplay::Pager;
+CCurrentVehicle CUserDisplay::CurrentVehicle;
+
+CPlaceName::CPlaceName()
+{
+	Init();
+}
+
+void
+CPlaceName::Init()
+{
+	m_pZone = nil;
+	m_pZone2 = nil;
+	m_nAdditionalTimer = 0;
+}
+
+void
+CPlaceName::Process()
+{
+	CVector pos = CWorld::Players[CWorld::PlayerInFocus].GetPos();
+	CZone *navigZone = CTheZones::FindSmallestNavigationZoneForPosition(&pos, false, true);
+	CZone *defaultZone = CTheZones::FindSmallestNavigationZoneForPosition(&pos, true, false);
+
+	if (navigZone == nil) m_pZone = nil;
+	if (defaultZone == nil) m_pZone2 = nil;
+
+	if (navigZone == m_pZone) {
+		if (defaultZone == m_pZone2 || m_pZone != nil) {
+			if (navigZone != nil || defaultZone != nil) {
+				if (m_nAdditionalTimer != 0)
+					m_nAdditionalTimer--;
+			} else {
+				m_nAdditionalTimer = 0;
+				m_pZone = nil;
+				m_pZone2 = nil;
+			}
+		} else {
+			m_pZone2 = defaultZone;
+			m_nAdditionalTimer = 250;
+		}
+	} else {
+		m_pZone = navigZone;
+		m_nAdditionalTimer = 250;
+	}
+	Display();
+}
+
+void
+CPlaceName::Display()
+{
+	wchar *text;
+	if (m_pZone != nil)
+		text = m_pZone->GetTranslatedName();
+	else if (m_pZone2 != nil)
+		text = m_pZone2->GetTranslatedName();
+#ifdef FIX_BUGS
+	else
+		text = nil;
+#endif
+	CHud::SetZoneName(text);
+}
+
+void
+CPlaceName::ProcessAfterFrontEndShutDown(void)
+{
+	CHud::m_pLastZoneName = nil;
+	CHud::m_ZoneState = 0;
+	m_nAdditionalTimer = 250;
+}
+
+CCurrentVehicle::CCurrentVehicle()
+{
+	Init();
+}
+
+void
+CCurrentVehicle::Init()
+{
+	m_pCurrentVehicle = nil;
+}
+
+void
+CCurrentVehicle::Process()
+{
+	if (CWorld::Players[CWorld::PlayerInFocus].m_pPed->InVehicle())
+		m_pCurrentVehicle = CWorld::Players[CWorld::PlayerInFocus].m_pPed->m_pMyVehicle;
+	else
+		m_pCurrentVehicle = nil;
+	Display();
+}
+
+void
+CCurrentVehicle::Display()
+{
+	wchar *text = nil;
+	if (m_pCurrentVehicle != nil && m_pCurrentVehicle != CGameLogic::pShortCutTaxi)
+		text = TheText.Get(((CVehicleModelInfo*)CModelInfo::GetModelInfo(m_pCurrentVehicle->GetModelIndex()))->m_gameName);
+	CHud::SetVehicleName(text);
+}
+
+void
+CUserDisplay::Init()
+{
+	PlaceName.Init();
+	OnscnTimer.Init();
+	Pager.Init();
+	CurrentVehicle.Init();
+}
+
+void
+CUserDisplay::Process()
+{
+#ifdef FIX_BUGS
+	if (CReplay::IsPlayingBack())
+		return;
+#endif
+	PlaceName.Process();
+	OnscnTimer.Process();
+	Pager.Process();
+	CurrentVehicle.Process();
+}
diff --git a/src/core/User.h b/src/core/User.h
new file mode 100644
index 0000000..dd53a40
--- /dev/null
+++ b/src/core/User.h
@@ -0,0 +1,42 @@
+#pragma once
+
+#include "Pager.h"
+#include "OnscreenTimer.h"
+
+class CZone;
+class CVehicle;
+
+class CPlaceName
+{
+	CZone *m_pZone;
+	CZone *m_pZone2;
+	int16 m_nAdditionalTimer;
+public:
+	CPlaceName();
+	void Init();
+	void Process();
+	void Display();
+	void ProcessAfterFrontEndShutDown();
+};
+
+class CCurrentVehicle
+{
+	CVehicle *m_pCurrentVehicle;
+public:
+	CCurrentVehicle();
+	void Init();
+	void Process();
+	void Display();
+};
+
+class CUserDisplay
+{
+public:
+	static CPlaceName PlaceName;
+	static COnscreenTimer OnscnTimer;
+	static CPager Pager;
+	static CCurrentVehicle CurrentVehicle;
+
+	static void Init();
+	static void Process();
+};
diff --git a/src/core/Wanted.cpp b/src/core/Wanted.cpp
new file mode 100644
index 0000000..65bc84d
--- /dev/null
+++ b/src/core/Wanted.cpp
@@ -0,0 +1,510 @@
+#include "common.h"
+
+#include "Pools.h"
+#include "ModelIndices.h"
+#include "Timer.h"
+#include "World.h"
+#include "ZoneCull.h"
+#include "Darkel.h"
+#include "DMAudio.h"
+#include "CopPed.h"
+#include "Wanted.h"
+#include "General.h"
+#include "Stats.h"
+
+int32 CWanted::MaximumWantedLevel = 6;
+int32 CWanted::nMaximumWantedLevel = 9600;
+
+void
+CWanted::Initialise()
+{
+	m_nChaos = 0;
+	m_nMinChaos = 0;
+	m_nLastUpdateTime = 0;
+	m_nLastWantedLevelChange = 0;
+	m_nLastTimeSuspended = 0;
+	m_CurrentCops = 0;
+	m_MaxCops = 0;
+	m_MaximumLawEnforcerVehicles = 0;
+	m_RoadblockDensity = 0;
+	m_bIgnoredByCops = false;
+	m_bIgnoredByEveryone = false;
+	m_bSwatRequired = false;
+	m_bFbiRequired = false;
+	m_bArmyRequired = false;
+	m_fCrimeSensitivity = 1.0f;
+	m_nWantedLevel = 0;
+	m_nMinWantedLevel = 0;
+	m_CopsBeatingSuspect = 0;
+
+	for (int i = 0; i < ARRAY_SIZE(m_pCops); i++)
+		m_pCops[i] = nil;
+
+	ClearQdCrimes();
+}
+
+bool
+CWanted::AreMiamiViceRequired()
+{
+	return m_nWantedLevel >= 3;
+}
+
+bool
+CWanted::AreSwatRequired()
+{
+	return m_nWantedLevel == 4 || m_bSwatRequired;
+}
+
+bool
+CWanted::AreFbiRequired()
+{
+	return m_nWantedLevel == 5 || m_bFbiRequired;
+}
+
+bool
+CWanted::AreArmyRequired()
+{
+	return m_nWantedLevel == 6 || m_bArmyRequired;
+}
+
+int32
+CWanted::NumOfHelisRequired()
+{
+	if (m_bIgnoredByCops || m_bIgnoredByEveryone)
+		return 0;
+
+	switch (m_nWantedLevel) {
+	case 3:
+	case 4:
+		return 1;
+	case 5:
+	case 6:
+		return 1;
+	default:
+		return 0;
+	}
+}
+
+void
+CWanted::SetWantedLevel(int32 level)
+{
+	if (level > MaximumWantedLevel)
+		level = MaximumWantedLevel;
+
+	ClearQdCrimes();
+	switch (level) {
+	case 0:
+		m_nChaos = 0;
+		break;
+	case 1:
+		m_nChaos = 70;
+		break;
+	case 2:
+		m_nChaos = 200;
+		break;
+	case 3:
+		m_nChaos = 570;
+		break;
+	case 4:
+		m_nChaos = 1220;
+		break;
+	case 5:
+		m_nChaos = 2420;
+		break;
+	case 6:
+		m_nChaos = 4820;
+		break;
+	default:
+		break;
+	}
+	UpdateWantedLevel();
+}
+
+void
+CWanted::SetWantedLevelNoDrop(int32 level)
+{
+	if (m_nWantedLevel < m_nMinWantedLevel)
+		SetWantedLevel(m_nMinWantedLevel);
+
+	if (level > m_nWantedLevel)
+		SetWantedLevel(level);
+}
+
+void
+CWanted::CheatWantedLevel(int32 level)
+{
+	SetWantedLevel(level);
+	UpdateWantedLevel();
+}
+
+void
+CWanted::SetMaximumWantedLevel(int32 level)
+{
+	switch(level){
+	case 0:
+		nMaximumWantedLevel = 0;
+		MaximumWantedLevel = 0;
+		break;
+	case 1:
+		nMaximumWantedLevel = 115;
+		MaximumWantedLevel = 1;
+		break;
+	case 2:
+		nMaximumWantedLevel = 365;
+		MaximumWantedLevel = 2;
+		break;
+	case 3:
+		nMaximumWantedLevel = 875;
+		MaximumWantedLevel = 3;
+		break;
+	case 4:
+		nMaximumWantedLevel = 1800;
+		MaximumWantedLevel = 4;
+		break;
+	case 5:
+		nMaximumWantedLevel = 3600;
+		MaximumWantedLevel = 5;
+		break;
+	case 6:
+		nMaximumWantedLevel = 7200;
+		MaximumWantedLevel = 6;
+		break;
+	}
+}
+
+void
+CWanted::RegisterCrime(eCrimeType type, const CVector &coors, uint32 id, bool policeDoesntCare)
+{
+	AddCrimeToQ(type, id, coors, false, policeDoesntCare);
+}
+
+void
+CWanted::RegisterCrime_Immediately(eCrimeType type, const CVector &coors, uint32 id, bool policeDoesntCare)
+{
+#ifdef FIX_SIGNIFICANT_BUGS
+	if(!AddCrimeToQ(type, id, coors, true, policeDoesntCare))
+#else
+	if(!AddCrimeToQ(type, id, coors, false, policeDoesntCare))
+#endif
+		ReportCrimeNow(type, coors, policeDoesntCare);
+}
+
+void
+CWanted::ClearQdCrimes()
+{
+	for (int i = 0; i < 16; i++)
+		m_aCrimes[i].m_nType = CRIME_NONE;
+}
+
+// returns whether the crime had been reported already
+bool
+CWanted::AddCrimeToQ(eCrimeType type, int32 id, const CVector &coors, bool reported, bool policeDoesntCare)
+{
+	int i;
+
+	for(i = 0; i < 16; i++)
+		if(m_aCrimes[i].m_nType == type && m_aCrimes[i].m_nId == id){
+			if(m_aCrimes[i].m_bReported)
+				return true;
+			if(reported)
+				m_aCrimes[i].m_bReported = reported;
+			return false;
+		}
+
+	for(i = 0; i < 16; i++)
+		if(m_aCrimes[i].m_nType == CRIME_NONE)
+			break;
+	if(i < 16){
+		m_aCrimes[i].m_nType = type;
+		m_aCrimes[i].m_nId = id;
+		m_aCrimes[i].m_vecPosn = coors;
+		m_aCrimes[i].m_nTime = CTimer::GetTimeInMilliseconds();
+		m_aCrimes[i].m_bReported = reported;
+		m_aCrimes[i].m_bPoliceDoesntCare = policeDoesntCare;
+	}
+	return false;
+}
+
+void
+CWanted::ReportCrimeNow(eCrimeType type, const CVector &coors, bool policeDoesntCare)
+{
+	float sensitivity, chaos;
+	int wantedLevelDrop;
+
+	if(CDarkel::FrenzyOnGoing())
+		sensitivity = m_fCrimeSensitivity*0.3f;
+	else
+		sensitivity = m_fCrimeSensitivity;
+
+	wantedLevelDrop = Min(CCullZones::GetWantedLevelDrop(), 100);
+
+	chaos = (1.0f - wantedLevelDrop/100.0f) * sensitivity;
+	if (policeDoesntCare)
+		chaos *= 0.333f;
+	switch(type){
+	case CRIME_POSSESSION_GUN:
+		break;
+	case CRIME_HIT_PED:
+		m_nChaos += 5.0f*chaos;
+		break;
+	case CRIME_HIT_COP:
+		m_nChaos += 45.0f*chaos;
+		break;
+	case CRIME_SHOOT_PED:
+		m_nChaos += 30.0f*chaos;
+		break;
+	case CRIME_SHOOT_COP:
+		m_nChaos += 80.0f*chaos;
+		break;
+	case CRIME_STEAL_CAR:
+		m_nChaos += 15.0f*chaos;
+		break;
+	case CRIME_RUN_REDLIGHT:
+		m_nChaos += 10.0f*chaos;
+		break;
+	case CRIME_RECKLESS_DRIVING:
+		m_nChaos += 5.0f*chaos;
+		break;
+	case CRIME_SPEEDING:
+		m_nChaos += 5.0f*chaos;
+		break;
+	case CRIME_RUNOVER_PED:
+		m_nChaos += 18.0f*chaos;
+		break;
+	case CRIME_RUNOVER_COP:
+		m_nChaos += 80.0f*chaos;
+		break;
+	case CRIME_SHOOT_HELI:
+		m_nChaos += 400.0f*chaos;
+		break;
+	case CRIME_PED_BURNED:
+		m_nChaos += 20.0f*chaos;
+		break;
+	case CRIME_COP_BURNED:
+		m_nChaos += 80.0f*chaos;
+		break;
+	case CRIME_VEHICLE_BURNED:
+		m_nChaos += 20.0f*chaos;
+		break;
+	case CRIME_DESTROYED_CESSNA:
+		m_nChaos += 500.0f*chaos;
+		break;
+	case CRIME_EXPLOSION:
+		m_nChaos += 25.0f * chaos;
+		break;
+	case CRIME_HIT_PED_NASTYWEAPON:
+		m_nChaos += 35.0f * chaos;
+		break;
+	case CRIME_HIT_COP_NASTYWEAPON:
+		m_nChaos += 100.0f * chaos;
+		break;
+	default:
+	//	Error("Undefined crime type, RegisterCrime, Crime.cpp");	// different file for some reason
+		Error("Undefined crime type, RegisterCrime, Wanted.cpp");
+	}
+	m_nChaos = Max(m_nChaos, m_nMinChaos);
+	DMAudio.ReportCrime(type, coors);
+	UpdateWantedLevel();
+}
+
+void
+CWanted::UpdateWantedLevel()
+{
+	int32 CurrWantedLevel = m_nWantedLevel;
+
+	if (m_nChaos > nMaximumWantedLevel)
+		m_nChaos = nMaximumWantedLevel;
+
+	if (m_nChaos >= 0 && m_nChaos < 50) {
+		if (m_nWantedLevel == 1)
+			++CStats::WantedStarsEvaded;
+		m_nWantedLevel = 0;
+		m_MaximumLawEnforcerVehicles = 0;
+		m_MaxCops = 0;
+		m_RoadblockDensity = 0;
+	} else if (m_nChaos >= 50 && m_nChaos < 180) {
+		CStats::WantedStarsAttained += 1 - m_nWantedLevel;
+		m_nWantedLevel = 1;
+		m_MaximumLawEnforcerVehicles = 1;
+		m_MaxCops = 1;
+		m_RoadblockDensity = 0;
+	} else if (m_nChaos >= 180 && m_nChaos < 550) {
+		CStats::WantedStarsAttained += 2 - m_nWantedLevel;
+		m_nWantedLevel = 2;
+		m_MaximumLawEnforcerVehicles = 2;
+		m_MaxCops = 3;
+		m_RoadblockDensity = 0;
+	} else if (m_nChaos >= 550 && m_nChaos < 1200) {
+		CStats::WantedStarsAttained += 3 - m_nWantedLevel;
+		m_nWantedLevel = 3;
+		m_MaximumLawEnforcerVehicles = 2;
+		m_MaxCops = 4;
+		m_RoadblockDensity = 12;
+	} else if (m_nChaos >= 1200 && m_nChaos < 2400) {
+		CStats::WantedStarsAttained += 4 - m_nWantedLevel;
+		m_nWantedLevel = 4;
+		m_MaximumLawEnforcerVehicles = 2;
+		m_MaxCops = 6;
+		m_RoadblockDensity = 18;
+	} else if (m_nChaos >= 2400 && m_nChaos < 4800) {
+		CStats::WantedStarsAttained += 5 - m_nWantedLevel;
+		m_nWantedLevel = 5;
+		m_MaximumLawEnforcerVehicles = 3;
+		m_MaxCops = 8;
+		m_RoadblockDensity = 24;
+	} else if (m_nChaos >= 4800) {
+		CStats::WantedStarsAttained += 6 - m_nWantedLevel;
+		m_nWantedLevel = 6;
+		m_MaximumLawEnforcerVehicles = 3;
+		m_MaxCops = 10;
+		m_RoadblockDensity = 30;
+	}
+
+	if (CurrWantedLevel != m_nWantedLevel)
+		m_nLastWantedLevelChange = CTimer::GetTimeInMilliseconds();
+}
+
+int32
+CWanted::WorkOutPolicePresence(CVector posn, float radius)
+{
+	int i;
+	CPed *ped;
+	CVehicle *vehicle;
+	int numPolice = 0;
+
+	i = CPools::GetPedPool()->GetSize();
+	while(--i >= 0){
+		ped = CPools::GetPedPool()->GetSlot(i);
+		if(ped &&
+		   IsPolicePedModel(ped->GetModelIndex()) &&
+		   (posn - ped->GetPosition()).Magnitude() < radius)
+			numPolice++;
+	}
+
+	i = CPools::GetVehiclePool()->GetSize();
+	while(--i >= 0){
+		vehicle = CPools::GetVehiclePool()->GetSlot(i);
+		if(vehicle &&
+		   vehicle->bIsLawEnforcer &&
+		   IsPoliceVehicleModel(vehicle->GetModelIndex()) &&
+		   vehicle != FindPlayerVehicle() &&
+		   vehicle->GetStatus() != STATUS_ABANDONED && vehicle->GetStatus() != STATUS_WRECKED &&
+		   (posn - vehicle->GetPosition()).Magnitude() < radius)
+			numPolice++;
+	}
+
+	return numPolice;
+}
+
+void
+CWanted::Update(void)
+{
+	if (CTimer::GetTimeInMilliseconds() > m_nLastTimeSuspended + 20000) {
+		m_nMinChaos = 0;
+		m_nMinWantedLevel = 0;
+	}
+	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;
+		}
+	}
+}
+
+void
+CWanted::Suspend(void)
+{
+	CStats::WantedStarsEvaded += m_nWantedLevel;
+	m_nMinChaos = m_nChaos;
+	m_nMinWantedLevel = m_nWantedLevel;
+	m_nLastTimeSuspended = CTimer::GetTimeInMilliseconds();
+	m_nChaos = 0;
+	m_nWantedLevel = 0;
+	ResetPolicePursuit();
+}
diff --git a/src/core/Wanted.h b/src/core/Wanted.h
new file mode 100644
index 0000000..f2da23e
--- /dev/null
+++ b/src/core/Wanted.h
@@ -0,0 +1,65 @@
+#pragma once
+
+#include "Crime.h"
+
+class CEntity;
+class CCopPed;
+
+class CWanted
+{
+public:
+	int32 m_nChaos;
+	int32 m_nMinChaos;
+	int32 m_nLastUpdateTime;
+	uint32 m_nLastWantedLevelChange;
+	uint32 m_nLastTimeSuspended;
+	float m_fCrimeSensitivity;
+	uint8 m_CurrentCops;
+	uint8 m_MaxCops;
+	uint8 m_MaximumLawEnforcerVehicles;
+	uint8 m_CopsBeatingSuspect;
+	int16 m_RoadblockDensity;
+	uint8 m_bIgnoredByCops : 1;
+	uint8 m_bIgnoredByEveryone : 1;
+	uint8 m_bSwatRequired : 1;
+	uint8 m_bFbiRequired : 1;
+	uint8 m_bArmyRequired : 1;
+	int32 m_nWantedLevel;
+	int32 m_nMinWantedLevel;
+	CCrimeBeingQd m_aCrimes[16];
+	CCopPed *m_pCops[10];
+
+	static int32 MaximumWantedLevel;
+	static int32 nMaximumWantedLevel;
+
+public:
+	void Initialise();
+	bool AreMiamiViceRequired();
+	bool AreSwatRequired();
+	bool AreFbiRequired();
+	bool AreArmyRequired();
+	int32 NumOfHelisRequired();
+	void SetWantedLevel(int32);
+	void SetWantedLevelNoDrop(int32 level);
+	int32 GetWantedLevel() { return m_nWantedLevel; }
+	void CheatWantedLevel(int32 level);
+	void RegisterCrime(eCrimeType type, const CVector &coors, uint32 id, bool policeDoesntCare);
+	void RegisterCrime_Immediately(eCrimeType type, const CVector &coors, uint32 id, bool policeDoesntCare);
+	void ClearQdCrimes();
+	bool AddCrimeToQ(eCrimeType type, int32 id, const CVector &pos, bool reported, bool policeDoesntCare);
+	void ReportCrimeNow(eCrimeType type, const CVector &coors, bool policeDoesntCare);
+	void UpdateWantedLevel();
+	void Reset();
+	void ResetPolicePursuit();
+	void UpdateCrimesQ();
+	void Update();
+
+	void Suspend();
+
+	bool IsIgnored(void) { return m_bIgnoredByCops || m_bIgnoredByEveryone; }
+
+	static int32 WorkOutPolicePresence(CVector posn, float radius);
+	static void SetMaximumWantedLevel(int32 level);
+};
+
+VALIDATE_SIZE(CWanted, 0x204);
diff --git a/src/core/World.cpp b/src/core/World.cpp
new file mode 100644
index 0000000..2683a28
--- /dev/null
+++ b/src/core/World.cpp
@@ -0,0 +1,2312 @@
+#include "common.h"
+#include "Camera.h"
+#include "CarCtrl.h"
+#include "CopPed.h"
+#include "CutsceneMgr.h"
+#include "DMAudio.h"
+#include "EventList.h"
+#include "Explosion.h"
+#include "Fire.h"
+#include "Garages.h"
+#include "Glass.h"
+#include "Messages.h"
+#include "ModelIndices.h"
+#include "ParticleObject.h"
+#include "Pickups.h"
+#include "Population.h"
+#include "ProjectileInfo.h"
+#include "Record.h"
+#include "References.h"
+#include "Replay.h"
+#include "RpAnimBlend.h"
+#include "Shadows.h"
+#include "TempColModels.h"
+#include "WaterLevel.h"
+#include "World.h"
+
+#define OBJECT_REPOSITION_OFFSET_Z 2.0f
+
+CColPoint gaTempSphereColPoints[MAX_COLLISION_POINTS];
+
+CPtrList CWorld::ms_bigBuildingsList[NUM_LEVELS];
+CPtrList CWorld::ms_listMovingEntityPtrs;
+CSector CWorld::ms_aSectors[NUMSECTORS_Y][NUMSECTORS_X];
+uint16 CWorld::ms_nCurrentScanCode;
+
+uint8 CWorld::PlayerInFocus;
+CPlayerInfo CWorld::Players[NUMPLAYERS];
+bool CWorld::bNoMoreCollisionTorque;
+CEntity *CWorld::pIgnoreEntity;
+bool CWorld::bIncludeDeadPeds;
+bool CWorld::bSecondShift;
+bool CWorld::bForceProcessControl;
+bool CWorld::bProcessCutsceneOnly;
+
+bool CWorld::bDoingCarCollisions;
+bool CWorld::bIncludeCarTyres;
+bool CWorld::bIncludeBikers;
+
+CColPoint CWorld::m_aTempColPts[MAX_COLLISION_POINTS];
+
+void
+CWorld::Initialise()
+{
+	pIgnoreEntity = nil;
+	bDoingCarCollisions = false;
+	bSecondShift = false;
+	bNoMoreCollisionTorque = false;
+	bProcessCutsceneOnly = false;
+	bIncludeDeadPeds = false;
+	bForceProcessControl = false;
+	bIncludeCarTyres = false;
+	bIncludeBikers = false;
+}
+
+void
+CWorld::Add(CEntity *ent)
+{
+	if(ent->IsVehicle() || ent->IsPed()) DMAudio.SetEntityStatus(((CPhysical *)ent)->m_audioEntityId, true);
+
+	if(ent->bIsBIGBuilding)
+		ms_bigBuildingsList[ent->m_level].InsertItem(ent);
+	else
+		ent->Add();
+
+	if(ent->IsBuilding() || ent->IsDummy()) return;
+
+	if(!ent->GetIsStatic()) ((CPhysical *)ent)->AddToMovingList();
+}
+
+void
+CWorld::Remove(CEntity *ent)
+{
+	if(ent->IsVehicle() || ent->IsPed()) DMAudio.SetEntityStatus(((CPhysical *)ent)->m_audioEntityId, false);
+
+	if(ent->bIsBIGBuilding)
+		ms_bigBuildingsList[ent->m_level].RemoveItem(ent);
+	else
+		ent->Remove();
+
+	if(ent->IsBuilding() || ent->IsDummy()) return;
+
+	if(!ent->GetIsStatic()) ((CPhysical *)ent)->RemoveFromMovingList();
+}
+
+void
+CWorld::ClearScanCodes(void)
+{
+	CPtrNode *node;
+	for(int i = 0; i < NUMSECTORS_Y; i++)
+		for(int j = 0; j < NUMSECTORS_X; j++) {
+			CSector *s = &ms_aSectors[i][j];
+			for(node = s->m_lists[ENTITYLIST_BUILDINGS].first; node; node = node->next)
+				((CEntity *)node->item)->m_scanCode = 0;
+			for(node = s->m_lists[ENTITYLIST_VEHICLES].first; node; node = node->next)
+				((CEntity *)node->item)->m_scanCode = 0;
+			for(node = s->m_lists[ENTITYLIST_PEDS].first; node; node = node->next)
+				((CEntity *)node->item)->m_scanCode = 0;
+			for(node = s->m_lists[ENTITYLIST_OBJECTS].first; node; node = node->next)
+				((CEntity *)node->item)->m_scanCode = 0;
+			for(node = s->m_lists[ENTITYLIST_DUMMIES].first; node; node = node->next)
+				((CEntity *)node->item)->m_scanCode = 0;
+		}
+}
+
+void
+CWorld::ClearExcitingStuffFromArea(const CVector &pos, float radius, bool bRemoveProjectilesAndTidyUpShadows)
+{
+	CPedPool *pedPool = CPools::GetPedPool();
+	for(int32 i = 0; i < pedPool->GetSize(); i++) {
+		CPed *pPed = pedPool->GetSlot(i);
+		if(pPed && !pPed->IsPlayer() && pPed->CanBeDeleted() &&
+		   CVector2D(pPed->GetPosition() - pos).MagnitudeSqr() < SQR(radius)) {
+			CPopulation::RemovePed(pPed);
+		}
+	}
+	CVehiclePool *VehiclePool = CPools::GetVehiclePool();
+	for(int32 i = 0; i < VehiclePool->GetSize(); i++) {
+		CVehicle *pVehicle = VehiclePool->GetSlot(i);
+		if(pVehicle && CVector2D(pVehicle->GetPosition() - pos).MagnitudeSqr() < SQR(radius) &&
+		   !pVehicle->bIsLocked && pVehicle->CanBeDeleted()) {
+			if(pVehicle->pDriver) {
+				CPopulation::RemovePed(pVehicle->pDriver);
+				pVehicle->pDriver = nil;
+			}
+			for(int32 j = 0; j < pVehicle->m_nNumMaxPassengers; ++j) {
+				if(pVehicle->pPassengers[j]) {
+					CPopulation::RemovePed(pVehicle->pPassengers[j]);
+					pVehicle->pPassengers[j] = nil;
+					--pVehicle->m_nNumPassengers;
+				}
+			}
+			CCarCtrl::RemoveFromInterestingVehicleList(pVehicle);
+			Remove(pVehicle);
+			delete pVehicle;
+		}
+	}
+	CObject::DeleteAllTempObjectsInArea(pos, radius);
+	gFireManager.ExtinguishPoint(pos, radius);
+	ExtinguishAllCarFiresInArea(pos, radius);
+	CExplosion::RemoveAllExplosionsInArea(pos, radius);
+	if(bRemoveProjectilesAndTidyUpShadows) {
+		CProjectileInfo::RemoveAllProjectiles();
+		CShadows::TidyUpShadows();
+	}
+	CPickups::RemoveUnnecessaryPickups(pos, radius);
+}
+
+bool
+CWorld::CameraToIgnoreThisObject(CEntity *ent)
+{
+	if(CGarages::IsModelIndexADoor(ent->GetModelIndex())) return false;
+	return ((CObject *)ent)->m_bCameraToAvoidThisObject != 1;
+}
+
+bool
+CWorld::ProcessLineOfSight(const CVector &point1, const CVector &point2, CColPoint &point, CEntity *&entity,
+                           bool checkBuildings, bool checkVehicles, bool checkPeds, bool checkObjects,
+                           bool checkDummies, bool ignoreSeeThrough, bool ignoreSomeObjects, bool ignoreShootThrough)
+{
+	int x, xstart, xend;
+	int y, ystart, yend;
+	int y1, y2;
+	float dist;
+
+	AdvanceCurrentScanCode();
+
+	entity = nil;
+	dist = 1.0f;
+
+	xstart = GetSectorIndexX(point1.x);
+	ystart = GetSectorIndexY(point1.y);
+	xend = GetSectorIndexX(point2.x);
+	yend = GetSectorIndexY(point2.y);
+
+#define LOSARGS                                                                                                        \
+	CColLine(point1, point2), point, dist, entity, checkBuildings, checkVehicles, checkPeds, checkObjects,         \
+	    checkDummies, ignoreSeeThrough, ignoreSomeObjects, ignoreShootThrough
+
+	if(xstart == xend && ystart == yend) {
+		// Only one sector
+		return ProcessLineOfSightSector(*GetSector(xstart, ystart), LOSARGS);
+	} else if(xstart == xend) {
+		// Only step in y
+		if(ystart < yend)
+			for(y = ystart; y <= yend; y++) ProcessLineOfSightSector(*GetSector(xstart, y), LOSARGS);
+		else
+			for(y = ystart; y >= yend; y--) ProcessLineOfSightSector(*GetSector(xstart, y), LOSARGS);
+		return dist < 1.0f;
+	} else if(ystart == yend) {
+		// Only step in x
+		if(xstart < xend)
+			for(x = xstart; x <= xend; x++) ProcessLineOfSightSector(*GetSector(x, ystart), LOSARGS);
+		else
+			for(x = xstart; x >= xend; x--) ProcessLineOfSightSector(*GetSector(x, ystart), LOSARGS);
+		return dist < 1.0f;
+	} else {
+		if(point1.x < point2.x) {
+			// Step from left to right
+			float m = (point2.y - point1.y) / (point2.x - point1.x);
+
+			y1 = ystart;
+			y2 = GetSectorIndexY((GetWorldX(xstart + 1) - point1.x) * m + point1.y);
+			if(y1 < y2)
+				for(y = y1; y <= y2; y++) ProcessLineOfSightSector(*GetSector(xstart, y), LOSARGS);
+			else
+				for(y = y1; y >= y2; y--) ProcessLineOfSightSector(*GetSector(xstart, y), LOSARGS);
+
+			for(x = xstart + 1; x < xend; x++) {
+				y1 = y2;
+				y2 = GetSectorIndexY((GetWorldX(x + 1) - point1.x) * m + point1.y);
+				if(y1 < y2)
+					for(y = y1; y <= y2; y++) ProcessLineOfSightSector(*GetSector(x, y), LOSARGS);
+				else
+					for(y = y1; y >= y2; y--) ProcessLineOfSightSector(*GetSector(x, y), LOSARGS);
+			}
+
+			y1 = y2;
+			y2 = yend;
+			if(y1 < y2)
+				for(y = y1; y <= y2; y++) ProcessLineOfSightSector(*GetSector(xend, y), LOSARGS);
+			else
+				for(y = y1; y >= y2; y--) ProcessLineOfSightSector(*GetSector(xend, y), LOSARGS);
+		} else {
+			// Step from right to left
+			float m = (point2.y - point1.y) / (point2.x - point1.x);
+
+			y1 = ystart;
+			y2 = GetSectorIndexY((GetWorldX(xstart) - point1.x) * m + point1.y);
+			if(y1 < y2)
+				for(y = y1; y <= y2; y++) ProcessLineOfSightSector(*GetSector(xstart, y), LOSARGS);
+			else
+				for(y = y1; y >= y2; y--) ProcessLineOfSightSector(*GetSector(xstart, y), LOSARGS);
+
+			for(x = xstart - 1; x > xend; x--) {
+				y1 = y2;
+				y2 = GetSectorIndexY((GetWorldX(x) - point1.x) * m + point1.y);
+				if(y1 < y2)
+					for(y = y1; y <= y2; y++) ProcessLineOfSightSector(*GetSector(x, y), LOSARGS);
+				else
+					for(y = y1; y >= y2; y--) ProcessLineOfSightSector(*GetSector(x, y), LOSARGS);
+			}
+
+			y1 = y2;
+			y2 = yend;
+			if(y1 < y2)
+				for(y = y1; y <= y2; y++) ProcessLineOfSightSector(*GetSector(xend, y), LOSARGS);
+			else
+				for(y = y1; y >= y2; y--) ProcessLineOfSightSector(*GetSector(xend, y), LOSARGS);
+		}
+		return dist < 1.0f;
+	}
+
+#undef LOSARGS
+}
+
+bool
+CWorld::ProcessLineOfSightSector(CSector &sector, const CColLine &line, CColPoint &point, float &dist, CEntity *&entity,
+                                 bool checkBuildings, bool checkVehicles, bool checkPeds, bool checkObjects,
+                                 bool checkDummies, bool ignoreSeeThrough, bool ignoreSomeObjects, bool ignoreShootThrough)
+{
+	float mindist = dist;
+	bool deadPeds = !!bIncludeDeadPeds;
+	bool bikers = !!bIncludeBikers;
+	bIncludeDeadPeds = false;
+	bIncludeBikers = false;
+
+	if(checkBuildings) {
+		ProcessLineOfSightSectorList(sector.m_lists[ENTITYLIST_BUILDINGS], line, point, mindist, entity,
+		                             ignoreSeeThrough, false, ignoreShootThrough);
+		ProcessLineOfSightSectorList(sector.m_lists[ENTITYLIST_BUILDINGS_OVERLAP], line, point, mindist, entity,
+		                             ignoreSeeThrough, false, ignoreShootThrough);
+	}
+
+	if(checkVehicles) {
+		ProcessLineOfSightSectorList(sector.m_lists[ENTITYLIST_VEHICLES], line, point, mindist, entity,
+		                             ignoreSeeThrough, false, ignoreShootThrough);
+		ProcessLineOfSightSectorList(sector.m_lists[ENTITYLIST_VEHICLES_OVERLAP], line, point, mindist, entity,
+		                             ignoreSeeThrough, false, ignoreShootThrough);
+	}
+
+	if(checkPeds) {
+		if(deadPeds) bIncludeDeadPeds = true;
+		if(bikers) bIncludeBikers = true;
+		ProcessLineOfSightSectorList(sector.m_lists[ENTITYLIST_PEDS], line, point, mindist, entity,
+		                             ignoreSeeThrough, false, ignoreShootThrough);
+		ProcessLineOfSightSectorList(sector.m_lists[ENTITYLIST_PEDS_OVERLAP], line, point, mindist, entity,
+		                             ignoreSeeThrough, false, ignoreShootThrough);
+		bIncludeDeadPeds = false;
+		bIncludeBikers = false;
+	}
+
+	if(checkObjects) {
+		ProcessLineOfSightSectorList(sector.m_lists[ENTITYLIST_OBJECTS], line, point, mindist, entity,
+		                             ignoreSeeThrough, ignoreSomeObjects, ignoreShootThrough);
+		ProcessLineOfSightSectorList(sector.m_lists[ENTITYLIST_OBJECTS_OVERLAP], line, point, mindist, entity,
+		                             ignoreSeeThrough, ignoreSomeObjects, ignoreShootThrough);
+	}
+
+	if(checkDummies) {
+		ProcessLineOfSightSectorList(sector.m_lists[ENTITYLIST_DUMMIES], line, point, mindist, entity,
+		                             ignoreSeeThrough, false, ignoreShootThrough);
+		ProcessLineOfSightSectorList(sector.m_lists[ENTITYLIST_DUMMIES_OVERLAP], line, point, mindist, entity,
+		                             ignoreSeeThrough, false, ignoreShootThrough);
+	}
+
+	bIncludeDeadPeds = deadPeds;
+	bIncludeBikers = bikers;
+
+	if(mindist < dist) {
+		dist = mindist;
+		return true;
+	} else
+		return false;
+}
+
+bool
+CWorld::ProcessLineOfSightSectorList(CPtrList &list, const CColLine &line, CColPoint &point, float &dist,
+                                     CEntity *&entity, bool ignoreSeeThrough, bool ignoreSomeObjects, bool ignoreShootThrough)
+{
+	bool deadPeds = false;
+	bool bikers = false;
+	bool carTyres = false;
+	float mindist = dist;
+	CPtrNode *node;
+	CEntity *e;
+	CColModel *colmodel;
+	CColModel tyreCol;
+	CColSphere tyreSpheres[6];
+	CColPoint tyreColPoint;
+	float tyreDist;
+
+	if(bIncludeCarTyres && list.first && ((CEntity*)list.first->item)->IsVehicle()){
+		carTyres = true;
+		tyreCol.numTriangles = 0;
+		tyreCol.numBoxes = 0;
+		tyreCol.numLines = 0;
+		tyreCol.spheres = tyreSpheres;
+		tyreCol.numSpheres = ARRAY_SIZE(tyreSpheres);
+	}
+	if(list.first && bIncludeDeadPeds && ((CEntity *)list.first->item)->IsPed()) deadPeds = true;
+	if(list.first && bIncludeBikers && ((CEntity *)list.first->item)->IsPed()) bikers = true;
+
+	for(node = list.first; node; node = node->next) {
+		e = (CEntity *)node->item;
+		if(e->m_scanCode != GetCurrentScanCode() && e != pIgnoreEntity && (e->bUsesCollision || deadPeds || bikers) &&
+		   !(ignoreSomeObjects && CameraToIgnoreThisObject(e))) {
+			colmodel = nil;
+			tyreDist = mindist;
+			e->m_scanCode = GetCurrentScanCode();
+
+			if(e->IsPed()) {
+				if(e->bUsesCollision || deadPeds && ((CPed *)e)->m_nPedState == PED_DEAD || bikers && ((CPed*)e)->InVehicle() && (((CPed*)e)->m_pMyVehicle->IsBike() || ((CPed*)e)->m_pMyVehicle->IsBoat())) {
+					colmodel = ((CPedModelInfo *)CModelInfo::GetModelInfo(e->GetModelIndex()))->AnimatePedColModelSkinned(e->GetClump());
+				} else
+					colmodel = nil;
+
+			} else if(e->bUsesCollision)
+				colmodel = CModelInfo::GetModelInfo(e->GetModelIndex())->GetColModel();
+
+			if(colmodel && CCollision::ProcessLineOfSight(line, e->GetMatrix(), *colmodel, point, mindist,
+			                                              ignoreSeeThrough, ignoreShootThrough))
+				entity = e;
+			if(carTyres && ((CVehicle*)e)->SetUpWheelColModel(&tyreCol) && CCollision::ProcessLineOfSight(line, e->GetMatrix(), tyreCol, tyreColPoint, tyreDist, false, ignoreShootThrough)){
+				float dp1 = DotProduct(line.p1 - line.p0, e->GetRight());
+				float dp2 = DotProduct(point.point - e->GetPosition(), e->GetRight());
+				if(tyreDist < mindist || dp1 < -0.85f && dp2 > 0.0f || dp1 > 0.85f && dp2 < 0.0f){
+					mindist = tyreDist;
+					point = tyreColPoint;
+					entity = e;
+				}
+			}
+		}
+	}
+	tyreCol.spheres = nil;
+
+	if(mindist < dist) {
+		dist = mindist;
+		return true;
+	} else
+		return false;
+}
+
+bool
+CWorld::ProcessVerticalLine(const CVector &point1, float z2, CColPoint &point, CEntity *&entity, bool checkBuildings,
+                            bool checkVehicles, bool checkPeds, bool checkObjects, bool checkDummies,
+                            bool ignoreSeeThrough, CStoredCollPoly *poly)
+{
+	AdvanceCurrentScanCode();
+	CVector point2(point1.x, point1.y, z2);
+	int secX = GetSectorIndexX(point1.x);
+	int secY = GetSectorIndexY(point1.y);
+	secX = clamp(secX, 0, NUMSECTORS_X-1);
+	secY = clamp(secY, 0, NUMSECTORS_Y-1);
+	return ProcessVerticalLineSector(*GetSector(secX, secY),
+	                                 CColLine(point1, point2), point, entity, checkBuildings, checkVehicles,
+	                                 checkPeds, checkObjects, checkDummies, ignoreSeeThrough, poly);
+}
+
+bool
+CWorld::ProcessVerticalLineSector(CSector &sector, const CColLine &line, CColPoint &point, CEntity *&entity,
+                                  bool checkBuildings, bool checkVehicles, bool checkPeds, bool checkObjects,
+                                  bool checkDummies, bool ignoreSeeThrough, CStoredCollPoly *poly)
+{
+	float mindist = 1.0f;
+
+	if(checkBuildings) {
+		ProcessVerticalLineSectorList(sector.m_lists[ENTITYLIST_BUILDINGS], line, point, mindist, entity,
+		                              ignoreSeeThrough, poly);
+		ProcessVerticalLineSectorList(sector.m_lists[ENTITYLIST_BUILDINGS_OVERLAP], line, point, mindist,
+		                              entity, ignoreSeeThrough, poly);
+	}
+
+	if(checkVehicles) {
+		ProcessVerticalLineSectorList(sector.m_lists[ENTITYLIST_VEHICLES], line, point, mindist, entity,
+		                              ignoreSeeThrough, poly);
+		ProcessVerticalLineSectorList(sector.m_lists[ENTITYLIST_VEHICLES_OVERLAP], line, point, mindist, entity,
+		                              ignoreSeeThrough, poly);
+	}
+
+	if(checkPeds) {
+		ProcessVerticalLineSectorList(sector.m_lists[ENTITYLIST_PEDS], line, point, mindist, entity,
+		                              ignoreSeeThrough, poly);
+		ProcessVerticalLineSectorList(sector.m_lists[ENTITYLIST_PEDS_OVERLAP], line, point, mindist, entity,
+		                              ignoreSeeThrough, poly);
+	}
+
+	if(checkObjects) {
+		ProcessVerticalLineSectorList(sector.m_lists[ENTITYLIST_OBJECTS], line, point, mindist, entity,
+		                              ignoreSeeThrough, poly);
+		ProcessVerticalLineSectorList(sector.m_lists[ENTITYLIST_OBJECTS_OVERLAP], line, point, mindist, entity,
+		                              ignoreSeeThrough, poly);
+	}
+
+	if(checkDummies) {
+		ProcessVerticalLineSectorList(sector.m_lists[ENTITYLIST_DUMMIES], line, point, mindist, entity,
+		                              ignoreSeeThrough, poly);
+		ProcessVerticalLineSectorList(sector.m_lists[ENTITYLIST_DUMMIES_OVERLAP], line, point, mindist, entity,
+		                              ignoreSeeThrough, poly);
+	}
+
+	return mindist < 1.0f;
+}
+
+bool
+CWorld::ProcessVerticalLineSectorList(CPtrList &list, const CColLine &line, CColPoint &point, float &dist,
+                                      CEntity *&entity, bool ignoreSeeThrough, CStoredCollPoly *poly)
+{
+	float mindist = dist;
+	CPtrNode *node;
+	CEntity *e;
+	CColModel *colmodel;
+
+	for(node = list.first; node; node = node->next) {
+		e = (CEntity *)node->item;
+		if(e->m_scanCode != GetCurrentScanCode() && e->bUsesCollision) {
+			e->m_scanCode = GetCurrentScanCode();
+
+			colmodel = CModelInfo::GetModelInfo(e->GetModelIndex())->GetColModel();
+			if(CCollision::ProcessVerticalLine(line, e->GetMatrix(), *colmodel, point, mindist,
+			                                   ignoreSeeThrough, false, poly))
+				entity = e;
+		}
+	}
+
+	if(mindist < dist) {
+		dist = mindist;
+		return true;
+	} else
+		return false;
+}
+
+bool
+CWorld::GetIsLineOfSightClear(const CVector &point1, const CVector &point2, bool checkBuildings, bool checkVehicles,
+                              bool checkPeds, bool checkObjects, bool checkDummies, bool ignoreSeeThrough,
+                              bool ignoreSomeObjects)
+{
+	int x, xstart, xend;
+	int y, ystart, yend;
+	int y1, y2;
+
+	AdvanceCurrentScanCode();
+
+	xstart = GetSectorIndexX(point1.x);
+	ystart = GetSectorIndexY(point1.y);
+	xend = GetSectorIndexX(point2.x);
+	yend = GetSectorIndexY(point2.y);
+
+#define LOSARGS                                                                                                        \
+	CColLine(point1, point2), checkBuildings, checkVehicles, checkPeds, checkObjects, checkDummies,                \
+	    ignoreSeeThrough, ignoreSomeObjects
+
+	if(xstart == xend && ystart == yend) {
+		// Only one sector
+		return GetIsLineOfSightSectorClear(*GetSector(xstart, ystart), LOSARGS);
+	} else if(xstart == xend) {
+		// Only step in y
+		if(ystart < yend) {
+			for(y = ystart; y <= yend; y++)
+				if(!GetIsLineOfSightSectorClear(*GetSector(xstart, y), LOSARGS)) return false;
+		} else {
+			for(y = ystart; y >= yend; y--)
+				if(!GetIsLineOfSightSectorClear(*GetSector(xstart, y), LOSARGS)) return false;
+		}
+	} else if(ystart == yend) {
+		// Only step in x
+		if(xstart < xend) {
+			for(x = xstart; x <= xend; x++)
+				if(!GetIsLineOfSightSectorClear(*GetSector(x, ystart), LOSARGS)) return false;
+		} else {
+			for(x = xstart; x >= xend; x--)
+				if(!GetIsLineOfSightSectorClear(*GetSector(x, ystart), LOSARGS)) return false;
+		}
+	} else {
+		if(point1.x < point2.x) {
+			// Step from left to right
+			float m = (point2.y - point1.y) / (point2.x - point1.x);
+
+			y1 = ystart;
+			y2 = GetSectorIndexY((GetWorldX(xstart + 1) - point1.x) * m + point1.y);
+			if(y1 < y2) {
+				for(y = y1; y <= y2; y++)
+					if(!GetIsLineOfSightSectorClear(*GetSector(xstart, y), LOSARGS)) return false;
+			} else {
+				for(y = y1; y >= y2; y--)
+					if(!GetIsLineOfSightSectorClear(*GetSector(xstart, y), LOSARGS)) return false;
+			}
+
+			for(x = xstart + 1; x < xend; x++) {
+				y1 = y2;
+				y2 = GetSectorIndexY((GetWorldX(x + 1) - point1.x) * m + point1.y);
+				if(y1 < y2) {
+					for(y = y1; y <= y2; y++)
+						if(!GetIsLineOfSightSectorClear(*GetSector(x, y), LOSARGS))
+							return false;
+				} else {
+					for(y = y1; y >= y2; y--)
+						if(!GetIsLineOfSightSectorClear(*GetSector(x, y), LOSARGS))
+							return false;
+				}
+			}
+
+			y1 = y2;
+			y2 = yend;
+			if(y1 < y2) {
+				for(y = y1; y <= y2; y++)
+					if(!GetIsLineOfSightSectorClear(*GetSector(xend, y), LOSARGS)) return false;
+			} else {
+				for(y = y1; y >= y2; y--)
+					if(!GetIsLineOfSightSectorClear(*GetSector(xend, y), LOSARGS)) return false;
+			}
+		} else {
+			// Step from right to left
+			float m = (point2.y - point1.y) / (point2.x - point1.x);
+
+			y1 = ystart;
+			y2 = GetSectorIndexY((GetWorldX(xstart) - point1.x) * m + point1.y);
+			if(y1 < y2) {
+				for(y = y1; y <= y2; y++)
+					if(!GetIsLineOfSightSectorClear(*GetSector(xstart, y), LOSARGS)) return false;
+			} else {
+				for(y = y1; y >= y2; y--)
+					if(!GetIsLineOfSightSectorClear(*GetSector(xstart, y), LOSARGS)) return false;
+			}
+
+			for(x = xstart - 1; x > xend; x--) {
+				y1 = y2;
+				y2 = GetSectorIndexY((GetWorldX(x) - point1.x) * m + point1.y);
+				if(y1 < y2) {
+					for(y = y1; y <= y2; y++)
+						if(!GetIsLineOfSightSectorClear(*GetSector(x, y), LOSARGS))
+							return false;
+				} else {
+					for(y = y1; y >= y2; y--)
+						if(!GetIsLineOfSightSectorClear(*GetSector(x, y), LOSARGS))
+							return false;
+				}
+			}
+
+			y1 = y2;
+			y2 = yend;
+			if(y1 < y2) {
+				for(y = y1; y <= y2; y++)
+					if(!GetIsLineOfSightSectorClear(*GetSector(xend, y), LOSARGS)) return false;
+			} else {
+				for(y = y1; y >= y2; y--)
+					if(!GetIsLineOfSightSectorClear(*GetSector(xend, y), LOSARGS)) return false;
+			}
+		}
+	}
+
+	return true;
+
+#undef LOSARGS
+}
+
+bool
+CWorld::GetIsLineOfSightSectorClear(CSector &sector, const CColLine &line, bool checkBuildings, bool checkVehicles,
+                                    bool checkPeds, bool checkObjects, bool checkDummies, bool ignoreSeeThrough,
+                                    bool ignoreSomeObjects)
+{
+	if(checkBuildings) {
+		if(!GetIsLineOfSightSectorListClear(sector.m_lists[ENTITYLIST_BUILDINGS], line, ignoreSeeThrough))
+			return false;
+		if(!GetIsLineOfSightSectorListClear(sector.m_lists[ENTITYLIST_BUILDINGS_OVERLAP], line,
+		                                    ignoreSeeThrough))
+			return false;
+	}
+
+	if(checkVehicles) {
+		if(!GetIsLineOfSightSectorListClear(sector.m_lists[ENTITYLIST_VEHICLES], line, ignoreSeeThrough))
+			return false;
+		if(!GetIsLineOfSightSectorListClear(sector.m_lists[ENTITYLIST_VEHICLES_OVERLAP], line,
+		                                    ignoreSeeThrough))
+			return false;
+	}
+
+	if(checkPeds) {
+		if(!GetIsLineOfSightSectorListClear(sector.m_lists[ENTITYLIST_PEDS], line, ignoreSeeThrough))
+			return false;
+		if(!GetIsLineOfSightSectorListClear(sector.m_lists[ENTITYLIST_PEDS_OVERLAP], line, ignoreSeeThrough))
+			return false;
+	}
+
+	if(checkObjects) {
+		if(!GetIsLineOfSightSectorListClear(sector.m_lists[ENTITYLIST_OBJECTS], line, ignoreSeeThrough,
+		                                    ignoreSomeObjects))
+			return false;
+		if(!GetIsLineOfSightSectorListClear(sector.m_lists[ENTITYLIST_OBJECTS_OVERLAP], line, ignoreSeeThrough,
+		                                    ignoreSomeObjects))
+			return false;
+	}
+
+	if(checkDummies) {
+		if(!GetIsLineOfSightSectorListClear(sector.m_lists[ENTITYLIST_DUMMIES], line, ignoreSeeThrough))
+			return false;
+		if(!GetIsLineOfSightSectorListClear(sector.m_lists[ENTITYLIST_DUMMIES_OVERLAP], line, ignoreSeeThrough))
+			return false;
+	}
+
+	return true;
+}
+
+bool
+CWorld::GetIsLineOfSightSectorListClear(CPtrList &list, const CColLine &line, bool ignoreSeeThrough,
+                                        bool ignoreSomeObjects)
+{
+	CPtrNode *node;
+	CEntity *e;
+	CColModel *colmodel;
+
+	for(node = list.first; node; node = node->next) {
+		e = (CEntity *)node->item;
+		if(e->m_scanCode != GetCurrentScanCode() && e->bUsesCollision) {
+
+			e->m_scanCode = GetCurrentScanCode();
+
+			if(e != pIgnoreEntity && !(ignoreSomeObjects && CameraToIgnoreThisObject(e))) {
+
+				colmodel = CModelInfo::GetModelInfo(e->GetModelIndex())->GetColModel();
+
+				if(CCollision::TestLineOfSight(line, e->GetMatrix(), *colmodel, ignoreSeeThrough, false))
+					return false;
+			}
+		}
+	}
+
+	return true;
+}
+
+void
+CWorld::FindObjectsInRangeSectorList(CPtrList &list, Const CVector &centre, float radius, bool ignoreZ, int16 *numObjects,
+                                     int16 lastObject, CEntity **objects)
+{
+	float radiusSqr = radius * radius;
+	float objDistSqr;
+
+	for(CPtrNode *node = list.first; node; node = node->next) {
+		CEntity *object = (CEntity *)node->item;
+		if(object->m_scanCode != GetCurrentScanCode()) {
+			object->m_scanCode = GetCurrentScanCode();
+
+			CVector diff = centre - object->GetPosition();
+			if(ignoreZ)
+				objDistSqr = diff.MagnitudeSqr2D();
+			else
+				objDistSqr = diff.MagnitudeSqr();
+
+			if(objDistSqr < radiusSqr && *numObjects < lastObject) {
+				if(objects) { objects[*numObjects] = object; }
+				(*numObjects)++;
+			}
+		}
+	}
+}
+
+void
+CWorld::FindObjectsInRange(Const CVector &centre, float radius, bool ignoreZ, int16 *numObjects, int16 lastObject,
+                           CEntity **objects, bool checkBuildings, bool checkVehicles, bool checkPeds,
+                           bool checkObjects, bool checkDummies)
+{
+	int minX = GetSectorIndexX(centre.x - radius);
+	if(minX <= 0) minX = 0;
+
+	int minY = GetSectorIndexY(centre.y - radius);
+	if(minY <= 0) minY = 0;
+
+	int maxX = GetSectorIndexX(centre.x + radius);
+	if(maxX >= NUMSECTORS_X) maxX = NUMSECTORS_X - 1;
+
+	int maxY = GetSectorIndexY(centre.y + radius);
+	if(maxY >= NUMSECTORS_Y) maxY = NUMSECTORS_Y - 1;
+
+	AdvanceCurrentScanCode();
+
+	*numObjects = 0;
+	for(int curY = minY; curY <= maxY; curY++) {
+		for(int curX = minX; curX <= maxX; curX++) {
+			CSector *sector = GetSector(curX, curY);
+			if(checkBuildings) {
+				FindObjectsInRangeSectorList(sector->m_lists[ENTITYLIST_BUILDINGS], centre, radius,
+				                             ignoreZ, numObjects, lastObject, objects);
+				FindObjectsInRangeSectorList(sector->m_lists[ENTITYLIST_BUILDINGS_OVERLAP], centre,
+				                             radius, ignoreZ, numObjects, lastObject, objects);
+			}
+			if(checkVehicles) {
+				FindObjectsInRangeSectorList(sector->m_lists[ENTITYLIST_VEHICLES], centre, radius,
+				                             ignoreZ, numObjects, lastObject, objects);
+				FindObjectsInRangeSectorList(sector->m_lists[ENTITYLIST_VEHICLES_OVERLAP], centre,
+				                             radius, ignoreZ, numObjects, lastObject, objects);
+			}
+			if(checkPeds) {
+				FindObjectsInRangeSectorList(sector->m_lists[ENTITYLIST_PEDS], centre, radius, ignoreZ,
+				                             numObjects, lastObject, objects);
+				FindObjectsInRangeSectorList(sector->m_lists[ENTITYLIST_PEDS_OVERLAP], centre, radius,
+				                             ignoreZ, numObjects, lastObject, objects);
+			}
+			if(checkObjects) {
+				FindObjectsInRangeSectorList(sector->m_lists[ENTITYLIST_OBJECTS], centre, radius,
+				                             ignoreZ, numObjects, lastObject, objects);
+				FindObjectsInRangeSectorList(sector->m_lists[ENTITYLIST_OBJECTS_OVERLAP], centre,
+				                             radius, ignoreZ, numObjects, lastObject, objects);
+			}
+			if(checkDummies) {
+				FindObjectsInRangeSectorList(sector->m_lists[ENTITYLIST_DUMMIES], centre, radius,
+				                             ignoreZ, numObjects, lastObject, objects);
+				FindObjectsInRangeSectorList(sector->m_lists[ENTITYLIST_DUMMIES_OVERLAP], centre,
+				                             radius, ignoreZ, numObjects, lastObject, objects);
+			}
+		}
+	}
+}
+
+void
+CWorld::FindObjectsOfTypeInRangeSectorList(uint32 modelId, CPtrList &list, const CVector &position, float radius,
+                                           bool bCheck2DOnly, int16 *nEntitiesFound, int16 maxEntitiesToFind,
+                                           CEntity **aEntities)
+{
+	for(CPtrNode *pNode = list.first; pNode; pNode = pNode->next) {
+		CEntity *pEntity = (CEntity *)pNode->item;
+		if(pEntity->m_scanCode != GetCurrentScanCode()) {
+			pEntity->m_scanCode = GetCurrentScanCode();
+			if (modelId == pEntity->GetModelIndex()) {
+				float fMagnitude = 0.0f;
+				if(bCheck2DOnly)
+					fMagnitude = (position - pEntity->GetPosition()).MagnitudeSqr2D();
+				else
+					fMagnitude = (position - pEntity->GetPosition()).MagnitudeSqr();
+				if(fMagnitude < radius * radius && *nEntitiesFound < maxEntitiesToFind) {
+					if(aEntities) aEntities[*nEntitiesFound] = pEntity;
+					++*nEntitiesFound;
+				}
+			}
+		}
+	}
+}
+
+void
+CWorld::FindObjectsOfTypeInRange(uint32 modelId, const CVector &position, float radius, bool bCheck2DOnly,
+                                 int16 *nEntitiesFound, int16 maxEntitiesToFind, CEntity **aEntities, bool bBuildings,
+                                 bool bVehicles, bool bPeds, bool bObjects, bool bDummies)
+{
+	AdvanceCurrentScanCode();
+	*nEntitiesFound = 0;
+	const CVector2D vecSectorStartPos(position.x - radius, position.y - radius);
+	const CVector2D vecSectorEndPos(position.x + radius, position.y + radius);
+	const int32 nStartX = Max(GetSectorIndexX(vecSectorStartPos.x), 0);
+	const int32 nStartY = Max(GetSectorIndexY(vecSectorStartPos.y), 0);
+#ifdef FIX_BUGS
+	const int32 nEndX = Min(GetSectorIndexX(vecSectorEndPos.x), NUMSECTORS_X - 1);
+	const int32 nEndY = Min(GetSectorIndexY(vecSectorEndPos.y), NUMSECTORS_Y - 1);
+#else
+	const int32 nEndX = Min(GetSectorIndexX(vecSectorEndPos.x), NUMSECTORS_X);
+	const int32 nEndY = Min(GetSectorIndexY(vecSectorEndPos.y), NUMSECTORS_Y);
+#endif
+	for(int32 y = nStartY; y <= nEndY; y++) {
+		for(int32 x = nStartX; x <= nEndX; x++) {
+			CSector *pSector = GetSector(x, y);
+			if(bBuildings) {
+				FindObjectsOfTypeInRangeSectorList(
+				    modelId, pSector->m_lists[ENTITYLIST_BUILDINGS], position, radius, bCheck2DOnly,
+				    nEntitiesFound, maxEntitiesToFind, aEntities);
+				FindObjectsOfTypeInRangeSectorList(
+				    modelId, pSector->m_lists[ENTITYLIST_BUILDINGS_OVERLAP], position, radius,
+				    bCheck2DOnly, nEntitiesFound, maxEntitiesToFind, aEntities);
+			}
+			if(bVehicles) {
+				FindObjectsOfTypeInRangeSectorList(
+				    modelId, pSector->m_lists[ENTITYLIST_VEHICLES], position, radius, bCheck2DOnly,
+				    nEntitiesFound, maxEntitiesToFind, aEntities);
+				FindObjectsOfTypeInRangeSectorList(
+				    modelId, pSector->m_lists[ENTITYLIST_VEHICLES_OVERLAP], position, radius,
+				    bCheck2DOnly, nEntitiesFound, maxEntitiesToFind, aEntities);
+			}
+			if(bPeds) {
+				FindObjectsOfTypeInRangeSectorList(
+				    modelId, pSector->m_lists[ENTITYLIST_PEDS], position, radius, bCheck2DOnly,
+				    nEntitiesFound, maxEntitiesToFind, aEntities);
+				FindObjectsOfTypeInRangeSectorList(
+				    modelId, pSector->m_lists[ENTITYLIST_PEDS_OVERLAP], position, radius, bCheck2DOnly,
+				    nEntitiesFound, maxEntitiesToFind, aEntities);
+			}
+			if(bObjects) {
+				FindObjectsOfTypeInRangeSectorList(
+				    modelId, pSector->m_lists[ENTITYLIST_OBJECTS], position, radius, bCheck2DOnly,
+				    nEntitiesFound, maxEntitiesToFind, aEntities);
+				FindObjectsOfTypeInRangeSectorList(
+				    modelId, pSector->m_lists[ENTITYLIST_OBJECTS_OVERLAP], position, radius,
+				    bCheck2DOnly, nEntitiesFound, maxEntitiesToFind, aEntities);
+			}
+			if(bDummies) {
+				FindObjectsOfTypeInRangeSectorList(
+				    modelId, pSector->m_lists[ENTITYLIST_DUMMIES], position, radius, bCheck2DOnly,
+				    nEntitiesFound, maxEntitiesToFind, aEntities);
+				FindObjectsOfTypeInRangeSectorList(
+				    modelId, pSector->m_lists[ENTITYLIST_DUMMIES_OVERLAP], position, radius,
+				    bCheck2DOnly, nEntitiesFound, maxEntitiesToFind, aEntities);
+			}
+		}
+	}
+}
+
+CEntity *
+CWorld::TestSphereAgainstWorld(CVector centre, float radius, CEntity *entityToIgnore, bool checkBuildings,
+                               bool checkVehicles, bool checkPeds, bool checkObjects, bool checkDummies,
+                               bool ignoreSomeObjects)
+{
+	CEntity *foundE = nil;
+
+	int minX = GetSectorIndexX(centre.x - radius);
+	if(minX <= 0) minX = 0;
+
+	int minY = GetSectorIndexY(centre.y - radius);
+	if(minY <= 0) minY = 0;
+
+	int maxX = GetSectorIndexX(centre.x + radius);
+#ifdef FIX_BUGS
+	if(maxX >= NUMSECTORS_X) maxX = NUMSECTORS_X - 1;
+#else
+	if(maxX >= NUMSECTORS_X) maxX = NUMSECTORS_X;
+#endif
+
+	int maxY = GetSectorIndexY(centre.y + radius);
+#ifdef FIX_BUGS
+	if(maxY >= NUMSECTORS_Y) maxY = NUMSECTORS_Y - 1;
+#else
+	if(maxY >= NUMSECTORS_Y) maxY = NUMSECTORS_Y;
+#endif
+
+	AdvanceCurrentScanCode();
+
+	for(int curY = minY; curY <= maxY; curY++) {
+		for(int curX = minX; curX <= maxX; curX++) {
+			CSector *sector = GetSector(curX, curY);
+			if(checkBuildings) {
+				foundE = TestSphereAgainstSectorList(sector->m_lists[ENTITYLIST_BUILDINGS], centre,
+				                                     radius, entityToIgnore, false);
+				if(foundE) return foundE;
+
+				foundE = TestSphereAgainstSectorList(sector->m_lists[ENTITYLIST_BUILDINGS_OVERLAP],
+				                                     centre, radius, entityToIgnore, false);
+				if(foundE) return foundE;
+			}
+			if(checkVehicles) {
+				foundE = TestSphereAgainstSectorList(sector->m_lists[ENTITYLIST_VEHICLES], centre,
+				                                     radius, entityToIgnore, false);
+				if(foundE) return foundE;
+
+				foundE = TestSphereAgainstSectorList(sector->m_lists[ENTITYLIST_VEHICLES_OVERLAP],
+				                                     centre, radius, entityToIgnore, false);
+				if(foundE) return foundE;
+			}
+			if(checkPeds) {
+				foundE = TestSphereAgainstSectorList(sector->m_lists[ENTITYLIST_PEDS], centre, radius,
+				                                     entityToIgnore, false);
+				if(foundE) return foundE;
+
+				foundE = TestSphereAgainstSectorList(sector->m_lists[ENTITYLIST_PEDS_OVERLAP], centre,
+				                                     radius, entityToIgnore, false);
+				if(foundE) return foundE;
+			}
+			if(checkObjects) {
+				foundE = TestSphereAgainstSectorList(sector->m_lists[ENTITYLIST_OBJECTS], centre,
+				                                     radius, entityToIgnore, ignoreSomeObjects);
+				if(foundE) return foundE;
+
+				foundE = TestSphereAgainstSectorList(sector->m_lists[ENTITYLIST_OBJECTS_OVERLAP],
+				                                     centre, radius, entityToIgnore, ignoreSomeObjects);
+				if(foundE) return foundE;
+			}
+			if(checkDummies) {
+				foundE = TestSphereAgainstSectorList(sector->m_lists[ENTITYLIST_DUMMIES], centre,
+				                                     radius, entityToIgnore, false);
+				if(foundE) return foundE;
+
+				foundE = TestSphereAgainstSectorList(sector->m_lists[ENTITYLIST_DUMMIES_OVERLAP],
+				                                     centre, radius, entityToIgnore, false);
+				if(foundE) return foundE;
+			}
+		}
+	}
+	return foundE;
+}
+
+CEntity *
+CWorld::TestSphereAgainstSectorList(CPtrList &list, CVector spherePos, float radius, CEntity *entityToIgnore,
+                                    bool ignoreSomeObjects)
+{
+	static CColModel OurColModel;
+	CColSphere sphere;
+
+	OurColModel.boundingSphere.center.x = 0.0f;
+	OurColModel.boundingSphere.center.y = 0.0f;
+	OurColModel.boundingSphere.center.z = 0.0f;
+	OurColModel.boundingSphere.radius = radius;
+	OurColModel.boundingBox.min.x = -radius;
+	OurColModel.boundingBox.min.y = -radius;
+	OurColModel.boundingBox.min.z = -radius;
+	OurColModel.boundingBox.max.x = radius;
+	OurColModel.boundingBox.max.y = radius;
+	OurColModel.boundingBox.max.z = radius;
+	OurColModel.numSpheres = 1;
+	sphere.Set(radius, CVector(0.0f, 0.0f, 0.0f));
+	OurColModel.spheres = &sphere;
+	OurColModel.numLines = 0;
+	OurColModel.numBoxes = 0;
+	OurColModel.numTriangles = 0;
+	OurColModel.ownsCollisionVolumes = false;
+
+	CMatrix sphereMat;
+	sphereMat.SetTranslate(spherePos);
+
+	for(CPtrNode *node = list.first; node; node = node->next) {
+		CEntity *e = (CEntity *)node->item;
+
+		if(e->m_scanCode != GetCurrentScanCode()) {
+			e->m_scanCode = GetCurrentScanCode();
+
+			if(e != entityToIgnore && e->bUsesCollision &&
+			   !(ignoreSomeObjects && CameraToIgnoreThisObject(e))) {
+				CVector diff = spherePos - e->GetBoundCentre();
+				float distance = diff.Magnitude();
+
+				if(e->GetBoundRadius() + radius > distance) {
+					CColModel *eCol = CModelInfo::GetModelInfo(e->GetModelIndex())->GetColModel();
+					int collidedSpheres =
+					    CCollision::ProcessColModels(sphereMat, OurColModel, e->GetMatrix(), *eCol,
+					                                 gaTempSphereColPoints, nil, nil);
+
+					if(collidedSpheres != 0 ||
+					   (e->IsVehicle() && ((CVehicle *)e)->m_vehType == VEHICLE_TYPE_CAR && e->GetModelIndex() != MI_DODO &&
+					    radius + eCol->boundingBox.max.x > distance)) {
+						return e;
+					}
+				}
+			}
+		}
+	}
+
+	return nil;
+}
+
+float
+CWorld::FindGroundZForCoord(float x, float y)
+{
+	CColPoint point;
+	CEntity *ent;
+	if(ProcessVerticalLine(CVector(x, y, 1000.0f), -1000.0f, point, ent, true, false, false, false, true, false,
+	                       nil))
+		return point.point.z;
+	else
+		return 20.0f;
+}
+
+float
+CWorld::FindGroundZFor3DCoord(float x, float y, float z, bool *found)
+{
+	CColPoint point;
+	CEntity *ent;
+	if(ProcessVerticalLine(CVector(x, y, z), -1000.0f, point, ent, true, false, false, false, false, false, nil)) {
+		if(found) *found = true;
+		return point.point.z;
+	} else {
+		if(found) *found = false;
+		return 0.0f;
+	}
+}
+
+float
+CWorld::FindRoofZFor3DCoord(float x, float y, float z, bool *found)
+{
+	CColPoint point;
+	CEntity *ent;
+	if(ProcessVerticalLine(CVector(x, y, z), 1000.0f, point, ent, true, false, false, false, true, false, nil)) {
+		if(found) *found = true;
+		return point.point.z;
+	} else {
+		if(found == nil)
+			printf("THERE IS NO MAP BELOW THE FOLLOWING COORS:%f %f %f. (FindGroundZFor3DCoord)\n", x, y,
+			       z);
+		if(found) *found = false;
+		return 20.0f;
+	}
+}
+
+void
+CWorld::RemoveReferencesToDeletedObject(CEntity *pDeletedObject)
+{
+	int32 i = CPools::GetPedPool()->GetSize();
+	while(--i >= 0) {
+		CPed *pPed = CPools::GetPedPool()->GetSlot(i);
+		if(pPed && pPed != pDeletedObject) {
+			pPed->RemoveRefsToEntity(pDeletedObject);
+			if(pPed->m_pCurrentPhysSurface == pDeletedObject) pPed->m_pCurrentPhysSurface = nil;
+		}
+	}
+	i = CPools::GetVehiclePool()->GetSize();
+	while(--i >= 0) {
+		CVehicle *pVehicle = CPools::GetVehiclePool()->GetSlot(i);
+		if(pVehicle && pVehicle != pDeletedObject) {
+			pVehicle->RemoveRefsToEntity(pDeletedObject);
+			pVehicle->RemoveRefsToVehicle(pDeletedObject);
+		}
+	}
+	i = CPools::GetObjectPool()->GetSize();
+	while(--i >= 0) {
+		CObject *pObject = CPools::GetObjectPool()->GetSlot(i);
+		if(pObject && pObject != pDeletedObject) { pObject->RemoveRefsToEntity(pDeletedObject); }
+	}
+}
+
+void
+CWorld::FindObjectsKindaColliding(const CVector &position, float radius, bool bCheck2DOnly, int16 *nCollidingEntities,
+                                  int16 maxEntitiesToFind, CEntity **aEntities, bool bBuildings, bool bVehicles,
+                                  bool bPeds, bool bObjects, bool bDummies)
+{
+	AdvanceCurrentScanCode();
+	*nCollidingEntities = 0;
+	const CVector2D vecSectorStartPos(position.x - radius, position.y - radius);
+	const CVector2D vecSectorEndPos(position.x + radius, position.y + radius);
+	const int32 nStartX = Max(GetSectorIndexX(vecSectorStartPos.x), 0);
+	const int32 nStartY = Max(GetSectorIndexY(vecSectorStartPos.y), 0);
+#ifdef FIX_BUGS
+	const int32 nEndX = Min(GetSectorIndexX(vecSectorEndPos.x), NUMSECTORS_X - 1);
+	const int32 nEndY = Min(GetSectorIndexY(vecSectorEndPos.y), NUMSECTORS_Y - 1);
+#else
+	const int32 nEndX = Min(GetSectorIndexX(vecSectorEndPos.x), NUMSECTORS_X);
+	const int32 nEndY = Min(GetSectorIndexY(vecSectorEndPos.y), NUMSECTORS_Y);
+#endif
+	for(int32 y = nStartY; y <= nEndY; y++) {
+		for(int32 x = nStartX; x <= nEndX; x++) {
+			CSector *pSector = GetSector(x, y);
+			if(bBuildings) {
+				FindObjectsKindaCollidingSectorList(
+				    pSector->m_lists[ENTITYLIST_BUILDINGS], position, radius, bCheck2DOnly,
+				    nCollidingEntities, maxEntitiesToFind, aEntities);
+				FindObjectsKindaCollidingSectorList(
+				    pSector->m_lists[ENTITYLIST_BUILDINGS_OVERLAP], position, radius, bCheck2DOnly,
+				    nCollidingEntities, maxEntitiesToFind, aEntities);
+			}
+			if(bVehicles) {
+				FindObjectsKindaCollidingSectorList(
+				    pSector->m_lists[ENTITYLIST_VEHICLES], position, radius, bCheck2DOnly,
+				    nCollidingEntities, maxEntitiesToFind, aEntities);
+				FindObjectsKindaCollidingSectorList(
+				    pSector->m_lists[ENTITYLIST_VEHICLES_OVERLAP], position, radius, bCheck2DOnly,
+				    nCollidingEntities, maxEntitiesToFind, aEntities);
+			}
+			if(bPeds) {
+				FindObjectsKindaCollidingSectorList(pSector->m_lists[ENTITYLIST_PEDS], position,
+				                                            radius, bCheck2DOnly, nCollidingEntities,
+				                                            maxEntitiesToFind, aEntities);
+				FindObjectsKindaCollidingSectorList(
+				    pSector->m_lists[ENTITYLIST_PEDS_OVERLAP], position, radius, bCheck2DOnly,
+				    nCollidingEntities, maxEntitiesToFind, aEntities);
+			}
+			if(bObjects) {
+				FindObjectsKindaCollidingSectorList(
+				    pSector->m_lists[ENTITYLIST_OBJECTS], position, radius, bCheck2DOnly,
+				    nCollidingEntities, maxEntitiesToFind, aEntities);
+				FindObjectsKindaCollidingSectorList(
+				    pSector->m_lists[ENTITYLIST_OBJECTS_OVERLAP], position, radius, bCheck2DOnly,
+				    nCollidingEntities, maxEntitiesToFind, aEntities);
+			}
+			if(bDummies) {
+				FindObjectsKindaCollidingSectorList(
+				    pSector->m_lists[ENTITYLIST_DUMMIES], position, radius, bCheck2DOnly,
+				    nCollidingEntities, maxEntitiesToFind, aEntities);
+				FindObjectsKindaCollidingSectorList(
+				    pSector->m_lists[ENTITYLIST_DUMMIES_OVERLAP], position, radius, bCheck2DOnly,
+				    nCollidingEntities, maxEntitiesToFind, aEntities);
+			}
+		}
+	}
+}
+
+void
+CWorld::FindObjectsKindaCollidingSectorList(CPtrList &list, const CVector &position, float radius, bool bCheck2DOnly,
+                                            int16 *nCollidingEntities, int16 maxEntitiesToFind, CEntity **aEntities)
+{
+	for(CPtrNode *pNode = list.first; pNode; pNode = pNode->next) {
+		CEntity *pEntity = (CEntity *)pNode->item;
+		if(pEntity->m_scanCode != GetCurrentScanCode()) {
+			pEntity->m_scanCode = GetCurrentScanCode();
+			float fMagnitude = 0.0f;
+			if(bCheck2DOnly)
+				fMagnitude = (position - pEntity->GetPosition()).Magnitude2D();
+			else
+				fMagnitude = (position - pEntity->GetPosition()).Magnitude();
+			if(pEntity->GetBoundRadius() + radius > fMagnitude && *nCollidingEntities < maxEntitiesToFind) {
+				if(aEntities) aEntities[*nCollidingEntities] = pEntity;
+				++*nCollidingEntities;
+			}
+		}
+	}
+}
+
+void
+CWorld::FindObjectsIntersectingCube(const CVector &vecStartPos, const CVector &vecEndPos, int16 *nIntersecting,
+                                    int16 maxEntitiesToFind, CEntity **aEntities, bool bBuildings, bool bVehicles,
+                                    bool bPeds, bool bObjects, bool bDummies)
+{
+	AdvanceCurrentScanCode();
+	*nIntersecting = 0;
+	const int32 nStartX = Max(GetSectorIndexX(vecStartPos.x), 0);
+	const int32 nStartY = Max(GetSectorIndexY(vecStartPos.y), 0);
+#ifdef FIX_BUGS
+	const int32 nEndX = Min(GetSectorIndexX(vecStartPos.x), NUMSECTORS_X - 1);
+	const int32 nEndY = Min(GetSectorIndexY(vecStartPos.y), NUMSECTORS_Y - 1);
+#else
+	const int32 nEndX = Min(GetSectorIndexX(vecStartPos.x), NUMSECTORS_X);
+	const int32 nEndY = Min(GetSectorIndexY(vecStartPos.y), NUMSECTORS_Y);
+#endif
+	for(int32 y = nStartY; y <= nEndY; y++) {
+		for(int32 x = nStartX; x <= nEndX; x++) {
+			CSector *pSector = GetSector(x, y);
+			if(bBuildings) {
+				FindObjectsIntersectingCubeSectorList(pSector->m_lists[ENTITYLIST_BUILDINGS],
+				                                              vecStartPos, vecEndPos, nIntersecting,
+				                                              maxEntitiesToFind, aEntities);
+				FindObjectsIntersectingCubeSectorList(
+				    pSector->m_lists[ENTITYLIST_BUILDINGS_OVERLAP], vecStartPos, vecEndPos,
+				    nIntersecting, maxEntitiesToFind, aEntities);
+			}
+			if(bVehicles) {
+				FindObjectsIntersectingCubeSectorList(pSector->m_lists[ENTITYLIST_VEHICLES],
+				                                              vecStartPos, vecEndPos, nIntersecting,
+				                                              maxEntitiesToFind, aEntities);
+				FindObjectsIntersectingCubeSectorList(
+				    pSector->m_lists[ENTITYLIST_VEHICLES_OVERLAP], vecStartPos, vecEndPos,
+				    nIntersecting, maxEntitiesToFind, aEntities);
+			}
+			if(bPeds) {
+				FindObjectsIntersectingCubeSectorList(pSector->m_lists[ENTITYLIST_PEDS],
+				                                              vecStartPos, vecEndPos, nIntersecting,
+				                                              maxEntitiesToFind, aEntities);
+				FindObjectsIntersectingCubeSectorList(pSector->m_lists[ENTITYLIST_PEDS_OVERLAP],
+				                                              vecStartPos, vecEndPos, nIntersecting,
+				                                              maxEntitiesToFind, aEntities);
+			}
+			if(bObjects) {
+				FindObjectsIntersectingCubeSectorList(pSector->m_lists[ENTITYLIST_OBJECTS],
+				                                              vecStartPos, vecEndPos, nIntersecting,
+				                                              maxEntitiesToFind, aEntities);
+				FindObjectsIntersectingCubeSectorList(
+				    pSector->m_lists[ENTITYLIST_OBJECTS_OVERLAP], vecStartPos, vecEndPos, nIntersecting,
+				    maxEntitiesToFind, aEntities);
+			}
+			if(bDummies) {
+				FindObjectsIntersectingCubeSectorList(pSector->m_lists[ENTITYLIST_DUMMIES],
+				                                              vecStartPos, vecEndPos, nIntersecting,
+				                                              maxEntitiesToFind, aEntities);
+				FindObjectsIntersectingCubeSectorList(
+				    pSector->m_lists[ENTITYLIST_DUMMIES_OVERLAP], vecStartPos, vecEndPos, nIntersecting,
+				    maxEntitiesToFind, aEntities);
+			}
+		}
+	}
+}
+
+void
+CWorld::FindObjectsIntersectingCubeSectorList(CPtrList &list, const CVector &vecStartPos, const CVector &vecEndPos,
+                                              int16 *nIntersecting, int16 maxEntitiesToFind, CEntity **aEntities)
+{
+	for(CPtrNode *pNode = list.first; pNode; pNode = pNode->next) {
+		CEntity *pEntity = (CEntity *)pNode->item;
+		if(pEntity->m_scanCode != GetCurrentScanCode()) {
+			pEntity->m_scanCode = GetCurrentScanCode();
+			float fRadius = pEntity->GetBoundRadius();
+			const CVector &entityPos = pEntity->GetPosition();
+			if(fRadius + entityPos.x >= vecStartPos.x && entityPos.x - fRadius <= vecEndPos.x &&
+			   fRadius + entityPos.y >= vecStartPos.y && entityPos.y - fRadius <= vecEndPos.y &&
+			   fRadius + entityPos.z >= vecStartPos.z && entityPos.z - fRadius <= vecEndPos.z &&
+			   *nIntersecting < maxEntitiesToFind) {
+				if(aEntities) aEntities[*nIntersecting] = pEntity;
+				++*nIntersecting;
+			}
+		}
+	}
+}
+
+void
+CWorld::FindObjectsIntersectingAngledCollisionBox(const CBox &boundingBox, const CMatrix &matrix,
+                                                  const CVector &position, float fStartX, float fStartY, float fEndX,
+                                                  float fEndY, int16 *nEntitiesFound, int16 maxEntitiesToFind,
+                                                  CEntity **aEntities, bool bBuildings, bool bVehicles, bool bPeds,
+                                                  bool bObjects, bool bDummies)
+{
+	AdvanceCurrentScanCode();
+	*nEntitiesFound = 0;
+	const int32 nStartX = Max(GetSectorIndexX(fStartX), 0);
+	const int32 nStartY = Max(GetSectorIndexY(fStartY), 0);
+#ifdef FIX_BUGS
+	const int32 nEndX = Min(GetSectorIndexX(fEndX), NUMSECTORS_X - 1);
+	const int32 nEndY = Min(GetSectorIndexY(fEndY), NUMSECTORS_Y - 1);
+#else
+	const int32 nEndX = Min(GetSectorIndexX(fEndX), NUMSECTORS_X);
+	const int32 nEndY = Min(GetSectorIndexY(fEndY), NUMSECTORS_Y);
+#endif
+	for(int32 y = nStartY; y <= nEndY; y++) {
+		for(int32 x = nStartX; x <= nEndX; x++) {
+			CSector *pSector = GetSector(x, y);
+			if(bBuildings) {
+				FindObjectsIntersectingAngledCollisionBoxSectorList(
+				    pSector->m_lists[ENTITYLIST_BUILDINGS], boundingBox, matrix, position,
+				    nEntitiesFound, maxEntitiesToFind, aEntities);
+				FindObjectsIntersectingAngledCollisionBoxSectorList(
+				    pSector->m_lists[ENTITYLIST_BUILDINGS_OVERLAP], boundingBox, matrix, position,
+				    nEntitiesFound, maxEntitiesToFind, aEntities);
+			}
+			if(bVehicles) {
+				FindObjectsIntersectingAngledCollisionBoxSectorList(
+				    pSector->m_lists[ENTITYLIST_VEHICLES], boundingBox, matrix, position,
+				    nEntitiesFound, maxEntitiesToFind, aEntities);
+				FindObjectsIntersectingAngledCollisionBoxSectorList(
+				    pSector->m_lists[ENTITYLIST_VEHICLES_OVERLAP], boundingBox, matrix, position,
+				    nEntitiesFound, maxEntitiesToFind, aEntities);
+			}
+			if(bPeds) {
+				FindObjectsIntersectingAngledCollisionBoxSectorList(
+				    pSector->m_lists[ENTITYLIST_PEDS], boundingBox, matrix, position, nEntitiesFound,
+				    maxEntitiesToFind, aEntities);
+				FindObjectsIntersectingAngledCollisionBoxSectorList(
+				    pSector->m_lists[ENTITYLIST_PEDS_OVERLAP], boundingBox, matrix, position,
+				    nEntitiesFound, maxEntitiesToFind, aEntities);
+			}
+			if(bObjects) {
+				FindObjectsIntersectingAngledCollisionBoxSectorList(
+				    pSector->m_lists[ENTITYLIST_OBJECTS], boundingBox, matrix, position, nEntitiesFound,
+				    maxEntitiesToFind, aEntities);
+				FindObjectsIntersectingAngledCollisionBoxSectorList(
+				    pSector->m_lists[ENTITYLIST_OBJECTS_OVERLAP], boundingBox, matrix, position,
+				    nEntitiesFound, maxEntitiesToFind, aEntities);
+			}
+			if(bDummies) {
+				FindObjectsIntersectingAngledCollisionBoxSectorList(
+				    pSector->m_lists[ENTITYLIST_DUMMIES], boundingBox, matrix, position, nEntitiesFound,
+				    maxEntitiesToFind, aEntities);
+				FindObjectsIntersectingAngledCollisionBoxSectorList(
+				    pSector->m_lists[ENTITYLIST_DUMMIES_OVERLAP], boundingBox, matrix, position,
+				    nEntitiesFound, maxEntitiesToFind, aEntities);
+			}
+		}
+	}
+}
+
+void
+CWorld::FindObjectsIntersectingAngledCollisionBoxSectorList(CPtrList &list, const CBox &boundingBox,
+                                                            const CMatrix &matrix, const CVector &position,
+                                                            int16 *nEntitiesFound, int16 maxEntitiesToFind,
+                                                            CEntity **aEntities)
+{
+	for(CPtrNode *pNode = list.first; pNode; pNode = pNode->next) {
+		CEntity *pEntity = (CEntity *)pNode->item;
+		if(pEntity->m_scanCode != GetCurrentScanCode()) {
+			pEntity->m_scanCode = GetCurrentScanCode();
+			CColSphere sphere;
+			CVector vecDistance = pEntity->GetPosition() - position;
+			sphere.radius = pEntity->GetBoundRadius();
+			sphere.center = Multiply3x3(vecDistance, matrix);
+			if(CCollision::TestSphereBox(sphere, boundingBox) && *nEntitiesFound < maxEntitiesToFind) {
+				if(aEntities) aEntities[*nEntitiesFound] = pEntity;
+				++*nEntitiesFound;
+			}
+		}
+	}
+}
+
+void
+CWorld::FindMissionEntitiesIntersectingCube(const CVector &vecStartPos, const CVector &vecEndPos, int16 *nIntersecting,
+                                            int16 maxEntitiesToFind, CEntity **aEntities, bool bVehicles, bool bPeds,
+                                            bool bObjects)
+{
+	AdvanceCurrentScanCode();
+	*nIntersecting = 0;
+	const int32 nStartX = Max(GetSectorIndexX(vecStartPos.x), 0);
+	const int32 nStartY = Max(GetSectorIndexY(vecStartPos.y), 0);
+#ifdef FIX_BUGS
+	const int32 nEndX = Min(GetSectorIndexX(vecEndPos.x), NUMSECTORS_X - 1);
+	const int32 nEndY = Min(GetSectorIndexY(vecEndPos.y), NUMSECTORS_Y - 1);
+#else
+	const int32 nEndX = Min(GetSectorIndexX(vecEndPos.x), NUMSECTORS_X);
+	const int32 nEndY = Min(GetSectorIndexY(vecEndPos.y), NUMSECTORS_Y);
+#endif
+	for(int32 y = nStartY; y <= nEndY; y++) {
+		for(int32 x = nStartX; x <= nEndX; x++) {
+			CSector *pSector = GetSector(x, y);
+			if(bVehicles) {
+				FindMissionEntitiesIntersectingCubeSectorList(
+				    pSector->m_lists[ENTITYLIST_VEHICLES], vecStartPos, vecEndPos, nIntersecting,
+				    maxEntitiesToFind, aEntities, true, false);
+				FindMissionEntitiesIntersectingCubeSectorList(
+				    pSector->m_lists[ENTITYLIST_VEHICLES_OVERLAP], vecStartPos, vecEndPos,
+				    nIntersecting, maxEntitiesToFind, aEntities, true, false);
+			}
+			if(bPeds) {
+				FindMissionEntitiesIntersectingCubeSectorList(
+				    pSector->m_lists[ENTITYLIST_PEDS], vecStartPos, vecEndPos, nIntersecting,
+				    maxEntitiesToFind, aEntities, false, true);
+				FindMissionEntitiesIntersectingCubeSectorList(
+				    pSector->m_lists[ENTITYLIST_PEDS_OVERLAP], vecStartPos, vecEndPos, nIntersecting,
+				    maxEntitiesToFind, aEntities, false, true);
+			}
+			if(bObjects) {
+				FindMissionEntitiesIntersectingCubeSectorList(
+				    pSector->m_lists[ENTITYLIST_OBJECTS], vecStartPos, vecEndPos, nIntersecting,
+				    maxEntitiesToFind, aEntities, false, false);
+				FindMissionEntitiesIntersectingCubeSectorList(
+				    pSector->m_lists[ENTITYLIST_OBJECTS_OVERLAP], vecStartPos, vecEndPos, nIntersecting,
+				    maxEntitiesToFind, aEntities, false, false);
+			}
+		}
+	}
+}
+
+void
+CWorld::FindMissionEntitiesIntersectingCubeSectorList(CPtrList &list, const CVector &vecStartPos,
+                                                      const CVector &vecEndPos, int16 *nIntersecting,
+                                                      int16 maxEntitiesToFind, CEntity **aEntities, bool bIsVehicleList,
+                                                      bool bIsPedList)
+{
+	for(CPtrNode *pNode = list.first; pNode; pNode = pNode->next) {
+		CEntity *pEntity = (CEntity *)pNode->item;
+		if(pEntity->m_scanCode != GetCurrentScanCode()) {
+			pEntity->m_scanCode = GetCurrentScanCode();
+			bool bIsMissionEntity = false;
+			if(bIsVehicleList)
+				bIsMissionEntity = ((CVehicle *)pEntity)->VehicleCreatedBy == MISSION_VEHICLE;
+			else if(bIsPedList)
+				bIsMissionEntity = ((CPed *)pEntity)->CharCreatedBy == MISSION_CHAR;
+			else
+				bIsMissionEntity = ((CObject *)pEntity)->ObjectCreatedBy == MISSION_OBJECT;
+			float fRadius = pEntity->GetBoundRadius();
+			const CVector &entityPos = pEntity->GetPosition();
+			if(bIsMissionEntity && fRadius + entityPos.x >= vecStartPos.x &&
+			   entityPos.x - fRadius <= vecEndPos.x && fRadius + entityPos.y >= vecStartPos.y &&
+			   entityPos.y - fRadius <= vecEndPos.y && fRadius + entityPos.z >= vecStartPos.z &&
+			   entityPos.z - fRadius <= vecEndPos.z && *nIntersecting < maxEntitiesToFind) {
+				if(aEntities) aEntities[*nIntersecting] = pEntity;
+				++*nIntersecting;
+			}
+		}
+	}
+}
+
+void
+CWorld::ClearCarsFromArea(float x1, float y1, float z1, float x2, float y2, float z2)
+{
+	CVehiclePool *pVehiclePool = CPools::GetVehiclePool();
+	for(int32 i = 0; i < pVehiclePool->GetSize(); i++) {
+		CVehicle *pVehicle = CPools::GetVehiclePool()->GetSlot(i);
+		if(pVehicle) {
+			const CVector &position = pVehicle->GetPosition();
+			if(position.x >= x1 && position.x <= x2 && position.y >= y1 && position.y <= y2 &&
+			   position.z >= z1 && position.z <= z2 && !pVehicle->bIsLocked && pVehicle->CanBeDeleted()) {
+				if(pVehicle->pDriver) {
+					CPopulation::RemovePed(pVehicle->pDriver);
+					pVehicle->pDriver = nil;
+				}
+				for(int32 j = 0; j < pVehicle->m_nNumMaxPassengers; ++j) {
+					if(pVehicle->pPassengers[j]) {
+						CPopulation::RemovePed(pVehicle->pPassengers[j]);
+						pVehicle->pPassengers[j] = nil;
+						--pVehicle->m_nNumPassengers;
+					}
+				}
+				CCarCtrl::RemoveFromInterestingVehicleList(pVehicle);
+				Remove(pVehicle);
+				delete pVehicle;
+			}
+		}
+	}
+}
+
+void
+CWorld::ClearPedsFromArea(float x1, float y1, float z1, float x2, float y2, float z2)
+{
+	CPedPool *pPedPool = CPools::GetPedPool();
+	for(int32 i = 0; i < pPedPool->GetSize(); i++) {
+		CPed *pPed = CPools::GetPedPool()->GetSlot(i);
+		if(pPed) {
+			const CVector &position = pPed->GetPosition();
+			if(!pPed->IsPlayer() && pPed->CanBeDeleted() && position.x >= x1 && position.x <= x2 &&
+			   position.y >= y1 && position.y <= y2 && position.z >= z1 && position.z <= z2) {
+				CPopulation::RemovePed(pPed);
+			}
+		}
+	}
+}
+
+void
+CWorld::CallOffChaseForArea(float x1, float y1, float x2, float y2)
+{
+	AdvanceCurrentScanCode();
+	float fStartX = x1 - 10.0f;
+	float fStartY = y1 - 10.0f;
+	float fEndX = x2 + 10.0f;
+	float fEndY = y2 + 10.0f;
+	const int32 nStartX = Max(GetSectorIndexX(fStartX), 0);
+	const int32 nStartY = Max(GetSectorIndexY(fStartY), 0);
+#ifdef FIX_BUGS
+	const int32 nEndX = Min(GetSectorIndexX(fEndX), NUMSECTORS_X - 1);
+	const int32 nEndY = Min(GetSectorIndexY(fEndY), NUMSECTORS_Y - 1);
+#else
+	const int32 nEndX = Min(GetSectorIndexX(fEndX), NUMSECTORS_X);
+	const int32 nEndY = Min(GetSectorIndexY(fEndY), NUMSECTORS_Y);
+#endif
+	for(int32 y = nStartY; y <= nEndY; y++) {
+		for(int32 x = nStartX; x <= nEndX; x++) {
+			CSector *pSector = GetSector(x, y);
+			CallOffChaseForAreaSectorListVehicles(pSector->m_lists[ENTITYLIST_VEHICLES], x1, y1, x2,
+			                                              y2, fStartX, fStartY, fEndX, fEndY);
+			CallOffChaseForAreaSectorListVehicles(pSector->m_lists[ENTITYLIST_VEHICLES_OVERLAP], x1,
+			                                              y1, x2, y2, fStartX, fStartY, fEndX, fEndY);
+			CallOffChaseForAreaSectorListPeds(pSector->m_lists[ENTITYLIST_PEDS], x1, y1, x2, y2);
+			CallOffChaseForAreaSectorListPeds(pSector->m_lists[ENTITYLIST_PEDS_OVERLAP], x1, y1, x2,
+			                                          y2);
+		}
+	}
+}
+
+void
+CWorld::CallOffChaseForAreaSectorListVehicles(CPtrList &list, float x1, float y1, float x2, float y2, float fStartX,
+                                              float fStartY, float fEndX, float fEndY)
+{
+	for(CPtrNode *pNode = list.first; pNode; pNode = pNode->next) {
+		CVehicle *pVehicle = (CVehicle *)pNode->item;
+		if(pVehicle->m_scanCode != GetCurrentScanCode()) {
+			pVehicle->m_scanCode = GetCurrentScanCode();
+			const CVector &vehiclePos = pVehicle->GetPosition();
+			uint8 carMission = pVehicle->AutoPilot.m_nCarMission;
+			if(pVehicle != FindPlayerVehicle() && vehiclePos.x > fStartX && vehiclePos.x < fEndX &&
+			   vehiclePos.y > fStartY && vehiclePos.y < fEndY && pVehicle->bIsLawEnforcer &&
+			   (carMission == MISSION_RAMPLAYER_FARAWAY || carMission == MISSION_RAMPLAYER_CLOSE ||
+			    carMission == MISSION_BLOCKPLAYER_FARAWAY || carMission == MISSION_BLOCKPLAYER_CLOSE)) {
+				pVehicle->AutoPilot.m_nTimeTempAction = CTimer::GetTimeInMilliseconds() + 2000;
+				CColModel *pColModel = pVehicle->GetColModel();
+				bool bInsideSphere = false;
+				for(int32 i = 0; i < pColModel->numSpheres; i++) {
+					CVector pos = pVehicle->m_matrix * pColModel->spheres[i].center;
+					float fRadius = pColModel->spheres[i].radius;
+					if(pos.x + fRadius > x1 && pos.x - fRadius < x2 && pos.y + fRadius > y1 &&
+					   pos.y - fRadius < y2)
+						bInsideSphere = true;
+					// Maybe break the loop when bInsideSphere is set to true?
+				}
+				if(bInsideSphere) {
+					if(pVehicle->GetPosition().x <= (x1 + x2) * 0.5f)
+						pVehicle->m_vecMoveSpeed.x = Min(pVehicle->m_vecMoveSpeed.x, 0.0f);
+					else
+						pVehicle->m_vecMoveSpeed.x = Max(pVehicle->m_vecMoveSpeed.x, 0.0f);
+					if(pVehicle->GetPosition().y <= (y1 + y2) * 0.5f)
+						pVehicle->m_vecMoveSpeed.y = Min(pVehicle->m_vecMoveSpeed.y, 0.0f);
+					else
+						pVehicle->m_vecMoveSpeed.y = Max(pVehicle->m_vecMoveSpeed.y, 0.0f);
+				}
+			}
+		}
+	}
+}
+
+void
+CWorld::CallOffChaseForAreaSectorListPeds(CPtrList &list, float x1, float y1, float x2, float y2)
+{
+	for(CPtrNode *pNode = list.first; pNode; pNode = pNode->next) {
+		CPed *pPed = (CPed *)pNode->item;
+		const CVector &pedPos = pPed->GetPosition();
+		if(pPed->m_scanCode != GetCurrentScanCode()) {
+			pPed->m_scanCode = GetCurrentScanCode();
+			if(pPed != FindPlayerPed() && pPed->m_leader != FindPlayerPed() && pedPos.x > x1 &&
+			   pedPos.x < x2 && pedPos.y > y1 && pedPos.y < y2 &&
+			   (pPed->m_pedInObjective == FindPlayerPed() ||
+			    pPed->m_carInObjective && pPed->m_carInObjective == FindPlayerVehicle()) &&
+			   pPed->m_nPedState != PED_DEAD && pPed->m_nPedState != PED_DIE &&
+			   (pPed->m_objective == OBJECTIVE_KILL_CHAR_ON_FOOT ||
+			    pPed->m_objective == OBJECTIVE_ENTER_CAR_AS_DRIVER ||
+			    pPed->m_objective == OBJECTIVE_KILL_CHAR_ANY_MEANS)) {
+				if(pPed->IsPedInControl()) {
+					if(pPed->m_nPedType == PEDTYPE_COP)
+						((CCopPed *)pPed)->ClearPursuit();
+					else
+						pPed->SetIdle();
+					pPed->SetObjective(OBJECTIVE_NONE);
+				} else {
+					pPed->m_prevObjective = OBJECTIVE_NONE;
+					pPed->m_nLastPedState = PED_IDLE;
+				}
+			}
+		}
+	}
+}
+
+void
+CWorld::RemoveEntityInsteadOfProcessingIt(CEntity *ent)
+{
+	if(ent->IsPed()) {
+		if(FindPlayerPed() == ent)
+			Remove(ent);
+		else
+			CPopulation::RemovePed((CPed *)ent);
+	} else {
+		Remove(ent);
+		delete ent;
+	}
+}
+
+void
+CWorld::RemoveFallenPeds(void)
+{
+	int poolSize = CPools::GetPedPool()->GetSize();
+	for(int poolIndex = poolSize - 1; poolIndex >= 0; poolIndex--) {
+		CPed *ped = CPools::GetPedPool()->GetSlot(poolIndex);
+		if(ped) {
+			if(ped->GetPosition().z < MAP_Z_LOW_LIMIT) {
+				if(ped->CharCreatedBy != RANDOM_CHAR || ped->IsPlayer()) {
+					int closestNode = ThePaths.FindNodeClosestToCoors(ped->GetPosition(), PATH_PED,
+					                                                  999999.9f, false, false);
+					CVector newPos = ThePaths.m_pathNodes[closestNode].GetPosition();
+					newPos.z += 2.0f;
+					ped->Teleport(newPos);
+					ped->m_vecMoveSpeed = CVector(0.0f, 0.0f, 0.0f);
+				} else {
+					CPopulation::RemovePed(ped);
+				}
+			}
+		}
+	}
+}
+
+void
+CWorld::RemoveFallenCars(void)
+{
+	int poolSize = CPools::GetVehiclePool()->GetSize();
+	for(int poolIndex = poolSize - 1; poolIndex >= 0; poolIndex--) {
+		CVehicle *veh = CPools::GetVehiclePool()->GetSlot(poolIndex);
+		if(veh) {
+			if(veh->GetPosition().z < MAP_Z_LOW_LIMIT) {
+				if(veh->VehicleCreatedBy == MISSION_VEHICLE && !veh->bRenderScorched || veh == FindPlayerVehicle() ||
+				   (veh->pDriver && veh->pDriver->IsPlayer())) {
+					int closestNode = ThePaths.FindNodeClosestToCoors(veh->GetPosition(), PATH_CAR,
+					                                                  999999.9f, false, false);
+					CVector newPos = ThePaths.m_pathNodes[closestNode].GetPosition();
+					newPos.z += 3.0f;
+					veh->Teleport(newPos);
+					veh->m_vecMoveSpeed = CVector(0.0f, 0.0f, 0.0f);
+				} else if(veh->VehicleCreatedBy == RANDOM_VEHICLE ||
+				          veh->VehicleCreatedBy == PARKED_VEHICLE) {
+					Remove(veh);
+					delete veh;
+				}
+			}
+		}
+	}
+}
+
+void
+CWorld::StopAllLawEnforcersInTheirTracks(void)
+{
+	int poolSize = CPools::GetVehiclePool()->GetSize();
+	for(int poolIndex = poolSize - 1; poolIndex >= 0; poolIndex--) {
+		CVehicle *veh = CPools::GetVehiclePool()->GetSlot(poolIndex);
+		if(veh) {
+			if(veh->bIsLawEnforcer) veh->SetMoveSpeed(0.0f, 0.0f, 0.0f);
+		}
+	}
+}
+
+void
+CWorld::SetAllCarsCanBeDamaged(bool toggle)
+{
+	int poolSize = CPools::GetVehiclePool()->GetSize();
+	for(int poolIndex = 0; poolIndex < poolSize; poolIndex++) {
+		CVehicle *veh = CPools::GetVehiclePool()->GetSlot(poolIndex);
+		if(veh) veh->bCanBeDamaged = toggle;
+	}
+}
+
+void
+CWorld::ExtinguishAllCarFiresInArea(CVector point, float range)
+{
+	int poolSize = CPools::GetVehiclePool()->GetSize();
+	for(int poolIndex = 0; poolIndex < poolSize; poolIndex++) {
+		CVehicle *veh = CPools::GetVehiclePool()->GetSlot(poolIndex);
+		if(veh) {
+			if((point - veh->GetPosition()).MagnitudeSqr() < sq(range)) veh->ExtinguishCarFire();
+		}
+	}
+}
+
+inline void
+AddSteamsFromGround(CPtrList& list)
+{
+	CPtrNode* pNode = list.first;
+	while (pNode) {
+		((CEntity*)pNode->item)->AddSteamsFromGround(nil);
+		pNode = pNode->next;
+	}
+}
+
+void
+CWorld::AddParticles(void)
+{
+	for(int32 y = 0; y < NUMSECTORS_Y; y++) {
+		for(int32 x = 0; x < NUMSECTORS_X; x++) {
+			CSector *pSector = GetSector(x, y);
+			AddSteamsFromGround(pSector->m_lists[ENTITYLIST_BUILDINGS]);
+			AddSteamsFromGround(pSector->m_lists[ENTITYLIST_DUMMIES]);
+		}
+	}
+}
+
+void
+CWorld::ShutDown(void)
+{
+	for(int i = 0; i < NUMSECTORS_X * NUMSECTORS_Y; i++) {
+		CSector *pSector = GetSector(i % NUMSECTORS_X, i / NUMSECTORS_Y);
+		for(CPtrNode *pNode = pSector->m_lists[ENTITYLIST_BUILDINGS].first; pNode; pNode = pNode->next) {
+			CEntity *pEntity = (CEntity *)pNode->item;
+			Remove(pEntity);
+			delete pEntity;
+		}
+		for(CPtrNode *pNode = pSector->m_lists[ENTITYLIST_VEHICLES].first; pNode; pNode = pNode->next) {
+			CEntity *pEntity = (CEntity *)pNode->item;
+			Remove(pEntity);
+			delete pEntity;
+		}
+		for(CPtrNode *pNode = pSector->m_lists[ENTITYLIST_PEDS].first; pNode; pNode = pNode->next) {
+			CEntity *pEntity = (CEntity *)pNode->item;
+			Remove(pEntity);
+			delete pEntity;
+		}
+		for(CPtrNode *pNode = pSector->m_lists[ENTITYLIST_OBJECTS].first; pNode; pNode = pNode->next) {
+			CEntity *pEntity = (CEntity *)pNode->item;
+			Remove(pEntity);
+			delete pEntity;
+		}
+		for(CPtrNode *pNode = pSector->m_lists[ENTITYLIST_DUMMIES].first; pNode; pNode = pNode->next) {
+			CEntity *pEntity = (CEntity *)pNode->item;
+			Remove(pEntity);
+			delete pEntity;
+		}
+#ifndef FIX_BUGS
+		pSector->m_lists[ENTITYLIST_BUILDINGS].Flush();
+		pSector->m_lists[ENTITYLIST_BUILDINGS_OVERLAP].Flush();
+		pSector->m_lists[ENTITYLIST_DUMMIES].Flush();
+		pSector->m_lists[ENTITYLIST_DUMMIES_OVERLAP].Flush();
+#endif
+	}
+	for(int32 i = 0; i < NUM_LEVELS; i++) {
+		for(CPtrNode *pNode = ms_bigBuildingsList[i].first; pNode; pNode = pNode->next) {
+			CEntity *pEntity = (CEntity *)pNode->item;
+			// Maybe remove from world here?
+			delete pEntity;
+		}
+		ms_bigBuildingsList[i].Flush();
+	}
+	for(int i = 0; i < NUMSECTORS_X * NUMSECTORS_Y; i++) {
+		CSector *pSector = GetSector(i % NUMSECTORS_X, i / NUMSECTORS_Y);
+#ifdef FIX_BUGS
+		pSector->m_lists[ENTITYLIST_BUILDINGS].Flush();
+		pSector->m_lists[ENTITYLIST_BUILDINGS_OVERLAP].Flush();
+		pSector->m_lists[ENTITYLIST_DUMMIES].Flush();
+		pSector->m_lists[ENTITYLIST_DUMMIES_OVERLAP].Flush();
+#endif
+		if(pSector->m_lists[ENTITYLIST_BUILDINGS].first) {
+			sprintf(gString, "Building list %d,%d not empty\n", i % NUMSECTORS_X, i / NUMSECTORS_Y);
+			pSector->m_lists[ENTITYLIST_BUILDINGS].Flush();
+		}
+		if(pSector->m_lists[ENTITYLIST_DUMMIES].first) {
+			sprintf(gString, "Dummy list %d,%d not empty\n", i % NUMSECTORS_X, i / NUMSECTORS_Y);
+			pSector->m_lists[ENTITYLIST_DUMMIES].Flush();
+		}
+		if(pSector->m_lists[ENTITYLIST_BUILDINGS_OVERLAP].first) {
+			sprintf(gString, "Building overlap list %d,%d not empty\n", i % NUMSECTORS_X, i / NUMSECTORS_Y);
+			pSector->m_lists[ENTITYLIST_BUILDINGS_OVERLAP].Flush();
+		}
+		if(pSector->m_lists[ENTITYLIST_VEHICLES_OVERLAP].first) {
+			sprintf(gString, "Vehicle overlap list %d,%d not empty\n", i % NUMSECTORS_X, i / NUMSECTORS_Y);
+			pSector->m_lists[ENTITYLIST_VEHICLES_OVERLAP].Flush();
+		}
+		if(pSector->m_lists[ENTITYLIST_PEDS_OVERLAP].first) {
+			sprintf(gString, "Ped overlap list %d,%d not empty\n", i % NUMSECTORS_X, i / NUMSECTORS_Y);
+			pSector->m_lists[ENTITYLIST_PEDS_OVERLAP].Flush();
+		}
+		if(pSector->m_lists[ENTITYLIST_OBJECTS_OVERLAP].first) {
+			sprintf(gString, "Object overlap list %d,%d not empty\n", i % NUMSECTORS_X, i / NUMSECTORS_Y);
+			pSector->m_lists[ENTITYLIST_OBJECTS_OVERLAP].Flush();
+		}
+		if(pSector->m_lists[ENTITYLIST_DUMMIES_OVERLAP].first) {
+			sprintf(gString, "Dummy overlap list %d,%d not empty\n", i % NUMSECTORS_X, i / NUMSECTORS_Y);
+			pSector->m_lists[ENTITYLIST_DUMMIES_OVERLAP].Flush();
+		}
+	}
+	ms_listMovingEntityPtrs.Flush();
+}
+
+void
+CWorld::ClearForRestart(void)
+{
+	if(CCutsceneMgr::HasLoaded()) CCutsceneMgr::DeleteCutsceneData();
+	CProjectileInfo::RemoveAllProjectiles();
+	CObject::DeleteAllTempObjects();
+	CObject::DeleteAllMissionObjects();
+	CPopulation::ConvertAllObjectsToDummyObjects();
+	for(int i = 0; i < NUMSECTORS_X * NUMSECTORS_Y; i++) {
+		CSector *pSector = GetSector(i % NUMSECTORS_X, i / NUMSECTORS_Y);
+		for(CPtrNode *pNode = pSector->m_lists[ENTITYLIST_PEDS].first; pNode; pNode = pNode->next) {
+			CEntity *pEntity = (CEntity *)pNode->item;
+			Remove(pEntity);
+			delete pEntity;
+		}
+		for(CPtrNode *pNode = GetBigBuildingList(LEVEL_GENERIC).first; pNode; pNode = pNode->next) {
+			CVehicle *pVehicle = (CVehicle *)pNode->item;
+			if(pVehicle && pVehicle->IsVehicle() && pVehicle->IsPlane()) {
+				Remove(pVehicle);
+				delete pVehicle;
+			}
+		}
+		for(CPtrNode *pNode = pSector->m_lists[ENTITYLIST_VEHICLES].first; pNode; pNode = pNode->next) {
+			CEntity *pEntity = (CEntity *)pNode->item;
+			Remove(pEntity);
+			delete pEntity;
+		}
+	}
+	CPools::CheckPoolsEmpty();
+}
+
+void
+CWorld::RepositionCertainDynamicObjects()
+{
+	int32 i = CPools::GetDummyPool()->GetSize();
+	while(--i >= 0) {
+		CDummy *dummy = CPools::GetDummyPool()->GetSlot(i);
+		if(dummy) { RepositionOneObject(dummy); }
+	}
+}
+
+void
+CWorld::RepositionOneObject(CEntity *pEntity)
+{
+	int16 modelId = pEntity->GetModelIndex();
+	if (modelId == MI_PARKINGMETER || modelId == MI_PHONEBOOTH1 || modelId == MI_WASTEBIN ||
+		modelId == MI_BIN || modelId == MI_POSTBOX1 || modelId == MI_NEWSSTAND || modelId == MI_TRAFFICCONE ||
+		modelId == MI_DUMP1 || modelId == MI_ROADWORKBARRIER1 || modelId == MI_BUSSIGN1 || modelId == MI_NOPARKINGSIGN1 ||
+		modelId == MI_PHONESIGN || modelId == MI_FIRE_HYDRANT || modelId == MI_BOLLARDLIGHT ||
+		modelId == MI_PARKTABLE || modelId == MI_PARKINGMETER2 || modelId == MI_TELPOLE02 ||
+		modelId == MI_PARKBENCH || modelId == MI_BARRIER1 || IsTreeModel(modelId)
+		) {
+		CVector& position = pEntity->GetMatrix().GetPosition();
+		CColModel* pColModel = pEntity->GetColModel();
+		float fBoundingBoxMinZ = pColModel->boundingBox.min.z;
+		float fHeight = pColModel->boundingBox.max.z - pColModel->boundingBox.min.z;
+		if (fHeight < OBJECT_REPOSITION_OFFSET_Z) fHeight = OBJECT_REPOSITION_OFFSET_Z;
+		position.z = FindGroundZFor3DCoord(position.x, position.y,
+			position.z + fHeight, nil) -
+			fBoundingBoxMinZ;
+		pEntity->m_matrix.UpdateRW();
+		pEntity->UpdateRwFrame();
+	} else if(IsLightThatNeedsRepositioning(modelId)) {
+		CVector position = pEntity->GetMatrix().GetPosition();
+		CColModel* pColModel = pEntity->GetColModel();
+		float fBoundingBoxMinZ = pColModel->boundingBox.min.z;
+		float fHeight = pColModel->boundingBox.max.z - pColModel->boundingBox.min.z;
+		if (fHeight < OBJECT_REPOSITION_OFFSET_Z) fHeight = OBJECT_REPOSITION_OFFSET_Z;
+		if (pColModel->numBoxes == 1)
+			position = pEntity->GetMatrix() * CVector(
+				(pColModel->boxes[0].min.x + pColModel->boxes[0].max.x) / 2,
+				(pColModel->boxes[0].min.y + pColModel->boxes[0].max.y) / 2,
+				pColModel->boxes[0].min.z);
+		else if (pColModel->numSpheres > 0) {
+			position.z = 1000.0f;
+			for (int i = 0; i < pColModel->numSpheres; i++) {
+				if (pColModel->spheres[i].center.z < position.z)
+					position = pColModel->spheres[i].center;
+			}
+			if (position.z < 1000.0f)
+				position = pEntity->GetMatrix() * position;
+		}
+		pEntity->GetMatrix().GetPosition().z = FindGroundZFor3DCoord(position.x, position.y, pEntity->GetMatrix().GetPosition().z + fHeight, nil) - fBoundingBoxMinZ;
+		pEntity->GetMatrix().UpdateRW();
+		pEntity->UpdateRwFrame();
+		
+	}
+	if(modelId == MI_BUOY) {
+		bool bFound = true;
+		const CVector &position = pEntity->GetPosition();
+		float fGroundZ = FindGroundZFor3DCoord(position.x, position.y,
+		                                               position.z + OBJECT_REPOSITION_OFFSET_Z, &bFound);
+		CColModel *pColModel = pEntity->GetColModel();
+		float fHeight = pColModel->boundingBox.max.z - pColModel->boundingBox.min.z;
+		pEntity->GetMatrix().GetPosition().z = 0.2f * fHeight + 6.0f - 0.5f * fHeight;
+	}
+}
+
+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->GetStatus() != 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::SetPedsChoking(float x, float y, float z, float radius, CEntity* reason)
+{
+	int32 poolSize = CPools::GetPedPool()->GetSize();
+	for (int32 i = poolSize - 1; i >= 0; i--) {
+		CPed* pPed = CPools::GetPedPool()->GetSlot(i);
+		// suspicious copypaste
+		if (pPed && pPed->m_nPedState != PED_DEAD && !pPed->bInVehicle && !pPed->m_pFire && !pPed->bFireProof && pPed->CharCreatedBy != MISSION_CHAR) {
+			if (Abs(pPed->GetPosition().z - z) < 5.0f && Abs(pPed->GetPosition().x - x) < radius &&
+				Abs(pPed->GetPosition().y - y) < radius) {
+				if (!pPed->IsPlayer())
+					pPed->SetFlee(CVector2D(x, y), 10000);
+#ifdef FIX_BUGS
+				pPed->InflictDamage(reason, WEAPONTYPE_TEARGAS, 1.0f, PEDPIECE_TORSO, 0);
+#else
+				pPed->InflictDamage(nil, WEAPONTYPE_TEARGAS, 1.0f, PEDPIECE_TORSO, 0);
+#endif
+			}
+		}
+	}
+}
+
+void
+CWorld::SetPedsOnFire(float x, float y, float z, float radius, CEntity *reason)
+{
+	int32 poolSize = CPools::GetPedPool()->GetSize();
+	for(int32 i = poolSize - 1; i >= 0; i--) {
+		CPed *pPed = CPools::GetPedPool()->GetSlot(i);
+		if(pPed && pPed->m_nPedState != PED_DEAD && !pPed->bInVehicle && !pPed->m_pFire && !pPed->bFireProof) {
+			if(Abs(pPed->GetPosition().z - z) < 5.0f && Abs(pPed->GetPosition().x - x) < radius &&
+			   Abs(pPed->GetPosition().y - y) < radius)
+				gFireManager.StartFire(pPed, reason, 0.8f, true);
+		}
+	}
+}
+
+void
+CWorld::RemoveStaticObjects()
+{
+	for(int i = 0; i < NUMSECTORS_X * NUMSECTORS_Y; i++) {
+		CSector *pSector = GetSector(i % NUMSECTORS_X, i / NUMSECTORS_Y);
+		for(CPtrNode *pNode = pSector->m_lists[ENTITYLIST_BUILDINGS].first; pNode; pNode = pNode->next) {
+			CEntity *pEntity = (CEntity *)pNode->item;
+			Remove(pEntity);
+			delete pEntity;
+		}
+		for(CPtrNode *pNode = pSector->m_lists[ENTITYLIST_OBJECTS].first; pNode; pNode = pNode->next) {
+			CEntity *pEntity = (CEntity *)pNode->item;
+			Remove(pEntity);
+			delete pEntity;
+		}
+		for(CPtrNode *pNode = pSector->m_lists[ENTITYLIST_DUMMIES].first; pNode; pNode = pNode->next) {
+			CEntity *pEntity = (CEntity *)pNode->item;
+			Remove(pEntity);
+			delete pEntity;
+		}
+		pSector->m_lists[ENTITYLIST_BUILDINGS].Flush();
+		pSector->m_lists[ENTITYLIST_BUILDINGS_OVERLAP].Flush();
+		pSector->m_lists[ENTITYLIST_DUMMIES].Flush();
+		pSector->m_lists[ENTITYLIST_DUMMIES_OVERLAP].Flush();
+	}
+}
+
+void
+CWorld::Process(void)
+{
+	if(!(CTimer::GetFrameCounter() & 63)) CReferences::PruneAllReferencesInWorld();
+
+	if(bProcessCutsceneOnly) {
+		for(int i = 0; i < NUMCUTSCENEOBJECTS; i++) {
+			CCutsceneObject *csObj = CCutsceneMgr::GetCutsceneObject(i);
+			if(csObj && csObj->m_entryInfoList.first) {
+				if(csObj->m_rwObject && RwObjectGetType(csObj->m_rwObject) == rpCLUMP &&
+				   RpAnimBlendClumpGetFirstAssociation(csObj->GetClump())) {
+					if (csObj->IsObject())
+						RpAnimBlendClumpUpdateAnimations(csObj->GetClump(), CTimer::GetTimeStepNonClippedInSeconds());
+					else {
+						if (!csObj->bOffscreen)
+							csObj->bOffscreen = !csObj->GetIsOnScreen();
+						RpAnimBlendClumpUpdateAnimations(csObj->GetClump(), CTimer::GetTimeStepInSeconds(), !csObj->bOffscreen);
+					}
+				}
+				csObj->ProcessControl();
+				csObj->ProcessCollision();
+				csObj->GetMatrix().UpdateRW();
+				csObj->UpdateRwFrame();
+			}
+		}
+		CRecordDataForChase::ProcessControlCars();
+		CRecordDataForChase::SaveOrRetrieveCarPositions();
+	} else {
+		for(CPtrNode *node = ms_listMovingEntityPtrs.first; node; node = node->next) {
+			CEntity *movingEnt = (CEntity *)node->item;
+			if(!movingEnt->bRemoveFromWorld && movingEnt->m_rwObject && RwObjectGetType(movingEnt->m_rwObject) == rpCLUMP &&
+			   RpAnimBlendClumpGetFirstAssociation(movingEnt->GetClump())) {
+				if (movingEnt->IsObject())
+					RpAnimBlendClumpUpdateAnimations(movingEnt->GetClump(), CTimer::GetTimeStepNonClippedInSeconds());
+				else {
+					if (!movingEnt->bOffscreen)
+						movingEnt->bOffscreen = !movingEnt->GetIsOnScreen();
+					RpAnimBlendClumpUpdateAnimations(movingEnt->GetClump(), CTimer::GetTimeStepInSeconds(), !movingEnt->bOffscreen);
+				}
+			}
+		}
+		for(CPtrNode *node = ms_listMovingEntityPtrs.first; node; node = node->next) {
+			CPhysical *movingEnt = (CPhysical *)node->item;
+			if(movingEnt->bRemoveFromWorld) {
+				RemoveEntityInsteadOfProcessingIt(movingEnt);
+			} else {
+				movingEnt->ProcessControl();
+				if(movingEnt->GetIsStatic()) { movingEnt->RemoveFromMovingList(); }
+			}
+		}
+		bForceProcessControl = true;
+		for(CPtrNode *node = ms_listMovingEntityPtrs.first; node; node = node->next) {
+			CPhysical *movingEnt = (CPhysical *)node->item;
+			if(movingEnt->bWasPostponed) {
+				if(movingEnt->bRemoveFromWorld) {
+					RemoveEntityInsteadOfProcessingIt(movingEnt);
+				} else {
+					movingEnt->ProcessControl();
+					if(movingEnt->GetIsStatic()) { movingEnt->RemoveFromMovingList(); }
+				}
+			}
+		}
+		bForceProcessControl = false;
+		if(CReplay::IsPlayingBack()) {
+			for(CPtrNode *node = ms_listMovingEntityPtrs.first; node; node = node->next) {
+				CEntity *movingEnt = (CEntity *)node->item;
+				movingEnt->bIsInSafePosition = true;
+				movingEnt->GetMatrix().UpdateRW();
+				movingEnt->UpdateRwFrame();
+			}
+		} else {
+			bNoMoreCollisionTorque = false;
+			for(CPtrNode *node = ms_listMovingEntityPtrs.first; node; node = node->next) {
+				CEntity *movingEnt = (CEntity *)node->item;
+				if(!movingEnt->bIsInSafePosition) {
+					movingEnt->ProcessCollision();
+					movingEnt->GetMatrix().UpdateRW();
+					movingEnt->UpdateRwFrame();
+				}
+			}
+			bNoMoreCollisionTorque = true;
+			for(int i = 0; i < 4; i++) {
+				for(CPtrNode *node = ms_listMovingEntityPtrs.first; node; node = node->next) {
+					CEntity *movingEnt = (CEntity *)node->item;
+					if(!movingEnt->bIsInSafePosition) {
+						movingEnt->ProcessCollision();
+						movingEnt->GetMatrix().UpdateRW();
+						movingEnt->UpdateRwFrame();
+					}
+				}
+			}
+			for(CPtrNode *node = ms_listMovingEntityPtrs.first; node; node = node->next) {
+				CEntity *movingEnt = (CEntity *)node->item;
+				if(!movingEnt->bIsInSafePosition) {
+					movingEnt->bIsStuck = true;
+					movingEnt->ProcessCollision();
+					movingEnt->GetMatrix().UpdateRW();
+					movingEnt->UpdateRwFrame();
+					if(!movingEnt->bIsInSafePosition) { movingEnt->bIsStuck = true; }
+				}
+			}
+			bSecondShift = false;
+			for(CPtrNode *node = ms_listMovingEntityPtrs.first; node; node = node->next) {
+				CEntity *movingEnt = (CEntity *)node->item;
+				if(!movingEnt->bIsInSafePosition) {
+					movingEnt->ProcessShift();
+					movingEnt->GetMatrix().UpdateRW();
+					movingEnt->UpdateRwFrame();
+					if(!movingEnt->bIsInSafePosition) { movingEnt->bIsStuck = true; }
+				}
+			}
+			bSecondShift = true;
+			for(CPtrNode *node = ms_listMovingEntityPtrs.first; node; node = node->next) {
+				CPhysical *movingEnt = (CPhysical *)node->item;
+				if(!movingEnt->bIsInSafePosition) {
+					movingEnt->ProcessShift();
+					movingEnt->GetMatrix().UpdateRW();
+					movingEnt->UpdateRwFrame();
+					if(!movingEnt->bIsInSafePosition) {
+						movingEnt->bIsStuck = true;
+						if(movingEnt->GetStatus() == STATUS_PLAYER) {
+							printf("STUCK: Final Step: Player Entity %d Is Stuck\n", movingEnt->GetModelIndex());
+							movingEnt->m_vecMoveSpeed *= Pow(0.707f, CTimer::GetTimeStep());
+							movingEnt->ApplyMoveSpeed();
+							movingEnt->ApplyTurnSpeed();
+						}
+					}
+				}
+			}
+		}
+		for(CPtrNode *node = ms_listMovingEntityPtrs.first; node; node = node->next) {
+			CPed *movingPed = (CPed *)node->item;
+			if(movingPed->IsPed()) {
+				if(movingPed->bInVehicle && movingPed->m_nPedState != PED_EXIT_TRAIN ||
+				   movingPed->EnteringCar()) {
+					CVehicle *movingCar = movingPed->m_pMyVehicle;
+					if(movingCar) {
+#ifdef GTA_TRAIN
+						if(movingCar->IsTrain()) {
+							movingPed->SetPedPositionInTrain();
+						} else
+#endif
+						{
+							switch(movingPed->m_nPedState) {
+							case PED_ENTER_CAR:
+							case PED_CARJACK: movingPed->EnterCar(); break;
+							case PED_DRAG_FROM_CAR: movingPed->BeingDraggedFromCar(); break;
+							case PED_EXIT_CAR: movingPed->ExitCar(); break;
+							case PED_ARRESTED:
+								if(movingPed->m_nLastPedState == PED_DRAG_FROM_CAR) {
+									movingPed->BeingDraggedFromCar();
+									break;
+								}
+								// fall through
+							default: movingPed->SetPedPositionInCar(); break;
+							}
+						}
+						movingPed->GetMatrix().UpdateRW();
+						movingPed->UpdateRwFrame();
+					} else {
+						movingPed->bInVehicle = false;
+						movingPed->QuitEnteringCar();
+					}
+				} else if (movingPed->m_attachedTo) {
+					movingPed->PositionAttachedPed();
+					movingPed->GetMatrix().UpdateRW();
+					movingPed->UpdateRwFrame();
+				}
+			}
+		}
+		CMessages::Process();
+		Players[PlayerInFocus].Process();
+		CRecordDataForChase::SaveOrRetrieveCarPositions();
+		if((CTimer::GetFrameCounter() & 7) == 1) {
+			RemoveFallenPeds();
+		} else if((CTimer::GetFrameCounter() & 7) == 5) {
+			RemoveFallenCars();
+		}
+	}
+}
+
+void
+CWorld::TriggerExplosion(const CVector &position, float fRadius, float fPower, CEntity *pCreator,
+                         bool bProcessVehicleBombTimer)
+{
+	CVector2D vecStartPos(position.x - fRadius, position.y - fRadius);
+	CVector2D vecEndPos(position.x + fRadius, position.y + fRadius);
+	const int32 nStartX = Max(GetSectorIndexX(vecStartPos.x), 0);
+	const int32 nStartY = Max(GetSectorIndexY(vecStartPos.y), 0);
+	const int32 nEndX = Min(GetSectorIndexX(vecEndPos.x), NUMSECTORS_X - 1);
+	const int32 nEndY = Min(GetSectorIndexY(vecEndPos.y), NUMSECTORS_Y - 1);
+	for(int32 y = nStartY; y <= nEndY; y++) {
+		for(int32 x = nStartX; x <= nEndX; x++) {
+			CSector *pSector = GetSector(x, y);
+			TriggerExplosionSectorList(pSector->m_lists[ENTITYLIST_VEHICLES], position, fRadius,
+			                                   fPower, pCreator, bProcessVehicleBombTimer);
+			TriggerExplosionSectorList(pSector->m_lists[ENTITYLIST_PEDS], position, fRadius, fPower,
+			                                   pCreator, bProcessVehicleBombTimer);
+			TriggerExplosionSectorList(pSector->m_lists[ENTITYLIST_OBJECTS], position, fRadius,
+			                                   fPower, pCreator, bProcessVehicleBombTimer);
+		}
+	}
+}
+
+void
+CWorld::TriggerExplosionSectorList(CPtrList &list, const CVector &position, float fRadius, float fPower,
+                                   CEntity *pCreator, bool bProcessVehicleBombTimer)
+{
+	for(CPtrNode *pNode = list.first; pNode; pNode = pNode->next) {
+		CPhysical *pEntity = (CPhysical *)pNode->item;
+		CVector vecDistance = pEntity->GetPosition() - position;
+		float fMagnitude = vecDistance.Magnitude();
+		if(fRadius > fMagnitude) {
+			CWeapon::BlowUpExplosiveThings(pEntity);
+			CPed *pPed = (CPed *)pEntity;
+			CObject *pObject = (CObject *)pEntity;
+			CVehicle *pVehicle = (CVehicle *)pEntity;
+			if(!pEntity->bExplosionProof && (!pEntity->IsPed() || !pPed->bInVehicle)) {
+				if(pEntity->GetIsStatic()) {
+					if(pEntity->IsObject()) {
+						if (fPower > pObject->m_fUprootLimit || IsFence(pObject->GetModelIndex())) {
+							if (IsGlass(pObject->GetModelIndex())) {
+								CGlass::WindowRespondsToExplosion(pObject, position);
+							} else {
+								pObject->SetIsStatic(false);
+								pObject->AddToMovingList();
+								int16 modelId = pEntity->GetModelIndex();
+								if(modelId != MI_FIRE_HYDRANT ||
+								   pObject->bHasBeenDamaged) {
+									if(pEntity->IsObject() &&
+									   modelId != MI_EXPLODINGBARREL &&
+									   modelId != MI_PETROLPUMP && modelId != MI_PETROLPUMP2)
+										pObject->bHasBeenDamaged = true;
+								} else {
+									CVector pos = pEntity->GetPosition();
+									pos.z -= 0.5f;
+									CParticleObject::AddObject(POBJECT_FIRE_HYDRANT,
+									                           pos, true);
+									pObject->bHasBeenDamaged = true;
+								}
+							}
+						}
+						if(pEntity->GetIsStatic()) {
+							float fDamageMultiplier =
+							    (fRadius - fMagnitude) * 2.0f / fRadius;
+							float fDamage = 300.0f * Min(fDamageMultiplier, 1.0f);
+							pObject->ObjectDamage(fDamage);
+						}
+					} else {
+						pEntity->SetIsStatic(false);
+						pEntity->AddToMovingList();
+					}
+				}
+				if(!pEntity->GetIsStatic()) {
+					float fDamageMultiplier = Min((fRadius - fMagnitude) * 2.0f / fRadius, 1.0f);
+					CVector vecForceDir =
+					    vecDistance * (fPower * pEntity->m_fMass / 1400.0f * fDamageMultiplier /
+					                   Max(fMagnitude, 0.01f));
+					vecForceDir.z = Max(vecForceDir.z, 0.0f);
+					if(pEntity == FindPlayerPed()) vecForceDir.z = Min(vecForceDir.z, 1.0f);
+					pEntity->ApplyMoveForce(vecForceDir);
+					if(!pEntity->bPedPhysics) {
+						float fBoundRadius = pEntity->GetBoundRadius();
+						float fDistanceZ = position.z - pEntity->GetPosition().z;
+						float fPointZ = fBoundRadius;
+						if(Max(fDistanceZ, -fBoundRadius) < fBoundRadius) {
+							if(fDistanceZ <= -fBoundRadius)
+								fPointZ = -fBoundRadius;
+							else
+								fPointZ = fDistanceZ;
+						}
+						pEntity->ApplyTurnForce(vecForceDir.x, vecForceDir.y, vecForceDir.z,
+						                        0.0f, 0.0f, fPointZ);
+					}
+					switch(pEntity->GetType()) {
+					case ENTITY_TYPE_VEHICLE:
+						if(pEntity->GetStatus() == STATUS_SIMPLE) {
+							pEntity->SetStatus(STATUS_PHYSICS);
+							CCarCtrl::SwitchVehicleToRealPhysics(pVehicle);
+						}
+						pVehicle->InflictDamage(pCreator, WEAPONTYPE_EXPLOSION,
+						                        1100.0f * fDamageMultiplier);
+						if(bProcessVehicleBombTimer) {
+							if(pVehicle->m_nBombTimer) pVehicle->m_nBombTimer /= 10;
+						}
+						break;
+					case ENTITY_TYPE_PED: {
+						int8 direction = pPed->GetLocalDirection(-vecForceDir);
+						pPed->bIsStanding = false;
+						pPed->ApplyMoveForce(0.0, 0.0, 2.0f);
+						float fDamage = 250.0f * fDamageMultiplier;
+						pPed->InflictDamage(pCreator, WEAPONTYPE_EXPLOSION, fDamage,
+						                    PEDPIECE_TORSO, direction);
+						if(pPed->m_nPedState != PED_DIE)
+							pPed->SetFall(2000,
+							              (AnimationId)(direction + ANIM_STD_HIGHIMPACT_FRONT), 0);
+						if(pCreator && pCreator->IsPed()) {
+							eEventType eventType = EVENT_SHOOT_PED;
+							if(pPed->m_nPedType == PEDTYPE_COP) eventType = EVENT_SHOOT_COP;
+							CEventList::RegisterEvent(eventType, EVENT_ENTITY_PED, pEntity,
+							                          (CPed *)pCreator, 10000);
+							pPed->RegisterThreatWithGangPeds(pCreator);
+						}
+						break;
+					}
+					case ENTITY_TYPE_OBJECT:
+						pObject->ObjectDamage(300.0f * fDamageMultiplier);
+						break;
+					default: break;
+					}
+				}
+			}
+		}
+	}
+}
+
+void
+CWorld::UseDetonator(CEntity *pEntity)
+{
+	int32 i = CPools::GetVehiclePool()->GetSize();
+	while(--i >= 0) {
+#ifdef FIX_BUGS
+		CVehicle* pVehicle = CPools::GetVehiclePool()->GetSlot(i);
+#else
+		CAutomobile *pVehicle = (CAutomobile *)CPools::GetVehiclePool()->GetSlot(i);
+#endif
+		if(pVehicle && pVehicle->m_bombType == CARBOMB_REMOTE &&
+		   pVehicle->m_pBombRigger == pEntity) {
+			pVehicle->m_bombType = CARBOMB_NONE;
+			pVehicle->m_nBombTimer = 500;
+			pVehicle->m_pBlowUpEntity = pVehicle->m_pBombRigger;
+			if(pVehicle->m_pBlowUpEntity)
+				pVehicle->m_pBlowUpEntity->RegisterReference(&pVehicle->m_pBlowUpEntity);
+		}
+	}
+	CProjectileInfo::RemoveDetonatorProjectiles();
+}
+
+bool
+CWorld::IsWanderPathClear(CVector const& point1, CVector const& point2, float distance, int maxSteps)
+{
+	if (Abs(point1.z - point2.z) > distance)
+		return false;
+	if (!GetIsLineOfSightClear(point1, point2, true, false, false, false, false, false, false))
+		return false;
+	CVector vecBetween = point2 - point1;
+	uint32 nSteps = Max(vecBetween.Magnitude(), maxSteps);
+	if (nSteps == 0)
+		return true;
+	vecBetween.Normalise();
+	uint32 step = 1;
+	for (step = 1; step < nSteps; step++) {
+		CVector posThisStep = point1 + vecBetween * step;
+		float level;
+		if (!CWaterLevel::GetWaterLevel(posThisStep, &level, false))
+			continue;
+		posThisStep.z = level;
+		AdvanceCurrentScanCode();
+
+		CVector vecCheckedPos(posThisStep.x, posThisStep.y, Max(point1.z, point2.z));
+		CColPoint colpoint;
+		CEntity* entity;
+		if (!ProcessVerticalLineSector(*GetSector(GetSectorIndexX(posThisStep.x), GetSectorIndexY(posThisStep.y)),
+			CColLine(posThisStep, vecCheckedPos), colpoint, entity, true, false, false, false, false, false, nil))
+			return false;
+	}
+
+	CVector posThisStep = point1;
+	AdvanceCurrentScanCode();
+	CVector vecCheckedPos(posThisStep.x, posThisStep.y, point1.z - 5.0f);
+
+	CColPoint colpoint;
+	CEntity* entity;
+	if (!ProcessVerticalLineSector(*GetSector(GetSectorIndexX(posThisStep.x), GetSectorIndexY(posThisStep.y)),
+		CColLine(posThisStep, vecCheckedPos), colpoint, entity, true, false, false, false, false, false, nil))
+		return false;
+
+	float heightNextStep = colpoint.point.z + 0.5f;
+	for (step = 1; step < nSteps; step++) {
+		CVector posThisStep = point1 + vecBetween * step;
+		posThisStep.z = heightNextStep;
+		AdvanceCurrentScanCode();
+		CVector vecCheckedPos(posThisStep.x, posThisStep.y, heightNextStep - 2.0f);
+		if (!ProcessVerticalLineSector(*GetSector(GetSectorIndexX(posThisStep.x), GetSectorIndexY(posThisStep.y)),
+			CColLine(posThisStep, vecCheckedPos), colpoint, entity, true, false, false, false, false, false, nil))
+			return false;
+		if (Abs(colpoint.point.z - heightNextStep) > 1.0f)
+			return false;
+		heightNextStep = colpoint.point.z + 0.5f;
+	}
+	return true;
+}
diff --git a/src/core/World.h b/src/core/World.h
new file mode 100644
index 0000000..81eb5d4
--- /dev/null
+++ b/src/core/World.h
@@ -0,0 +1,176 @@
+#pragma once
+
+#include "Game.h"
+#include "Lists.h"
+#include "PlayerInfo.h"
+#include "Collision.h"
+
+/* Sectors span from -2400 to 1600 in x and -2000 to 2000 y.
+ * With 80x80 sectors, each is 50x50 units. */
+
+#define SECTOR_SIZE_X (50.0f)
+#define SECTOR_SIZE_Y (50.0f)
+
+#define NUMSECTORS_X (80)
+#define NUMSECTORS_Y (80)
+
+#define WORLD_SIZE_X (NUMSECTORS_X * SECTOR_SIZE_X)
+#define WORLD_SIZE_Y (NUMSECTORS_Y * SECTOR_SIZE_Y)
+
+#define WORLD_MIN_X (-2400.0f)
+#define WORLD_MIN_Y (-2000.0f)
+
+#define WORLD_MAX_X (WORLD_MIN_X + WORLD_SIZE_X)
+#define WORLD_MAX_Y (WORLD_MIN_Y + WORLD_SIZE_Y)
+
+#define MAP_Z_LOW_LIMIT -100.0f
+
+enum
+{
+	ENTITYLIST_BUILDINGS,
+	ENTITYLIST_BUILDINGS_OVERLAP,
+	ENTITYLIST_OBJECTS,
+	ENTITYLIST_OBJECTS_OVERLAP,
+	ENTITYLIST_VEHICLES,
+	ENTITYLIST_VEHICLES_OVERLAP,
+	ENTITYLIST_PEDS,
+	ENTITYLIST_PEDS_OVERLAP,
+	ENTITYLIST_DUMMIES,
+	ENTITYLIST_DUMMIES_OVERLAP,
+
+	NUMSECTORENTITYLISTS
+};
+
+class CSector
+{
+public:
+	CPtrList m_lists[NUMSECTORENTITYLISTS];
+};
+
+VALIDATE_SIZE(CSector, 0x28);
+
+class CWorld
+{
+	static CPtrList ms_bigBuildingsList[NUM_LEVELS];
+	static CPtrList ms_listMovingEntityPtrs;
+	static CSector ms_aSectors[NUMSECTORS_Y][NUMSECTORS_X];
+	static uint16 ms_nCurrentScanCode;
+
+public:
+	static uint8 PlayerInFocus;
+	static CPlayerInfo Players[NUMPLAYERS];
+	static CEntity *pIgnoreEntity;
+	static bool bIncludeDeadPeds;
+	static bool bNoMoreCollisionTorque;
+	static bool bSecondShift;
+	static bool bForceProcessControl;
+	static bool bProcessCutsceneOnly;
+	static bool bDoingCarCollisions;
+	static bool bIncludeCarTyres;
+	static bool bIncludeBikers;
+	static CColPoint m_aTempColPts[MAX_COLLISION_POINTS];
+
+	static void Remove(CEntity *entity);
+	static void Add(CEntity *entity);
+
+	static CSector *GetSector(int x, int y) { if (x > NUMSECTORS_X - 1 || y > NUMSECTORS_Y - 1) return &ms_aSectors[0][0]; return &ms_aSectors[y][x]; }
+	static CPtrList &GetBigBuildingList(eLevelName i) { return ms_bigBuildingsList[i]; }
+	static CPtrList &GetMovingEntityList(void) { return ms_listMovingEntityPtrs; }
+	static uint16 GetCurrentScanCode(void) { return ms_nCurrentScanCode; }
+	static void AdvanceCurrentScanCode(void){
+		if(++CWorld::ms_nCurrentScanCode == 0){
+			CWorld::ClearScanCodes();
+			CWorld::ms_nCurrentScanCode = 1;
+		}
+	}
+	static void ClearScanCodes(void);
+	static void ClearExcitingStuffFromArea(const CVector &pos, float radius, bool bRemoveProjectilesAndTidyUpShadows);
+
+	static bool CameraToIgnoreThisObject(CEntity *ent);
+
+	static bool ProcessLineOfSight(const CVector &point1, const CVector &point2, CColPoint &point, CEntity *&entity, bool checkBuildings, bool checkVehicles, bool checkPeds, bool checkObjects, bool checkDummies, bool ignoreSeeThrough, bool ignoreSomeObjects = false, bool ignoreShootThrough = false);
+	static bool ProcessLineOfSightSector(CSector &sector, const CColLine &line, CColPoint &point, float &dist, CEntity *&entity, bool checkBuildings, bool checkVehicles, bool checkPeds, bool checkObjects, bool checkDummies, bool ignoreSeeThrough, bool ignoreSomeObjects, bool ignoreShootThrough);
+	static bool ProcessLineOfSightSectorList(CPtrList &list, const CColLine &line, CColPoint &point, float &dist, CEntity *&entity, bool ignoreSeeThrough, bool ignoreSomeObjects, bool ignoreShootThrough);
+	static bool ProcessVerticalLine(const CVector &point1, float z2, CColPoint &point, CEntity *&entity, bool checkBuildings, bool checkVehicles, bool checkPeds, bool checkObjects, bool checkDummies, bool ignoreSeeThrough, CStoredCollPoly *poly);
+	static bool ProcessVerticalLineSector(CSector &sector, const CColLine &line, CColPoint &point, CEntity *&entity, bool checkBuildings, bool checkVehicles, bool checkPeds, bool checkObjects, bool checkDummies, bool ignoreSeeThrough, CStoredCollPoly *poly);
+	static bool ProcessVerticalLineSectorList(CPtrList &list, const CColLine &line, CColPoint &point, float &dist, CEntity *&entity, bool ignoreSeeThrough, CStoredCollPoly *poly);
+	static bool GetIsLineOfSightClear(const CVector &point1, const CVector &point2, bool checkBuildings, bool checkVehicles, bool checkPeds, bool checkObjects, bool checkDummies, bool ignoreSeeThrough, bool ignoreSomeObjects = false);
+	static bool GetIsLineOfSightSectorClear(CSector &sector, const CColLine &line, bool checkBuildings, bool checkVehicles, bool checkPeds, bool checkObjects, bool checkDummies, bool ignoreSeeThrough, bool ignoreSomeObjects = false);
+	static bool GetIsLineOfSightSectorListClear(CPtrList &list, const CColLine &line, bool ignoreSeeThrough, bool ignoreSomeObjects = false);
+	
+	static CEntity *TestSphereAgainstWorld(CVector centre, float radius, CEntity *entityToIgnore, bool checkBuildings, bool checkVehicles, bool checkPeds, bool checkObjects, bool checkDummies, bool ignoreSomeObjects);
+	static CEntity *TestSphereAgainstSectorList(CPtrList&, CVector, float, CEntity*, bool);
+	static void FindObjectsInRangeSectorList(CPtrList &list, Const CVector &centre, float radius, bool ignoreZ, int16 *numObjects, int16 lastObject, CEntity **objects);
+	static void FindObjectsInRange(Const CVector &centre, float radius, bool ignoreZ, int16 *numObjects, int16 lastObject, CEntity **objects, bool checkBuildings, bool checkVehicles, bool checkPeds, bool checkObjects, bool checkDummies);
+	static void FindObjectsOfTypeInRangeSectorList(uint32 modelId, CPtrList& list, const CVector& position, float radius, bool bCheck2DOnly, int16* nEntitiesFound, int16 maxEntitiesToFind, CEntity** aEntities);
+	static void FindObjectsOfTypeInRange(uint32 modelId, const CVector& position, float radius, bool bCheck2DOnly, int16* nEntitiesFound, int16 maxEntitiesToFind, CEntity** aEntities, bool bBuildings, bool bVehicles, bool bPeds, bool bObjects, bool bDummies);
+	static float FindGroundZForCoord(float x, float y);
+	static float FindGroundZFor3DCoord(float x, float y, float z, bool *found);
+	static float FindRoofZFor3DCoord(float x, float y, float z, bool *found);
+	static void RemoveReferencesToDeletedObject(CEntity*);
+	static void FindObjectsKindaColliding(const CVector& position, float radius, bool bCheck2DOnly, int16* nCollidingEntities, int16 maxEntitiesToFind, CEntity** aEntities, bool bBuildings, bool bVehicles, bool bPeds, bool bObjects, bool bDummies);
+	static void FindObjectsKindaCollidingSectorList(CPtrList& list, const CVector& position, float radius, bool bCheck2DOnly, int16* nCollidingEntities, int16 maxEntitiesToFind, CEntity** aEntities);
+	static void FindObjectsIntersectingCube(const CVector& vecStartPos, const CVector& vecEndPos, int16* nIntersecting, int16 maxEntitiesToFind, CEntity** aEntities, bool bBuildings, bool bVehicles, bool bPeds, bool bObjects, bool bDummies);
+	static void FindObjectsIntersectingCubeSectorList(CPtrList& list, const CVector& vecStartPos, const CVector& vecEndPos, int16* nIntersecting, int16 maxEntitiesToFind, CEntity** aEntities);
+	static void FindObjectsIntersectingAngledCollisionBox(const CBox &, const CMatrix &, const CVector &, float, float, float, float, int16*, int16, CEntity **, bool, bool, bool, bool, bool);
+	static void FindObjectsIntersectingAngledCollisionBoxSectorList(CPtrList& list, const CBox& boundingBox, const CMatrix& matrix, const CVector& position, int16* nEntitiesFound, int16 maxEntitiesToFind, CEntity** aEntities);
+	static void FindMissionEntitiesIntersectingCube(const CVector& vecStartPos, const CVector& vecEndPos, int16* nIntersecting, int16 maxEntitiesToFind, CEntity** aEntities, bool bVehicles, bool bPeds, bool bObjects);
+	static void FindMissionEntitiesIntersectingCubeSectorList(CPtrList& list, const CVector& vecStartPos, const CVector& vecEndPos, int16* nIntersecting, int16 maxEntitiesToFind, CEntity** aEntities, bool bIsVehicleList, bool bIsPedList);
+
+	static void ClearCarsFromArea(float x1, float y1, float z1, float x2, float y2, float z2);
+	static void ClearPedsFromArea(float x1, float y1, float z1, float x2, float y2, float z2);
+	static void CallOffChaseForArea(float x1, float y1, float x2, float y2);
+	static void CallOffChaseForAreaSectorListVehicles(CPtrList& list, float x1, float y1, float x2, float y2, float fStartX, float fStartY, float fEndX, float fEndY);
+	static void CallOffChaseForAreaSectorListPeds(CPtrList& list, float x1, float y1, float x2, float y2);
+
+	static bool IsWanderPathClear(CVector const&, CVector const&, float, int);
+
+	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); }
+	static int GetSectorIndexX(float f) { return (int)GetSectorX(f); }
+	static int GetSectorIndexY(float f) { return (int)GetSectorY(f); }
+	static float GetWorldX(int x) { return x*SECTOR_SIZE_X + WORLD_MIN_X; }
+	static float GetWorldY(int y) { return y*SECTOR_SIZE_Y + WORLD_MIN_Y; }
+
+	static void RemoveEntityInsteadOfProcessingIt(CEntity* ent);
+	static void RemoveFallenPeds();
+	static void RemoveFallenCars();
+
+	static void StopAllLawEnforcersInTheirTracks();
+	static void SetAllCarsCanBeDamaged(bool);
+	static void ExtinguishAllCarFiresInArea(CVector, float);
+	static void SetCarsOnFire(float x, float y, float z, float radius, CEntity* reason);
+	static void SetPedsChoking(float x, float y, float z, float radius, CEntity* reason);
+	static void SetPedsOnFire(float x, float y, float z, float radius, CEntity* reason);
+
+	static void Initialise();
+	static void AddParticles();
+	static void ShutDown();
+	static void ClearForRestart(void);
+	static void RepositionCertainDynamicObjects();
+	static void RepositionOneObject(CEntity* pEntity);
+	static void RemoveStaticObjects();
+	static void Process();
+	static void TriggerExplosion(const CVector& position, float fRadius, float fPower, CEntity* pCreator, bool bProcessVehicleBombTimer);
+	static void TriggerExplosionSectorList(CPtrList& list, const CVector& position, float fRadius, float fPower, CEntity* pCreator, bool bProcessVehicleBombTimer);
+	static void UseDetonator(CEntity *pEntity);
+
+	// NB: following functions are unused (TODO?)
+	static void CastShadow(float, float, float, float);
+	static void CastShadowSectorList(CPtrList&, float, float, float, float);
+	static void FindLowestZForCoord(float, float);
+	static void CheckBlockListIntegrity(void);
+	static void ProcessVerticalLineSectorList_FillGlobeColPoints(CPtrList&, const CColLine&, CEntity*&, bool, CStoredCollPoly*);
+	static void ProcessVerticalLineSector_FillGlobeColPoints(CSector&, const CColLine&, CEntity*&, bool, bool, bool, bool, bool, bool, CStoredCollPoly*);
+	static void ProcessVerticalLine_FillGlobeColPoints(const CVector&, float, CEntity*&, bool, bool, bool, bool, bool, bool, CStoredCollPoly*);
+	static void PrintCarChanges(void);
+	static void TestForBuildingsOnTopOfEachOther(CPtrList&);
+	static void TestForBuildingsOnTopOfEachOther(void);
+	static void TestForUnusedModels(CPtrList&, int*);
+	static void TestForUnusedModels(void);
+	static void HandleCollisionZoneChange(eLevelName, eLevelName);
+	static void DoZoneTestForChaser(class CPhysical*);
+	static void FindPlayerSlotWithPedPointer(void*);
+};
+
+extern CColPoint gaTempSphereColPoints[MAX_COLLISION_POINTS];
diff --git a/src/core/ZoneCull.cpp b/src/core/ZoneCull.cpp
new file mode 100644
index 0000000..db3577a
--- /dev/null
+++ b/src/core/ZoneCull.cpp
@@ -0,0 +1,172 @@
+#include "common.h"
+
+#include "Building.h"
+#include "Treadable.h"
+#include "Train.h"
+#include "Pools.h"
+#include "Timer.h"
+#include "Camera.h"
+#include "World.h"
+#include "FileMgr.h"
+#include "ZoneCull.h"
+#include "Zones.h"
+
+int32     CCullZones::NumAttributeZones;
+CAttributeZone CCullZones::aAttributeZones[NUMATTRIBZONES];
+
+int32 CCullZones::CurrentWantedLevelDrop_Player;
+int32 CCullZones::CurrentFlags_Camera;
+int32 CCullZones::CurrentFlags_Player;
+bool CCullZones::bCurrentSubwayIsInvisible;
+bool CCullZones::bAtBeachForAudio;
+
+void
+CCullZones::Init(void)
+{
+	NumAttributeZones = 0;
+	CurrentWantedLevelDrop_Player = 0;
+	CurrentFlags_Camera = 0;
+	CurrentFlags_Player = 0;
+	bCurrentSubwayIsInvisible = false;
+}
+
+void
+CCullZones::Update(void)
+{
+	bool invisible;
+
+	switch(CTimer::GetFrameCounter() & 7){
+	case 0:
+	case 4:
+		UpdateAtBeachForAudio();
+		break;
+
+	case 2:
+		/* Update camera attributes */
+		CurrentFlags_Camera = FindAttributesForCoors(TheCamera.GetGameCamPosition(), nil);
+		invisible = (CurrentFlags_Camera & ATTRZONE_SUBWAYVISIBLE) == 0;
+		if(invisible != bCurrentSubwayIsInvisible){
+			MarkSubwayAsInvisible(!invisible);
+			bCurrentSubwayIsInvisible = invisible;
+		}
+		break;
+
+	case 6:
+		/* Update player attributes */
+		CurrentFlags_Player = FindAttributesForCoors(FindPlayerCoors(),
+			&CurrentWantedLevelDrop_Player);
+		break;
+	}
+}
+
+// TODO? put somewhere else?
+bool
+IsPointWithinArbitraryArea(float px, float py, float x1, float y1, float x2, float y2, float x3, float y3, float x4, float y4)
+{
+	if((px-x1)*(x2-x1) - (py-y1)*(y2-y1) < 0.0f) return false;
+	if((px-x2)*(x3-x2) - (py-y2)*(y3-y2) < 0.0f) return false;
+	if((px-x3)*(x4-x3) - (py-y3)*(y4-y3) < 0.0f) return false;
+	if((px-x4)*(x1-x4) - (py-y4)*(y1-y4) < 0.0f) return false;
+	return true;
+}
+
+void
+CCullZones::UpdateAtBeachForAudio(void)
+{
+	bAtBeachForAudio = IsPointWithinArbitraryArea(TheCamera.GetPosition().x, TheCamera.GetPosition().y,
+		400.0f, -1644.4f,
+		751.9f, 1267.8f,
+		971.9f, 1216.2f,
+		840.0f, -1744.0f);
+}
+
+void
+CCullZones::ForceCullZoneCoors(CVector coors)
+{
+}
+
+int32
+CCullZones::FindAttributesForCoors(CVector coors, int32 *wantedLevel)
+{
+	int i;
+	int32 attribs;
+
+	if (wantedLevel)
+		*wantedLevel = 0;
+	attribs = 0;
+	for(i = 0; i < NumAttributeZones; i++)
+		if(coors.x >= aAttributeZones[i].minx && coors.x <= aAttributeZones[i].maxx &&
+		   coors.y >= aAttributeZones[i].miny && coors.y <= aAttributeZones[i].maxy &&
+		   coors.z >= aAttributeZones[i].minz && coors.z <= aAttributeZones[i].maxz){
+			attribs |= aAttributeZones[i].attributes;
+			if(wantedLevel)
+				*wantedLevel = Max(*wantedLevel, aAttributeZones[i].wantedLevel);
+		}
+	return attribs;
+}
+
+CAttributeZone*
+CCullZones::FindZoneWithStairsAttributeForPlayer(void)
+{
+	int i;
+	CVector coors;
+
+	coors = FindPlayerCoors();
+	for(i = 0; i < NumAttributeZones; i++)
+		if(aAttributeZones[i].attributes & ATTRZONE_STAIRS &&
+		   coors.x >= aAttributeZones[i].minx && coors.x <= aAttributeZones[i].maxx &&
+		   coors.y >= aAttributeZones[i].miny && coors.y <= aAttributeZones[i].maxy &&
+		   coors.z >= aAttributeZones[i].minz && coors.z <= aAttributeZones[i].maxz)
+			return &aAttributeZones[i];
+	return nil;
+}
+
+void
+CCullZones::MarkSubwayAsInvisible(bool visible)
+{
+	int i, n;
+	CEntity *e;
+	CVehicle *v;
+
+	n = CPools::GetBuildingPool()->GetSize()-1;
+	for(i = n; i >= 0; i--){
+		e = CPools::GetBuildingPool()->GetSlot(i);
+		if(e && e->bIsSubway)
+			e->bIsVisible = visible;
+	}
+
+	n = CPools::GetTreadablePool()->GetSize()-1;
+	for(i = n; i >= 0; i--){
+		e = CPools::GetTreadablePool()->GetSlot(i);
+		if(e && e->bIsSubway)
+			e->bIsVisible = visible;
+	}
+
+	n = CPools::GetVehiclePool()->GetSize()-1;
+	for(i = n; i >= 0; i--){
+		v = CPools::GetVehiclePool()->GetSlot(i);
+		if(v && v->IsTrain() && ((CTrain*)v)->m_nTrackId != TRACK_ELTRAIN)
+			v->bIsVisible = visible;
+	}
+}
+
+void
+CCullZones::AddCullZone(CVector const &position,
+                        float minx, float maxx,
+                        float miny, float maxy,
+                        float minz, float maxz,
+                        uint16 flag, int16 wantedLevel)
+{
+	CAttributeZone *attrib;
+
+	assert(NumAttributeZones < NUMATTRIBZONES);
+	attrib = &aAttributeZones[NumAttributeZones++];
+	attrib->minx = minx;
+	attrib->maxx = maxx;
+	attrib->miny = miny;
+	attrib->maxy = maxy;
+	attrib->minz = minz;
+	attrib->maxz = maxz;
+	attrib->attributes = flag;
+	attrib->wantedLevel = wantedLevel;
+}
diff --git a/src/core/ZoneCull.h b/src/core/ZoneCull.h
new file mode 100644
index 0000000..d7780ca
--- /dev/null
+++ b/src/core/ZoneCull.h
@@ -0,0 +1,65 @@
+class CEntity;
+
+enum eZoneAttribs
+{
+	ATTRZONE_CAMCLOSEIN		= 1,
+	ATTRZONE_STAIRS			= 2,
+	ATTRZONE_1STPERSON		= 4,
+	ATTRZONE_NORAIN			= 8,
+	ATTRZONE_NOPOLICE		= 0x10,
+	ATTRZONE_NOTCULLZONE		= 0x20,
+	ATTRZONE_DOINEEDCOLLISION	= 0x40,
+	ATTRZONE_SUBWAYVISIBLE		= 0x80,
+	ATTRZONE_POLICEABANDONCARS	= 0x100,
+	ATTRZONE_ROOMFORAUDIO		= 0x200,
+	ATTRZONE_WATERFUDGE		= 0x400,
+};
+
+struct CAttributeZone
+{
+	int16 minx;
+	int16 maxx;
+	int16 miny;
+	int16 maxy;
+	int16 minz;
+	int16 maxz;
+	int16 attributes;
+	int16 wantedLevel;
+};
+
+class CCullZones
+{
+public:
+	static int32     NumAttributeZones;
+	static CAttributeZone aAttributeZones[NUMATTRIBZONES];
+
+	static int32 CurrentWantedLevelDrop_Player;
+	static int32 CurrentFlags_Camera;
+	static int32 CurrentFlags_Player;
+	static bool bCurrentSubwayIsInvisible;
+	static bool bAtBeachForAudio;
+
+	static void Init(void);
+	static void Update(void);
+	static void UpdateAtBeachForAudio(void);
+	static void ForceCullZoneCoors(CVector coors);
+	static int32 FindAttributesForCoors(CVector coors, int32 *wantedLevel);
+	static CAttributeZone *FindZoneWithStairsAttributeForPlayer(void);
+	static void MarkSubwayAsInvisible(bool visible);
+	static void AddCullZone(CVector const &position,
+		float minx, float maxx,
+		float miny, float maxy,
+		float minz, float maxz,
+		uint16 flag, int16 wantedLevel);
+	static bool CamCloseInForPlayer(void) { return (CurrentFlags_Player & ATTRZONE_CAMCLOSEIN) != 0; }
+	static bool CamStairsForPlayer(void) { return (CurrentFlags_Player & ATTRZONE_STAIRS) != 0; }
+	static bool Cam1stPersonForPlayer(void) { return (CurrentFlags_Player & ATTRZONE_1STPERSON) != 0; }
+	static bool NoPolice(void) { return (CurrentFlags_Player & ATTRZONE_NOPOLICE) != 0; }
+	static bool DoINeedToLoadCollision(void) { return (CurrentFlags_Player & ATTRZONE_DOINEEDCOLLISION) != 0; }
+	static bool PlayerNoRain(void) { return (CurrentFlags_Player & ATTRZONE_NORAIN) != 0; }
+	static bool CamNoRain(void) { return (CurrentFlags_Camera & ATTRZONE_NORAIN) != 0; }
+	static bool PoliceAbandonCars(void) { return (CurrentFlags_Camera & ATTRZONE_POLICEABANDONCARS) != 0; }
+	static bool InRoomForAudio(void) { return (CurrentFlags_Camera & ATTRZONE_ROOMFORAUDIO) != 0; }
+	static bool WaterFudge(void) { return (CurrentFlags_Camera & ATTRZONE_WATERFUDGE) != 0; }
+	static int32 GetWantedLevelDrop(void) { return CurrentWantedLevelDrop_Player; }
+};
diff --git a/src/core/Zones.cpp b/src/core/Zones.cpp
new file mode 100644
index 0000000..85564f0
--- /dev/null
+++ b/src/core/Zones.cpp
@@ -0,0 +1,772 @@
+#include "common.h"
+
+#include <ctype.h>
+
+#include "Zones.h"
+
+#include "Clock.h"
+#include "Text.h"
+#include "World.h"
+#include "Timer.h"
+
+eLevelName CTheZones::m_CurrLevel;
+int16 CTheZones::FindIndex;
+
+uint16 CTheZones::NumberOfAudioZones;
+int16 CTheZones::AudioZoneArray[NUMAUDIOZONES];
+uint16 CTheZones::TotalNumberOfMapZones;
+uint16 CTheZones::TotalNumberOfInfoZones;
+uint16 CTheZones::TotalNumberOfNavigationZones;
+CZone CTheZones::InfoZoneArray[NUMINFOZONES];
+CZone CTheZones::MapZoneArray[NUMMAPZONES];
+CZone CTheZones::NavigationZoneArray[NUMNAVIGZONES];
+uint16 CTheZones::TotalNumberOfZoneInfos;
+CZoneInfo CTheZones::ZoneInfoArray[2*NUMINFOZONES];
+
+
+#define SWAPF(a, b) { float t; t = a; a = b; b = t; }
+
+wchar*
+CZone::GetTranslatedName(void)
+{
+	return TheText.Get(name);
+}
+
+void
+CTheZones::Init(void)
+{
+	int i, j;
+	for(i = 0; i < NUMAUDIOZONES; i++)
+		AudioZoneArray[i] = -1;
+	NumberOfAudioZones = 0;
+
+	for(i = 0; i < NUMNAVIGZONES; i++)
+		memset(&NavigationZoneArray[i], 0, sizeof(CZone));
+
+	for(i = 0; i < NUMINFOZONES; i++)
+		memset(&InfoZoneArray[i], 0, sizeof(CZone));
+
+	int x = 1000/9;
+	for(i = 0; i < 2*NUMINFOZONES; i++){
+		// Cars
+
+		ZoneInfoArray[i].carDensity = 10;
+		ZoneInfoArray[i].carThreshold[0] = x;
+		ZoneInfoArray[i].carThreshold[1] = ZoneInfoArray[i].carThreshold[0] + x;
+		ZoneInfoArray[i].carThreshold[2] = ZoneInfoArray[i].carThreshold[1] + x;
+		ZoneInfoArray[i].carThreshold[3] = ZoneInfoArray[i].carThreshold[2] + x;
+		ZoneInfoArray[i].carThreshold[4] = ZoneInfoArray[i].carThreshold[3] + x;
+		ZoneInfoArray[i].carThreshold[5] = ZoneInfoArray[i].carThreshold[4] + x;
+		ZoneInfoArray[i].carThreshold[6] = ZoneInfoArray[i].carThreshold[5] + x;
+		ZoneInfoArray[i].carThreshold[7] = ZoneInfoArray[i].carThreshold[6] + x;
+		ZoneInfoArray[i].carThreshold[8] = 1000;
+
+		ZoneInfoArray[i].boatThreshold[0] = 500;
+		ZoneInfoArray[i].boatThreshold[1] = 1000;
+
+		// What's going on here? this looks more like density
+		ZoneInfoArray[i].copThreshold = 50;
+		for(j = 0; j < NUM_GANGS; j++)
+			ZoneInfoArray[i].gangThreshold[j] = ZoneInfoArray[i].copThreshold;
+
+		// Peds
+
+		ZoneInfoArray[i].pedDensity = 12;
+
+		// What's going on here? this looks more like density
+		ZoneInfoArray[i].copPedThreshold = 50;
+		for(j = 0; j < NUM_GANGS; j++)
+			ZoneInfoArray[i].gangPedThreshold[j] = ZoneInfoArray[i].copPedThreshold;
+
+		ZoneInfoArray[i].pedGroup = 0;
+	}
+
+	TotalNumberOfZoneInfos = 1;	// why 1?
+	TotalNumberOfNavigationZones = 1;
+	TotalNumberOfInfoZones = 1;
+
+	strcpy(InfoZoneArray[0].name, "CITYINF");
+	InfoZoneArray[0].minx = -2400.0f;
+	InfoZoneArray[0].miny = -2000.0f;
+	InfoZoneArray[0].minz = -500.0f;
+	InfoZoneArray[0].maxx =  1600.0f;
+	InfoZoneArray[0].maxy =  2000.0f;
+	InfoZoneArray[0].maxz =  500.0f;
+	InfoZoneArray[0].level = LEVEL_GENERIC;
+	InfoZoneArray[0].type = ZONE_INFO;
+
+	strcpy(NavigationZoneArray[0].name, "VICE_C");
+	NavigationZoneArray[0].minx = -2400.0f;
+	NavigationZoneArray[0].miny = -2000.0f;
+	NavigationZoneArray[0].minz = -500.0f;
+	NavigationZoneArray[0].maxx =  1600.0f;
+	NavigationZoneArray[0].maxy =  2000.0f;
+	NavigationZoneArray[0].maxz =  500.0f;
+	NavigationZoneArray[0].level = LEVEL_GENERIC;
+	NavigationZoneArray[0].type = ZONE_DEFAULT;
+
+	m_CurrLevel = LEVEL_GENERIC;
+
+	for(i = 0; i < NUMMAPZONES; i++){
+		memset(&MapZoneArray[i], 0, sizeof(CZone));
+		MapZoneArray[i].type = ZONE_MAPZONE;
+	}
+	TotalNumberOfMapZones = 1;
+	strcpy(MapZoneArray[0].name, "THEMAP");
+	MapZoneArray[0].minx = -2400.0f;
+	MapZoneArray[0].miny = -2000.0f;
+	MapZoneArray[0].minz = -500.0f;
+	MapZoneArray[0].maxx =  1600.0f;
+	MapZoneArray[0].maxy =  2000.0f;
+	MapZoneArray[0].maxz =  500.0f;
+	MapZoneArray[0].level = LEVEL_GENERIC;
+}
+
+void
+CTheZones::Update(void)
+{
+#ifdef SQUEEZE_PERFORMANCE
+	if (CTimer::GetFrameCounter() % 5 != 0)
+		return;
+#endif
+	CVector pos;
+	pos = FindPlayerCoors();
+	m_CurrLevel = GetLevelFromPosition(&pos);
+}
+
+void
+CTheZones::CreateZone(char *name, eZoneType type,
+	              float minx, float miny, float minz,
+	              float maxx, float maxy, float maxz,
+	              eLevelName level)
+{
+	char tmpname[24];
+	char *p;
+
+	if(minx > maxx) SWAPF(minx, maxx);
+	if(miny > maxy) SWAPF(miny, maxy);
+	if(minz > maxz) SWAPF(minz, maxz);
+
+	// make upper case
+	for(p = name; *p; p++) if(islower(*p)) *p = toupper(*p);
+
+	strncpy(tmpname, name, 7);
+	tmpname[7] = '\0';
+
+	// add zone
+	switch(type){
+	case ZONE_DEFAULT:
+	case ZONE_NAVIG:
+		assert(TotalNumberOfNavigationZones < NUMNAVIGZONES);
+		strcpy(NavigationZoneArray[TotalNumberOfNavigationZones].name, tmpname);
+		NavigationZoneArray[TotalNumberOfNavigationZones].type = type;
+		NavigationZoneArray[TotalNumberOfNavigationZones].minx = minx;
+		NavigationZoneArray[TotalNumberOfNavigationZones].miny = miny;
+		NavigationZoneArray[TotalNumberOfNavigationZones].minz = minz;
+		NavigationZoneArray[TotalNumberOfNavigationZones].maxx = maxx;
+		NavigationZoneArray[TotalNumberOfNavigationZones].maxy = maxy;
+		NavigationZoneArray[TotalNumberOfNavigationZones].maxz = maxz;
+		NavigationZoneArray[TotalNumberOfNavigationZones].level = level;
+		TotalNumberOfNavigationZones++;
+		break;
+	case ZONE_INFO:
+		assert(TotalNumberOfInfoZones < NUMINFOZONES);
+		strcpy(InfoZoneArray[TotalNumberOfInfoZones].name, tmpname);
+		InfoZoneArray[TotalNumberOfInfoZones].type = type;
+		InfoZoneArray[TotalNumberOfInfoZones].minx = minx;
+		InfoZoneArray[TotalNumberOfInfoZones].miny = miny;
+		InfoZoneArray[TotalNumberOfInfoZones].minz = minz;
+		InfoZoneArray[TotalNumberOfInfoZones].maxx = maxx;
+		InfoZoneArray[TotalNumberOfInfoZones].maxy = maxy;
+		InfoZoneArray[TotalNumberOfInfoZones].maxz = maxz;
+		InfoZoneArray[TotalNumberOfInfoZones].level = level;
+		InfoZoneArray[TotalNumberOfInfoZones].zoneinfoDay = TotalNumberOfZoneInfos++;
+		InfoZoneArray[TotalNumberOfInfoZones].zoneinfoNight = TotalNumberOfZoneInfos++;
+		TotalNumberOfInfoZones++;
+		break;
+	case ZONE_MAPZONE:
+		assert(TotalNumberOfMapZones < NUMMAPZONES);
+		strcpy(MapZoneArray[TotalNumberOfMapZones].name, tmpname);
+		MapZoneArray[TotalNumberOfMapZones].type = type;
+		MapZoneArray[TotalNumberOfMapZones].minx = minx;
+		MapZoneArray[TotalNumberOfMapZones].miny = miny;
+		MapZoneArray[TotalNumberOfMapZones].minz = minz;
+		MapZoneArray[TotalNumberOfMapZones].maxx = maxx;
+		MapZoneArray[TotalNumberOfMapZones].maxy = maxy;
+		MapZoneArray[TotalNumberOfMapZones].maxz = maxz;
+		MapZoneArray[TotalNumberOfMapZones].level = level;
+		TotalNumberOfMapZones++;
+		break;
+	}
+}
+
+void
+CTheZones::PostZoneCreation(void)
+{
+	int i;
+	for(i = 1; i < TotalNumberOfNavigationZones; i++)
+		InsertZoneIntoZoneHierarchy(&NavigationZoneArray[i]);
+	InitialiseAudioZoneArray();
+#ifndef MASTER
+	CheckZonesForOverlap();
+#endif
+}
+
+void
+CTheZones::CheckZonesForOverlap(void)
+{
+	int i, j;
+	char str[116];
+
+	for(i = 1; i < TotalNumberOfInfoZones; i++){
+		ZoneIsEntirelyContainedWithinOtherZone(&InfoZoneArray[i], &InfoZoneArray[0]);
+		
+		for(j = 1; j < TotalNumberOfInfoZones; j++)
+			if(i != j && ZoneIsEntirelyContainedWithinOtherZone(&InfoZoneArray[i], &InfoZoneArray[j]))
+				sprintf(str, "Info zone %s contains %s\n", InfoZoneArray[j].name, InfoZoneArray[i].name);
+	}
+}
+
+void
+CTheZones::InsertZoneIntoZoneHierarchy(CZone *zone)
+{
+	zone->child = nil;
+	zone->parent = nil;
+	zone->next = nil;
+	InsertZoneIntoZoneHierRecursive(zone, &NavigationZoneArray[0]);
+}
+
+bool
+CTheZones::InsertZoneIntoZoneHierRecursive(CZone *inner, CZone *outer)
+{
+	int n;
+	CZone *child, *next, *insert;
+
+	// return false if inner was not inserted into outer
+	if(outer == nil ||
+	   !ZoneIsEntirelyContainedWithinOtherZone(inner, outer))
+		return false;
+
+	// try to insert inner into children of outer
+	for(child = outer->child; child; child = child->next)
+		if(InsertZoneIntoZoneHierRecursive(inner, child))
+			return true;
+
+	// insert inner as child of outer
+	// count number of outer's children contained within inner
+	n = 0;
+	for(child = outer->child; child; child = child->next)
+		if(ZoneIsEntirelyContainedWithinOtherZone(child, inner))
+			n++;
+	inner->next = outer->child;
+	inner->parent = outer;
+	outer->child = inner;
+	// move children from outer to inner
+	if(n){
+		insert = inner;
+		for(child = inner->next; child; child = next){
+			next = child->next;
+			if(ZoneIsEntirelyContainedWithinOtherZone(child,inner)){
+				insert->next = child->next;
+				child->parent = inner;
+				child->next = inner->child;
+				inner->child = child;
+			}else
+				insert = child;
+		}
+	}
+
+	return true;
+}
+
+bool
+CTheZones::ZoneIsEntirelyContainedWithinOtherZone(CZone *inner, CZone *outer)
+{
+	char tmp[100];
+
+	if(inner->minx < outer->minx ||
+	   inner->maxx > outer->maxx ||
+	   inner->miny < outer->miny ||
+	   inner->maxy > outer->maxy ||
+	   inner->minz < outer->minz ||
+	   inner->maxz > outer->maxz){
+		CVector vmin(inner->minx, inner->miny, inner->minz);
+		if(PointLiesWithinZone(&vmin, outer))
+			sprintf(tmp, "Overlapping zones %s and %s\n",
+			      inner->name, outer->name);
+		CVector vmax(inner->maxx, inner->maxy, inner->maxz);
+		if(PointLiesWithinZone(&vmax, outer))
+			sprintf(tmp, "Overlapping zones %s and %s\n",
+			      inner->name, outer->name);
+		return false;
+	}
+	return true;
+}
+
+bool
+CTheZones::PointLiesWithinZone(const CVector *v, CZone *zone)
+{
+	return zone->minx <= v->x && v->x <= zone->maxx &&
+	       zone->miny <= v->y && v->y <= zone->maxy &&
+	       zone->minz <= v->z && v->z <= zone->maxz;
+}
+
+eLevelName
+CTheZones::GetLevelFromPosition(CVector const *v)
+{
+	int i;
+//	char tmp[116];
+//	if(!PointLiesWithinZone(v, &MapZoneArray[0]))
+//		sprintf(tmp, "x = %.3f y= %.3f z = %.3f\n", v.x, v.y, v.z);
+	for(i = 1; i < TotalNumberOfMapZones; i++)
+		if(PointLiesWithinZone(v, &MapZoneArray[i]))
+			return MapZoneArray[i].level;
+	return MapZoneArray[0].level;
+}
+
+CZone*
+CTheZones::FindInformationZoneForPosition(const CVector *v)
+{
+	int i;
+//	char tmp[116];
+//	if(!PointLiesWithinZone(v, &InfoZoneArray[0]))
+//		sprintf(tmp, "x = %.3f y= %.3f z = %.3f\n", v.x, v.y, v.z);
+	for(i = 1; i < TotalNumberOfInfoZones; i++)
+		if(PointLiesWithinZone(v, &InfoZoneArray[i]))
+			return &InfoZoneArray[i];
+	return &InfoZoneArray[0];
+}
+
+CZone*
+CTheZones::FindSmallestNavigationZoneForPosition(const CVector *v, bool findDefault, bool findNavig)
+{
+	CZone *best = nil;
+	if(findDefault && NavigationZoneArray[0].type == ZONE_DEFAULT ||
+	   findNavig && NavigationZoneArray[0].type == ZONE_NAVIG)
+		best = &NavigationZoneArray[0];
+	// zone to test next
+	CZone *zone = NavigationZoneArray[0].child;
+	while(zone)
+		// if in zone, descent into children
+		if(PointLiesWithinZone(v, zone)){
+			if(findDefault && zone->type == ZONE_DEFAULT ||
+			   findNavig && zone->type == ZONE_NAVIG)
+				best = zone;
+			zone = zone->child;
+		// otherwise try next zone
+		}else
+			zone = zone->next;
+	return best;
+}
+
+int16
+CTheZones::FindZoneByLabelAndReturnIndex(char *name, eZoneType type)
+{
+	char str[8];
+	memset(str, 0, 8);
+	strncpy(str, name, 8);
+	switch(type){
+	case ZONE_DEFAULT:
+	case ZONE_NAVIG:
+		for(FindIndex = 0; FindIndex < TotalNumberOfNavigationZones; FindIndex++)
+			if(strcmp(GetNavigationZone(FindIndex)->name, name) == 0)
+				return FindIndex;
+		break;
+
+	case ZONE_INFO:
+		for(FindIndex = 0; FindIndex < TotalNumberOfInfoZones; FindIndex++)
+			if(strcmp(GetInfoZone(FindIndex)->name, name) == 0)
+				return FindIndex;
+		break;
+
+	case ZONE_MAPZONE:
+		for(FindIndex = 0; FindIndex < TotalNumberOfMapZones; FindIndex++)
+			if(strcmp(GetMapZone(FindIndex)->name, name) == 0)
+				return FindIndex;
+		break;
+	}
+	return -1;
+}
+
+int16
+CTheZones::FindNextZoneByLabelAndReturnIndex(char *name, eZoneType type)
+{
+	char str[8];
+	++FindIndex;
+	memset(str, 0, 8);
+	strncpy(str, name, 8);
+	switch(type){
+	case ZONE_DEFAULT:
+	case ZONE_NAVIG:
+		for(; FindIndex < TotalNumberOfNavigationZones; FindIndex++)
+			if(strcmp(GetNavigationZone(FindIndex)->name, name) == 0)
+				return FindIndex;
+		break;
+
+	case ZONE_INFO:
+		for(; FindIndex < TotalNumberOfInfoZones; FindIndex++)
+			if(strcmp(GetInfoZone(FindIndex)->name, name) == 0)
+				return FindIndex;
+		break;
+
+	case ZONE_MAPZONE:
+		for(; FindIndex < TotalNumberOfMapZones; FindIndex++)
+			if(strcmp(GetMapZone(FindIndex)->name, name) == 0)
+				return FindIndex;
+		break;
+	}
+	return -1;
+}
+
+CZoneInfo*
+CTheZones::GetZoneInfo(const CVector *v, uint8 day)
+{
+	CZone *zone;
+	zone = FindInformationZoneForPosition(v);
+	if(zone == nil)
+		return &ZoneInfoArray[0];
+	return &ZoneInfoArray[day ? zone->zoneinfoDay : zone->zoneinfoNight];
+}
+
+void
+CTheZones::GetZoneInfoForTimeOfDay(const CVector *pos, CZoneInfo *info)
+{
+	CZoneInfo *day, *night;
+	float d, n;
+	int i;
+
+	day = GetZoneInfo(pos, 1);
+	night = GetZoneInfo(pos, 0);
+
+	if(CClock::GetIsTimeInRange(8, 19))
+		*info = *day;
+	else if(CClock::GetIsTimeInRange(22, 5))
+		*info = *night;
+	else{
+		if(CClock::GetIsTimeInRange(19, 22)){
+			n = (CClock::GetHours() - 19) / 3.0f;
+			assert(n >= 0.0f && n <= 1.0f);
+			d = 1.0f - n;
+		}else{
+			d = (CClock::GetHours() - 5) / 3.0f;
+			assert(d >= 0.0f && d <= 1.0f);
+			n = 1.0f - d;
+		}
+		info->carDensity = day->carDensity * d + night->carDensity * n;
+		for(i = 0; i < ARRAY_SIZE(info->carThreshold); i++)
+			info->carThreshold[i] = day->carThreshold[i] * d + night->carThreshold[i] * n;
+		for(i = 0; i < ARRAY_SIZE(info->boatThreshold); i++)
+			info->boatThreshold[i] = day->boatThreshold[i] * d + night->boatThreshold[i] * n;
+		for(i = 0; i < ARRAY_SIZE(info->gangThreshold); i++)
+			info->gangThreshold[i] = day->gangThreshold[i] * d + night->gangThreshold[i] * n;
+
+		info->copThreshold = day->copThreshold * d + night->copThreshold * n;
+		info->pedDensity = day->pedDensity * d + night->pedDensity * n;
+		info->copPedThreshold = day->copPedThreshold * d + night->copPedThreshold * n;
+		for(i = 0; i < ARRAY_SIZE(info->gangPedThreshold); i++)
+			info->gangPedThreshold[i] = day->gangPedThreshold[i] * d + night->gangPedThreshold[i] * n;
+	}
+	if(CClock::GetIsTimeInRange(5, 19))
+		info->pedGroup = day->pedGroup;
+	else
+		info->pedGroup = night->pedGroup;
+}
+
+void
+CTheZones::SetZoneCarInfo(uint16 zoneid, uint8 day, int16 carDensity,
+	int16 copCarDensity, const int16 *gangCarDensities)
+{
+	CZone *zone;
+	CZoneInfo *info;
+	zone = GetInfoZone(zoneid);
+	info = &ZoneInfoArray[day ? zone->zoneinfoDay : zone->zoneinfoNight];
+
+	info->carDensity = carDensity;
+	info->copThreshold = copCarDensity;
+	info->gangThreshold[0] = gangCarDensities[0] + copCarDensity;
+	info->gangThreshold[1] = gangCarDensities[1] + info->gangThreshold[0];
+	info->gangThreshold[2] = gangCarDensities[2] + info->gangThreshold[1];
+	info->gangThreshold[3] = gangCarDensities[3] + info->gangThreshold[2];
+	info->gangThreshold[4] = gangCarDensities[4] + info->gangThreshold[3];
+	info->gangThreshold[5] = gangCarDensities[5] + info->gangThreshold[4];
+	info->gangThreshold[6] = gangCarDensities[6] + info->gangThreshold[5];
+	info->gangThreshold[7] = gangCarDensities[7] + info->gangThreshold[6];
+	info->gangThreshold[8] = gangCarDensities[8] + info->gangThreshold[7];
+}
+
+void CTheZones::SetZoneCivilianCarInfo(uint16 zoneid, uint8 day,
+	const int16* carDensities, const int16* boatDensities)
+{
+	CZone* zone;
+	CZoneInfo* info;
+	zone = GetInfoZone(zoneid);
+	info = &ZoneInfoArray[day ? zone->zoneinfoDay : zone->zoneinfoNight];
+	info->carThreshold[0] = carDensities[0];
+	for (int i = 1; i < CCarCtrl::NUM_CAR_CLASSES; i++)
+		info->carThreshold[i] = carDensities[i] + info->carThreshold[i-1];
+	info->boatThreshold[0] = boatDensities[0];
+	for (int i = 1; i < CCarCtrl::NUM_BOAT_CLASSES; i++)
+		info->boatThreshold[i] = boatDensities[i] + info->boatThreshold[i - 1];
+}
+
+void
+CTheZones::SetZonePedInfo(uint16 zoneid, uint8 day, int16 pedDensity,
+	int16 gang0Density, int16 gang1Density, int16 gang2Density, int16 gang3Density,
+	int16 gang4Density, int16 gang5Density, int16 gang6Density, int16 gang7Density,
+	int16 gang8Density, int16 copDensity)
+{
+	CZone *zone;
+	CZoneInfo *info;
+	zone = GetInfoZone(zoneid);
+	info = &ZoneInfoArray[day ? zone->zoneinfoDay : zone->zoneinfoNight];
+	info->pedDensity = pedDensity;
+	info->copPedThreshold = copDensity;
+	info->gangPedThreshold[0] = gang0Density;
+	info->gangPedThreshold[1] = gang1Density;
+	info->gangPedThreshold[2] = gang2Density;
+	info->gangPedThreshold[3] = gang3Density;
+	info->gangPedThreshold[4] = gang4Density;
+	info->gangPedThreshold[5] = gang5Density;
+	info->gangPedThreshold[6] = gang6Density;
+	info->gangPedThreshold[7] = gang7Density;
+	info->gangPedThreshold[8] = gang8Density;
+
+	info->gangPedThreshold[0] += info->copPedThreshold;
+	info->gangPedThreshold[1] += info->gangPedThreshold[0];
+	info->gangPedThreshold[2] += info->gangPedThreshold[1];
+	info->gangPedThreshold[3] += info->gangPedThreshold[2];
+	info->gangPedThreshold[4] += info->gangPedThreshold[3];
+	info->gangPedThreshold[5] += info->gangPedThreshold[4];
+	info->gangPedThreshold[6] += info->gangPedThreshold[5];
+	info->gangPedThreshold[7] += info->gangPedThreshold[6];
+	info->gangPedThreshold[8] += info->gangPedThreshold[7];
+}
+
+// unused
+void
+CTheZones::SetCarDensity(uint16 zoneid, uint8 day, uint16 cardensity)
+{
+	CZone *zone;
+	zone = GetInfoZone(zoneid);
+	ZoneInfoArray[day ? zone->zoneinfoDay : zone->zoneinfoNight].carDensity = cardensity;
+}
+
+// unused
+void
+CTheZones::SetPedDensity(uint16 zoneid, uint8 day, uint16 peddensity)
+{
+	CZone *zone;
+	zone = GetInfoZone(zoneid);
+	ZoneInfoArray[day ? zone->zoneinfoDay : zone->zoneinfoNight].pedDensity = peddensity;
+}
+
+void
+CTheZones::SetPedGroup(uint16 zoneid, uint8 day, uint16 pedgroup)
+{
+	CZone *zone;
+	zone = GetInfoZone(zoneid);
+	ZoneInfoArray[day ? zone->zoneinfoDay : zone->zoneinfoNight].pedGroup = pedgroup;
+}
+
+int16
+CTheZones::FindAudioZone(CVector *pos)
+{
+	int i;
+
+	for(i = 0; i < NumberOfAudioZones; i++)
+		if(PointLiesWithinZone(pos, GetAudioZone(i)))
+			return i;
+	return -1;
+}
+
+void
+CTheZones::AddZoneToAudioZoneArray(CZone *zone)
+{
+	int i, z;
+
+	if(zone->type != ZONE_DEFAULT)
+		return;
+
+	/* This is a bit stupid */
+	z = -1;
+	for(i = 0; i < NUMNAVIGZONES; i++)
+		if(&NavigationZoneArray[i] == zone)
+			z = i;
+	assert(NumberOfAudioZones < NUMAUDIOZONES);
+	AudioZoneArray[NumberOfAudioZones++] = z;
+}
+
+void
+CTheZones::InitialiseAudioZoneArray(void)
+{
+	bool gonext;
+	CZone *zone;
+
+	gonext = false;
+	zone = &NavigationZoneArray[0];
+	// Go deep first,
+	// set gonext when backing up a level to visit the next child
+	while(zone)
+		if(gonext){
+			AddZoneToAudioZoneArray(zone);
+			if(zone->next){
+				gonext = false;
+				zone = zone->next;
+			}else
+				zone = zone->parent;
+		}else if(zone->child)
+			zone = zone->child;
+		else{
+			AddZoneToAudioZoneArray(zone);
+			if(zone->next)
+				zone = zone->next;
+			else{
+				gonext = true;
+				zone = zone->parent;
+			}
+		}
+}
+
+void
+CTheZones::SaveAllZones(uint8 *buffer, uint32 *size)
+{
+	INITSAVEBUF
+	int i;
+
+#define CZONE_SAVE_SIZE (sizeof(char)*8+sizeof(float)+sizeof(float)+sizeof(float)+sizeof(float)+sizeof(float)+sizeof(float)+sizeof(eZoneType)+sizeof(eLevelName)+sizeof(int16)+sizeof(int16)+sizeof(int32)+sizeof(int32)+sizeof(int32))
+
+	*size = SAVE_HEADER_SIZE
+		+ sizeof(m_CurrLevel) + sizeof(FindIndex)
+		+ sizeof(int16) // padding
+		+ CZONE_SAVE_SIZE * ARRAY_SIZE(NavigationZoneArray) + CZONE_SAVE_SIZE * ARRAY_SIZE(InfoZoneArray) + sizeof(ZoneInfoArray)
+		+ sizeof(TotalNumberOfNavigationZones) + sizeof(TotalNumberOfInfoZones) + sizeof(TotalNumberOfZoneInfos)
+		+ sizeof(int16) // padding
+		+ CZONE_SAVE_SIZE * ARRAY_SIZE(MapZoneArray) + sizeof(AudioZoneArray)
+		+ sizeof(TotalNumberOfMapZones) + sizeof(NumberOfAudioZones);
+#undef CZONE_SAVE_SIZE
+
+	uint32 length = 0;
+	WriteSaveHeaderWithLength(buffer, length, 'Z', 'N', 'S', '\0', *size - SAVE_HEADER_SIZE);
+
+	WriteSaveBuf(buffer, length, m_CurrLevel);
+	WriteSaveBuf(buffer, length, FindIndex);
+	WriteSaveBuf(buffer, length, (int16)0); // padding
+
+	for(i = 0; i < ARRAY_SIZE(NavigationZoneArray); i++)
+		SaveOneZone(&NavigationZoneArray[i], &buffer, &length, ZONE_NAVIG);
+
+	for(i = 0; i < ARRAY_SIZE(InfoZoneArray); i++)
+		SaveOneZone(&InfoZoneArray[i], &buffer, &length, ZONE_INFO);
+
+	for(i = 0; i < ARRAY_SIZE(ZoneInfoArray); i++)
+		WriteSaveBuf(buffer, length, ZoneInfoArray[i]);
+
+	WriteSaveBuf(buffer, length, TotalNumberOfNavigationZones);
+	WriteSaveBuf(buffer, length, TotalNumberOfInfoZones);
+	WriteSaveBuf(buffer, length, TotalNumberOfZoneInfos);
+	WriteSaveBuf(buffer, length, (int16)0); // padding
+
+	for(i = 0; i < ARRAY_SIZE(MapZoneArray); i++)
+		SaveOneZone(&MapZoneArray[i], &buffer, &length, ZONE_MAPZONE);
+
+	for(i = 0; i < ARRAY_SIZE(AudioZoneArray); i++)
+		WriteSaveBuf(buffer, length, AudioZoneArray[i]);
+
+	WriteSaveBuf(buffer, length, TotalNumberOfMapZones);
+	WriteSaveBuf(buffer, length, NumberOfAudioZones);
+
+	VALIDATESAVEBUF(*size)
+}
+
+void
+CTheZones::SaveOneZone(CZone *zone, uint8 **buffer, uint32 *length, eZoneType zoneType)
+{
+	WriteSaveBuf(*buffer, *length, *(uint32*)&zone->name[0]);
+	WriteSaveBuf(*buffer, *length, *(uint32*)&zone->name[4]);
+
+	WriteSaveBuf(*buffer, *length, zone->minx);
+	WriteSaveBuf(*buffer, *length, zone->miny);
+	WriteSaveBuf(*buffer, *length, zone->minz);
+	WriteSaveBuf(*buffer, *length, zone->maxx);
+	WriteSaveBuf(*buffer, *length, zone->maxy);
+	WriteSaveBuf(*buffer, *length, zone->maxz);
+
+	WriteSaveBuf(*buffer, *length, zone->type);
+	WriteSaveBuf(*buffer, *length, zone->level);
+	WriteSaveBuf(*buffer, *length, zone->zoneinfoDay);
+	WriteSaveBuf(*buffer, *length, zone->zoneinfoNight);
+
+	int32 zoneId;
+	zoneId = GetIndexForZonePointer(zone->child);
+	WriteSaveBuf(*buffer, *length, zoneId);
+	zoneId = GetIndexForZonePointer(zone->parent);
+	WriteSaveBuf(*buffer, *length, zoneId);
+	zoneId = GetIndexForZonePointer(zone->next);
+	WriteSaveBuf(*buffer, *length, zoneId);
+}
+
+void
+CTheZones::LoadAllZones(uint8 *buffer, uint32 size)
+{
+	INITSAVEBUF
+	int i;
+
+	uint32 length = 0;
+	CheckSaveHeaderWithLength(buffer, length, 'Z', 'N', 'S', '\0', size - SAVE_HEADER_SIZE);
+
+	m_CurrLevel = ReadSaveBuf<eLevelName>(buffer, length);
+	FindIndex = ReadSaveBuf<int16>(buffer, length);
+	ReadSaveBuf<int16>(buffer, length);
+
+	for(i = 0; i < ARRAY_SIZE(NavigationZoneArray); i++)
+		LoadOneZone(&NavigationZoneArray[i], &buffer, &length, ZONE_NAVIG);
+
+	for (i = 0; i < ARRAY_SIZE(InfoZoneArray); i++)
+		LoadOneZone(&InfoZoneArray[i], &buffer, &length, ZONE_INFO);
+
+	for(i = 0; i < ARRAY_SIZE(ZoneInfoArray); i++)
+		ZoneInfoArray[i] = ReadSaveBuf<CZoneInfo>(buffer, length);
+
+	TotalNumberOfNavigationZones = ReadSaveBuf<int16>(buffer, length);
+	TotalNumberOfInfoZones = ReadSaveBuf<int16>(buffer, length);
+	TotalNumberOfZoneInfos = ReadSaveBuf<int16>(buffer, length);
+	ReadSaveBuf<int16>(buffer, length);
+
+	for(i = 0; i < ARRAY_SIZE(MapZoneArray); i++)
+		LoadOneZone(&MapZoneArray[i], &buffer, &length, ZONE_MAPZONE);
+
+	for(i = 0; i < ARRAY_SIZE(AudioZoneArray); i++)
+		AudioZoneArray[i] = ReadSaveBuf<int16>(buffer, length);
+
+	TotalNumberOfMapZones = ReadSaveBuf<uint16>(buffer, length);
+	NumberOfAudioZones = ReadSaveBuf<uint16>(buffer, length);
+
+	VALIDATESAVEBUF(size)
+}
+
+void
+CTheZones::LoadOneZone(CZone *zone, uint8 **buffer, uint32 *length, eZoneType zoneType)
+{
+	*(uint32*)&zone->name[0] = ReadSaveBuf<uint32>(*buffer, *length);
+	*(uint32*)&zone->name[4] = ReadSaveBuf<uint32>(*buffer, *length);
+
+	zone->minx = ReadSaveBuf<float>(*buffer, *length);
+	zone->miny = ReadSaveBuf<float>(*buffer, *length);
+	zone->minz = ReadSaveBuf<float>(*buffer, *length);
+	zone->maxx = ReadSaveBuf<float>(*buffer, *length);
+	zone->maxy = ReadSaveBuf<float>(*buffer, *length);
+	zone->maxz = ReadSaveBuf<float>(*buffer, *length);
+
+	zone->type = ReadSaveBuf<eZoneType>(*buffer, *length);
+	zone->level = ReadSaveBuf<eLevelName>(*buffer, *length);
+	zone->zoneinfoDay = ReadSaveBuf<int16>(*buffer, *length);
+	zone->zoneinfoNight = ReadSaveBuf<int16>(*buffer, *length);
+
+	int32 zoneId;
+	zoneId = ReadSaveBuf<int32>(*buffer, *length);
+	zone->child = GetPointerForZoneIndex(zoneId);
+	zoneId = ReadSaveBuf<int32>(*buffer, *length);
+	zone->parent = GetPointerForZoneIndex(zoneId);
+	zoneId = ReadSaveBuf<int32>(*buffer, *length);
+	zone->next = GetPointerForZoneIndex(zoneId);
+}
\ No newline at end of file
diff --git a/src/core/Zones.h b/src/core/Zones.h
new file mode 100644
index 0000000..b987f00
--- /dev/null
+++ b/src/core/Zones.h
@@ -0,0 +1,114 @@
+#pragma once
+
+#include "Game.h"
+#include "Gangs.h"
+#include "CarCtrl.h"
+
+enum eZoneType
+{
+	ZONE_DEFAULT,
+	ZONE_NAVIG,
+	ZONE_INFO,
+	ZONE_MAPZONE,
+};
+
+class CZone
+{
+public:
+	char       name[8];
+	float      minx;
+	float      miny;
+	float      minz;
+	float      maxx;
+	float      maxy;
+	float      maxz;
+	eZoneType  type;
+	eLevelName level;
+	int16      zoneinfoDay;
+	int16      zoneinfoNight;
+	CZone     *child;
+	CZone     *parent;
+	CZone     *next;
+
+	wchar *GetTranslatedName(void);
+};
+
+class CZoneInfo
+{
+public:
+	// Car data
+	int16 carDensity;
+	int16 carThreshold[CCarCtrl::NUM_CAR_CLASSES];
+	int16 boatThreshold[CCarCtrl::NUM_BOAT_CLASSES];
+	int16 gangThreshold[NUM_GANGS];
+	int16 copThreshold;
+
+	// Ped data
+	uint16 pedDensity;
+	uint16 gangPedThreshold[NUM_GANGS];
+	uint16 copPedThreshold;
+	uint16 pedGroup;
+};
+
+
+class CTheZones
+{
+	static int16 FindIndex;
+
+	static uint16 NumberOfAudioZones;
+	static int16 AudioZoneArray[NUMAUDIOZONES];
+	static uint16 TotalNumberOfMapZones;
+	static uint16 TotalNumberOfInfoZones;
+	static uint16 TotalNumberOfNavigationZones;
+	static CZone InfoZoneArray[NUMINFOZONES];
+	static CZone MapZoneArray[NUMMAPZONES];
+	static CZone NavigationZoneArray[NUMNAVIGZONES];
+	static uint16 TotalNumberOfZoneInfos;
+	static CZoneInfo ZoneInfoArray[2*NUMINFOZONES];
+public:
+	static eLevelName m_CurrLevel;
+
+	static void Init(void);
+	static void Update(void);
+	static void CreateZone(char *name, eZoneType type,
+	                       float minx, float miny, float minz,
+	                       float maxx, float maxy, float maxz,
+	                       eLevelName level);
+	static CZone *GetInfoZone(uint16 i) { return &InfoZoneArray[i]; }
+	static CZone *GetNavigationZone(uint16 i) { return &NavigationZoneArray[i]; }
+	static CZone *GetMapZone(uint16 i) { return &MapZoneArray[i]; }
+	static CZone *GetAudioZone(uint16 i) { return &NavigationZoneArray[AudioZoneArray[i]]; }
+	static void PostZoneCreation(void);
+	static void CheckZonesForOverlap(void);
+	static void InsertZoneIntoZoneHierarchy(CZone *zone);
+	static bool InsertZoneIntoZoneHierRecursive(CZone *z1, CZone *z2);
+	static bool ZoneIsEntirelyContainedWithinOtherZone(CZone *z1, CZone *z2);
+	static bool PointLiesWithinZone(const CVector *v, CZone *zone);
+	static eLevelName GetLevelFromPosition(const CVector *v);
+	static CZone *FindInformationZoneForPosition(const CVector *v);
+	static CZone *FindSmallestNavigationZoneForPosition(const CVector *v, bool findDefault, bool findNavig);
+	static int16 FindZoneByLabelAndReturnIndex(char *name, eZoneType type);
+	static int16 FindNextZoneByLabelAndReturnIndex(char *name, eZoneType type);
+	static CZoneInfo *GetZoneInfo(const CVector *v, uint8 day);
+	static void GetZoneInfoForTimeOfDay(const CVector *pos, CZoneInfo *info);
+	static void SetZoneCarInfo(uint16 zoneid, uint8 day, int16 carDensity,
+		int16 copCarDensity, const int16 *gangCarDensities /*[NUMGANGS]*/);
+	static void SetZoneCivilianCarInfo(uint16 zoneid, uint8 day,
+		const int16* carDensities, const int16* boatDensities);
+	static void SetZonePedInfo(uint16 zoneid, uint8 day, int16 pedDensity,
+		int16 gang0Density, int16 gang1Density, int16 gang2Density, int16 gang3Density,
+		int16 gang4Density, int16 gang5Density, int16 gang6Density, int16 gang7Density,
+		int16 gang8Density, int16 copDensity);
+	static void SetCarDensity(uint16 zoneid, uint8 day, uint16 cardensity);
+	static void SetPedDensity(uint16 zoneid, uint8 day, uint16 peddensity);
+	static void SetPedGroup(uint16 zoneid, uint8 day, uint16 pedgroup);
+	static int16 FindAudioZone(CVector *pos);
+	static CZone *GetPointerForZoneIndex(ssize_t i) { return i == -1 ? nil : &NavigationZoneArray[i]; }
+	static ssize_t GetIndexForZonePointer(CZone *zone) { return zone == nil ? -1 : zone - NavigationZoneArray; }
+	static void AddZoneToAudioZoneArray(CZone *zone);
+	static void InitialiseAudioZoneArray(void);
+	static void SaveAllZones(uint8 *buffer, uint32 *length);
+	static void SaveOneZone(CZone *zone, uint8 **buffer, uint32 *length, eZoneType zoneType);
+	static void LoadAllZones(uint8 *buffer, uint32 length);
+	static void LoadOneZone(CZone *zone, uint8 **buffer, uint32 *length, eZoneType zoneType);
+};
diff --git a/src/core/common.h b/src/core/common.h
new file mode 100644
index 0000000..d39531c
--- /dev/null
+++ b/src/core/common.h
@@ -0,0 +1,597 @@
+#pragma once
+
+#define _CRT_SECURE_NO_WARNINGS
+#define _USE_MATH_DEFINES
+#pragma warning(disable: 4244)	// int to float
+#pragma warning(disable: 4800)	// int to bool
+#pragma warning(disable: 4838)  // narrowing conversion
+#pragma warning(disable: 4996)  // POSIX names
+
+#ifdef __MWERKS__
+#define __STDC_LIMIT_MACROS // so we get UINT32_MAX etc
+#endif
+
+#include <stdint.h>
+#include <string.h>
+#include <math.h>
+
+#ifdef __MWERKS__
+#define AUDIO_MSS
+#define RWLIBS // codewarrior doesn't support project level defines - so not even this is enough, but still catches most ifdefs
+#endif
+
+#if !defined RW_D3D9 && defined LIBRW
+#undef WITHD3D
+#undef WITHDINPUT
+#endif
+
+#if (defined WITHD3D && !defined LIBRW)
+#define WITHWINDOWS
+#endif
+
+#if defined _WIN32 && defined WITHWINDOWS && !defined _INC_WINDOWS
+#include <windows.h>
+#endif
+
+#ifdef WITHD3D
+	#ifdef LIBRW
+		#define WITH_D3D // librw includes d3d9 itself via this right now
+	#else
+		#ifndef USE_D3D9
+		#include <d3d8.h>
+		#else
+		#include <d3d9.h>
+		#endif
+	#endif
+#endif
+
+#ifdef WITHDINPUT
+#define DIRECTINPUT_VERSION 0x0800
+#include <dinput.h>
+#endif
+
+#include <rwcore.h>
+#include <rpworld.h>
+
+// gotta put this somewhere
+#ifdef LIBRW
+#define STREAMPOS(str) ((str)->tell())
+#define STREAMFILE(str) (((rw::StreamFile*)(str))->file)
+#define HIERNODEINFO(hier) ((hier)->nodeInfo)
+#define HIERNODEID(hier, i) ((hier)->nodeInfo[i].id)
+#define HANIMFRAME(anim, i) ((RwUInt8*)(anim)->keyframes + (i)*(anim)->interpInfo->animKeyFrameSize)
+#else
+#define RWHALFPIXEL	// always d3d
+#define STREAMPOS(str) ((str)->Type.memory.position)
+#define STREAMFILE(str) ((str)->Type.file.fpFile)
+#define HIERNODEINFO(hier) ((hier)->pNodeInfo)
+#define HIERNODEID(hier, i) ((hier)->pNodeInfo[i].nodeID)
+#define HANIMFRAME(anim, i) ((RwUInt8*)(anim)->pFrames + (i)*(anim)->interpInfo->keyFrameSize)
+#define RpHAnimStdInterpFrame RpHAnimStdKeyFrame
+#endif
+
+#ifdef RWHALFPIXEL
+#define HALFPX (0.5f)
+#else
+#define HALFPX (0.0f)
+#endif
+
+#define rwVENDORID_ROCKSTAR 0x0253F2
+
+#define Max(a,b) ((a) > (b) ? (a) : (b))
+#define Min(a,b) ((a) < (b) ? (a) : (b))
+
+// Use this to add const that wasn't there in the original code
+#define Const const
+
+typedef uint8_t uint8;
+typedef int8_t int8;
+typedef uint16_t uint16;
+typedef int16_t int16;
+#ifndef __MWERKS__
+typedef uint32_t uint32;
+typedef int32_t int32;
+#else
+typedef unsigned int uint32;
+typedef int int32;
+#endif
+typedef uintptr_t uintptr;
+typedef intptr_t intptr;
+typedef uint64_t uint64;
+typedef int64_t int64;
+// hardcode ucs-2
+typedef uint16_t wchar;
+
+typedef uint8 bool8;
+typedef uint16 bool16;
+typedef uint32 bool32;
+
+#if defined(_MSC_VER) || defined (__MWERKS__)
+typedef ptrdiff_t ssize_t;
+#endif
+
+#ifndef nil
+#define nil NULL
+#endif
+
+#include "config.h"
+
+#include <rphanim.h>
+#include <rpskin.h>
+
+#ifdef __GNUC__
+#define TYPEALIGN(n) __attribute__ ((aligned (n)))
+#else
+#ifdef _MSC_VER
+#define TYPEALIGN(n) __declspec(align(n))
+#else
+#define TYPEALIGN(n)	// unknown compiler...ignore
+#endif
+#endif
+
+#define ALIGNPTR(p) (void*)((((uintptr)(void*)p) + sizeof(void*)-1) & ~(sizeof(void*)-1))
+
+// PDP-10 like byte functions
+#define MASK(p, s) (((1<<(s))-1) << (p))
+inline uint32 dpb(uint32 b, uint32 p, uint32 s, uint32 w)
+{
+	uint32 m = MASK(p,s);
+	return (w & ~m) | ((b<<p) & m);
+}
+inline uint32 ldb(uint32 p, uint32 s, uint32 w)
+{
+	return w>>p & (1<<s)-1;
+}
+
+#include "skeleton.h"
+#include "Draw.h"
+
+#if defined(PROPER_SCALING)
+	#ifdef FORCE_PC_SCALING
+		#define DEFAULT_SCREEN_WIDTH  (640)
+		#define DEFAULT_SCREEN_HEIGHT (448)
+	#else
+		#define DEFAULT_SCREEN_WIDTH  (640)
+		#define DEFAULT_SCREEN_HEIGHT (480)
+	#endif
+#elif defined(GTA_PS2)
+		#define DEFAULT_SCREEN_WIDTH  (640)
+		#define DEFAULT_SCREEN_HEIGHT (480)
+#else //elif defined(GTA_PC)
+		#define DEFAULT_SCREEN_WIDTH  (640)
+		#define DEFAULT_SCREEN_HEIGHT (448)
+#endif
+
+#define DEFAULT_ASPECT_RATIO (4.0f/3.0f)
+#define DEFAULT_VIEWWINDOW (0.7f)
+
+// game uses maximumWidth/Height, but this probably won't work
+// with RW windowed mode
+#ifdef GTA_PS2
+	#ifdef GTA_PAL
+		#define SCREEN_WIDTH  ((float)640)
+		#define SCREEN_HEIGHT ((float)512)
+	#else
+		#define SCREEN_WIDTH  ((float)640)
+		#define SCREEN_HEIGHT ((float)448)
+	#endif
+#else
+#define SCREEN_WIDTH  ((float)RsGlobal.width)
+#define SCREEN_HEIGHT ((float)RsGlobal.height)
+#endif
+
+#define SCREEN_HEIGHT_PAL ((float)512)
+#define SCREEN_HEIGHT_NTSC ((float)448)
+
+#define SCREEN_ASPECT_RATIO (CDraw::GetAspectRatio())
+#define SCREEN_VIEWWINDOW (Tan(DEGTORAD(CDraw::GetScaledFOV() * 0.5f)))
+
+// This scales from PS2 pixel coordinates to the real resolution
+#define SCREEN_STRETCH_X(a)   ((a) * (float) SCREEN_WIDTH / DEFAULT_SCREEN_WIDTH)
+#define SCREEN_STRETCH_Y(a)   ((a) * (float) SCREEN_HEIGHT / DEFAULT_SCREEN_HEIGHT)
+#define SCREEN_STRETCH_FROM_RIGHT(a)  (SCREEN_WIDTH - SCREEN_STRETCH_X(a))
+#define SCREEN_STRETCH_FROM_BOTTOM(a) (SCREEN_HEIGHT - SCREEN_STRETCH_Y(a))
+
+// This scales from PS2 pixel coordinates while optionally maintaining the aspect ratio
+#define SCREEN_SCALE_X(a) SCREEN_SCALE_AR(SCREEN_STRETCH_X(a))
+#define SCREEN_SCALE_Y(a) SCREEN_STRETCH_Y(a)
+#define SCREEN_SCALE_FROM_RIGHT(a) (SCREEN_WIDTH - SCREEN_SCALE_X(a))
+#define SCREEN_SCALE_FROM_BOTTOM(a) (SCREEN_HEIGHT - SCREEN_SCALE_Y(a))
+
+#ifdef ASPECT_RATIO_SCALE
+#define SCREEN_SCALE_AR(a) ((a) * DEFAULT_ASPECT_RATIO / SCREEN_ASPECT_RATIO)
+#define SCALE_AND_CENTER_X(x) ((SCREEN_WIDTH == DEFAULT_SCREEN_WIDTH) ? (x) : (SCREEN_WIDTH - SCREEN_SCALE_X(DEFAULT_SCREEN_WIDTH)) / 2 + SCREEN_SCALE_X((x)))
+#ifdef PROPER_SCALING
+	#ifndef FORCE_PC_SCALING			
+		#undef SCREEN_SCALE_Y	
+		#define SCREEN_SCALE_Y(a) CDraw::ScaleY(SCREEN_STRETCH_Y(a))	
+	#endif
+#endif
+#else
+#define SCREEN_SCALE_AR(a) (a)
+#define SCALE_AND_CENTER_X(x) SCREEN_STRETCH_X(x)
+#endif
+
+#include "maths.h"
+#include "Vector.h"
+#include "Vector2D.h"
+#include "Matrix.h"
+#include "Rect.h"
+
+class CRGBA
+{
+public:
+	union
+	{
+	    uint32 color32;
+		struct { uint8 r, g, b, a; };
+		struct { uint8 red, green, blue, alpha; };
+#ifdef RWCORE_H
+		struct  { RwRGBA rwRGBA; };
+#endif
+	};
+	
+	CRGBA(void) { }
+	CRGBA(uint8 r, uint8 g, uint8 b, uint8 a) : r(r), g(g), b(b), a(a) { }
+	
+	bool operator ==(const CRGBA &right)
+	{
+		return this->r == right.r && this->g == right.g && this->b == right.b && this->a == right.a;
+	}
+	
+	bool operator !=(const CRGBA &right)
+	{
+		return !(*this == right);
+	}
+	
+	CRGBA &operator =(const CRGBA &right)
+	{
+		this->r = right.r;
+		this->g = right.g;
+		this->b = right.b;
+		this->a = right.a;
+		return *this;
+	}
+#ifdef RWCORE_H
+	operator RwRGBA &(void) {
+		return rwRGBA;
+	}
+	
+	operator RwRGBA *(void) {
+		return &rwRGBA;
+	}
+	
+	operator RwRGBA (void) const {
+		return rwRGBA;
+	}
+
+	CRGBA &operator =(const RwRGBA &right)
+	{
+		this->r = right.red;
+		this->g = right.green;
+		this->b = right.blue;
+		this->a = right.alpha;
+		return *this;
+	}
+#endif
+};
+
+#if (defined(_MSC_VER))
+extern int strcasecmp(const char *str1, const char *str2);
+extern int strncasecmp(const char *str1, const char *str2, size_t len);
+#endif
+
+extern wchar *AllocUnicode(const char*src);
+
+#define clamp(v, low, high) ((v)<(low) ? (low) : (v)>(high) ? (high) : (v))
+
+#define clamp2(v, center, radius) ((v) < (center) ? Max(v, center - radius) : Min(v, center + radius))
+
+inline float sq(float x) { return x*x; }
+#define SQR(x) ((x) * (x))
+
+#ifdef __MWERKS__
+#define M_E        2.71828182845904523536   // e
+#define M_LOG2E    1.44269504088896340736   // log2(e)
+#define M_LOG10E   0.434294481903251827651  // log10(e)
+#define M_LN2      0.693147180559945309417  // ln(2)
+#define M_LN10     2.30258509299404568402   // ln(10)
+#define M_PI       3.14159265358979323846   // pi
+#define M_PI_2     1.57079632679489661923   // pi/2
+#define M_PI_4     0.785398163397448309616  // pi/4
+#define M_1_PI     0.318309886183790671538  // 1/pi
+#define M_2_PI     0.636619772367581343076  // 2/pi
+#define M_2_SQRTPI 1.12837916709551257390   // 2/sqrt(pi)
+#define M_SQRT2    1.41421356237309504880   // sqrt(2)
+#define M_SQRT1_2  0.707106781186547524401  // 1/sqrt(2)
+#endif
+
+#define PI (float)M_PI
+#define TWOPI (PI*2)
+#define HALFPI (PI/2)
+#define DEGTORAD(x) ((x) * PI / 180.0f)
+#define RADTODEG(x) ((x) * 180.0f / PI)
+
+#ifdef USE_PS2_RAND
+#define MYRAND_MAX		65535
+#else
+#define MYRAND_MAX		32767
+#endif
+
+int myrand(void);
+void mysrand(unsigned int seed);
+
+void re3_debug(const char *format, ...);
+void re3_trace(const char *filename, unsigned int lineno, const char *func, const char *format, ...);
+void re3_assert(const char *expr, const char *filename, unsigned int lineno, const char *func);
+void re3_usererror(const char *format, ...);
+
+#define DEBUGBREAK() __debugbreak();
+
+// Switch to enable development messages.
+#if 1 
+#define DEV(f, ...)
+#else
+#define DEV(f, ...)   re3_debug("[DEV]: " f, ## __VA_ARGS__)
+#endif
+
+#ifdef __MWERKS__
+void debug(char *f, ...);
+void Error(char *f, ...);
+__inline__ void TRACE(char *f, ...) { } // this is re3 only, and so the function needs to be inline - this way no call actually gets placed
+// USERERROR only gets used in oal builds ... once
+#else
+#define debug(f, ...) re3_debug("[DBG]: " f, ## __VA_ARGS__)
+#define Error(f, ...) re3_debug("[ERROR]: " f, ## __VA_ARGS__)
+#ifndef MASTER
+#define TRACE(f, ...) re3_trace(__FILE__, __LINE__, __FUNCTION__, f, ## __VA_ARGS__)
+#define USERERROR(f, ...) re3_usererror(f, ## __VA_ARGS__)
+#else
+#define TRACE(f, ...)
+#define USERERROR(f, ...)
+#endif
+#endif
+
+#ifndef MASTER
+#define assert(_Expression) (void)( (!!(_Expression)) || (re3_assert(#_Expression, __FILE__, __LINE__, __FUNCTION__), 0) )
+#else
+#define assert(_Expression) (_Expression)
+#endif
+#define ASSERT assert
+
+#ifdef __MWERKS__
+#define static_assert(bool_constexpr, message)
+#endif
+
+#define _TODO(x)
+#define _TODOCONST(x) (x)
+
+#ifdef CHECK_STRUCT_SIZES 
+#define VALIDATE_SIZE(struc, size) static_assert(sizeof(struc) == size, "Invalid structure size of " #struc)
+#else
+#define VALIDATE_SIZE(struc, size)
+#endif
+#define VALIDATE_OFFSET(struc, member, offset) static_assert(offsetof(struc, member) == offset, "The offset of " #member " in " #struc " is not " #offset "...")
+
+#define PERCENT(x, p)                    ((float(x) * (float(p) / 100.0f)))
+#define ARRAY_SIZE(array)                (sizeof(array) / sizeof(array[0]))
+#define BIT(num)                         (1<<(num))
+
+#define ABS(a)  (((a) < 0) ? (-(a)) : (a))
+#define norm(value, min, max) (((value) < (min)) ? 0 : (((value) > (max)) ? 1 : (((value) - (min)) / ((max) - (min)))))
+#define lerp(norm, min, max) ( (norm) * ((max) - (min)) + (min) )
+
+#define STRINGIFY(x)                    #x
+#define STR(x)                          STRINGIFY(x)
+#define CONCAT_(x,y) x##y
+#define CONCAT(x,y) CONCAT_(x,y)
+
+#ifdef DEBUGMENU
+// Tweaking stuff for debugmenu
+#define TWEAKPATH                                   ___tw___TWEAKPATH
+#define SETTWEAKPATH(path)	                        static const char *___tw___TWEAKPATH = path;
+#define TWEAKFUNC(v)                                static CTweakFunc   CONCAT(___tw___tweak, __COUNTER__)(&v, STR(v), TWEAKPATH);
+#define TWEAKFUNCN(v, name)                         static CTweakFunc   CONCAT(___tw___tweak, __COUNTER__)(&v, name, TWEAKPATH);
+#define TWEAKBOOL(v)                                static CTweakBool   CONCAT(___tw___tweak, __COUNTER__)(&v, STR(v), TWEAKPATH);
+#define TWEAKBOOLN(v, name)                         static CTweakBool   CONCAT(___tw___tweak, __COUNTER__)(&v, name, TWEAKPATH);
+#define TWEAKINT32(v, lower, upper, step)           static CTweakInt32  CONCAT(___tw___tweak, __COUNTER__)(&v, STR(v), lower, upper, step, TWEAKPATH);
+#define TWEAKINT32N(v, lower, upper, step, name)    static CTweakInt32  CONCAT(___tw___tweak, __COUNTER__)(&v, name, lower, upper, step, TWEAKPATH);
+#define TWEAKUINT32(v, lower, upper, step)          static CTweakUInt32 CONCAT(___tw___tweak, __COUNTER__)(&v, STR(v), lower, upper, step, TWEAKPATH);
+#define TWEAKUINT32N(v, lower, upper, step, name)   static CTweakUInt32 CONCAT(___tw___tweak, __COUNTER__)(&v, name, lower, upper, step, TWEAKPATH);
+#define TWEAKINT16(v, lower, upper, step)           static CTweakInt16  CONCAT(___tw___tweak, __COUNTER__)(&v, STR(v), lower, upper, step, TWEAKPATH);
+#define TWEAKINT16N(v, lower, upper, step, name)    static CTweakInt16  CONCAT(___tw___tweak, __COUNTER__)(&v, name, lower, upper, step, TWEAKPATH);
+#define TWEAKUINT16(v, lower, upper, step)          static CTweakUInt16 CONCAT(___tw___tweak, __COUNTER__)(&v, STR(v), lower, upper, step, TWEAKPATH);
+#define TWEAKUINT16N(v, lower, upper, step, name)   static CTweakUInt16 CONCAT(___tw___tweak, __COUNTER__)(&v, name, lower, upper, step, TWEAKPATH);
+#define TWEAKINT8(v, lower, upper, step)            static CTweakInt8   CONCAT(___tw___tweak, __COUNTER__)(&v, STR(v), lower, upper, step, TWEAKPATH);
+#define TWEAKINT8N(v, lower, upper, step, name)     static CTweakInt8   CONCAT(___tw___tweak, __COUNTER__)(&v, name, lower, upper, step, TWEAKPATH);
+#define TWEAKUINT8(v, lower, upper, step)           static CTweakUInt8  CONCAT(___tw___tweak, __COUNTER__)(&v, STR(v), lower, upper, step, TWEAKPATH);
+#define TWEAKUINT8N(v, lower, upper, step, name)    static CTweakUInt8  CONCAT(___tw___tweak, __COUNTER__)(&v, name, lower, upper, step, TWEAKPATH);
+#define TWEAKFLOAT(v, lower, upper, step)           static CTweakFloat  CONCAT(___tw___tweak, __COUNTER__)(&v, STR(v), lower, upper, step, TWEAKPATH);
+#define TWEAKFLOATN(v, lower, upper, step, name)    static CTweakFloat  CONCAT(___tw___tweak, __COUNTER__)(&v, name, lower, upper, step, TWEAKPATH);
+#define TWEAKSWITCH(v, lower, upper, str, f)        static CTweakSwitch CONCAT(___tw___tweak, __COUNTER__)(&v, STR(v), lower, upper, str, f, TWEAKPATH);
+#define TWEAKSWITCHN(v, lower, upper, str, f, name) static CTweakSwitch CONCAT(___tw___tweak, __COUNTER__)(&v, name, lower, upper, str, f, TWEAKPATH);
+
+// interface
+class CTweakVar
+{
+public:
+	virtual void AddDBG(const char *path) = 0;
+};
+
+class CTweakVars
+{
+public:
+	static void Add(CTweakVar *var);
+	static void AddDBG(const char *path);
+};
+
+class CTweakFunc : public CTweakVar
+{
+	const char *m_pPath, *m_pVarName;
+	void (*m_pFunc)();
+public:
+	CTweakFunc(void (*pFunc)(), const char *strName, const char *strPath) :
+		m_pPath(strPath), m_pVarName(strName), m_pFunc(pFunc)
+	{
+		CTweakVars::Add(this);
+	}
+	
+	void AddDBG(const char *path);
+};
+
+class CTweakBool : public CTweakVar
+{
+	const char *m_pPath, *m_pVarName;
+	bool *m_pBoolVar;
+public:
+	CTweakBool(bool *pBool, const char *strName, const char *strPath) :
+		m_pPath(strPath), m_pVarName(strName), m_pBoolVar(pBool)
+	{
+		CTweakVars::Add(this);
+	}
+	
+	void AddDBG(const char *path);
+};
+
+class CTweakSwitch : public CTweakVar
+{
+	const char *m_pPath, *m_pVarName;
+	void *m_pIntVar;
+	int32 m_nMin, m_nMax;
+	const char **m_aStr;
+	void (*m_pFunc)();
+public:
+	CTweakSwitch(void *pInt, const char *strName, int32 nMin, int32 nMax, const char **aStr,
+	             void (*pFunc)(), const char *strPath)
+	    : m_pPath(strPath), m_pVarName(strName), m_pIntVar(pInt), m_nMin(nMin), m_nMax(nMax),
+	      m_aStr(aStr)
+	{
+		CTweakVars::Add(this);
+	}
+
+	void AddDBG(const char *path);
+};
+
+#define _TWEEKCLASS(name, type)                                                                    \
+	class name : public CTweakVar                                                              \
+	{                                                                                          \
+	public:                                                                                    \
+		const char *m_pPath, *m_pVarName;                                                  \
+		type *m_pIntVar, m_nLoawerBound, m_nUpperBound, m_nStep;                           \
+                                                                                                   \
+		name(type *pInt, const char *strName, type nLower, type nUpper, type nStep,        \
+		     const char *strPath)                                                          \
+		    : m_pPath(strPath), m_pVarName(strName), m_pIntVar(pInt),                      \
+		      m_nLoawerBound(nLower), m_nUpperBound(nUpper), m_nStep(nStep)                \
+                                                                                                   \
+		{                                                                                  \
+			CTweakVars::Add(this);                                                     \
+		}                                                                                  \
+                                                                                                   \
+		void AddDBG(const char *path);                                                     \
+	};
+
+_TWEEKCLASS(CTweakInt8, int8);
+_TWEEKCLASS(CTweakUInt8, uint8);
+_TWEEKCLASS(CTweakInt16, int16);
+_TWEEKCLASS(CTweakUInt16, uint16);
+_TWEEKCLASS(CTweakInt32, int32);
+_TWEEKCLASS(CTweakUInt32, uint32);
+_TWEEKCLASS(CTweakFloat, float);
+
+#undef _TWEEKCLASS
+#endif
+
+#ifdef VALIDATE_SAVE_SIZE
+extern int32 _saveBufCount;
+#define INITSAVEBUF _saveBufCount = 0;
+#define VALIDATESAVEBUF(b) assert(_saveBufCount == b);
+#else
+#define INITSAVEBUF
+#define VALIDATESAVEBUF(b)
+#endif
+
+inline void SkipSaveBuf(uint8 *&buf, int32 skip)
+{
+	buf += skip;
+#ifdef VALIDATE_SAVE_SIZE
+	_saveBufCount += skip;
+#endif
+}
+
+inline void SkipSaveBuf(uint8*& buf, uint32 &length, int32 skip)
+{
+	buf += skip;
+	length += skip;
+#ifdef VALIDATE_SAVE_SIZE
+	_saveBufCount += skip;
+#endif
+}
+
+template<typename T>
+inline const T ReadSaveBuf(uint8 *&buf)
+{
+	T &value = *(T*)buf;
+	SkipSaveBuf(buf, sizeof(T));
+	return value;
+}
+
+template<typename T>
+inline const T ReadSaveBuf(uint8 *&buf, uint32 &length)
+{
+	T &value = *(T*)buf;
+	SkipSaveBuf(buf, length, sizeof(T));
+	return value;
+}
+
+template<typename T>
+inline T *WriteSaveBuf(uint8 *&buf, const T &value)
+{
+	T *p = (T*)buf;
+	*p = value;
+	SkipSaveBuf(buf, sizeof(T));
+	return p;
+}
+
+template<typename T>
+inline T *WriteSaveBuf(uint8 *&buf, uint32 &length, const T &value)
+{
+	T *p = (T*)buf;
+	*p = value;
+	SkipSaveBuf(buf, length, sizeof(T));
+	return p;
+}
+
+
+#define SAVE_HEADER_SIZE (4*sizeof(char)+sizeof(uint32))
+
+#define WriteSaveHeader(buf,a,b,c,d,size) \
+	WriteSaveBuf(buf, a);\
+	WriteSaveBuf(buf, b);\
+	WriteSaveBuf(buf, c);\
+	WriteSaveBuf(buf, d);\
+	WriteSaveBuf<uint32>(buf, size);
+
+#define WriteSaveHeaderWithLength(buf,len,a,b,c,d,size) \
+	WriteSaveBuf(buf, len, a);\
+	WriteSaveBuf(buf, len, b);\
+	WriteSaveBuf(buf, len, c);\
+	WriteSaveBuf(buf, len, d);\
+	WriteSaveBuf<uint32>(buf, len, size);
+
+#define CheckSaveHeader(buf,a,b,c,d,size)\
+	assert(ReadSaveBuf<char>(buf) == a);\
+	assert(ReadSaveBuf<char>(buf) == b);\
+	assert(ReadSaveBuf<char>(buf) == c);\
+	assert(ReadSaveBuf<char>(buf) == d);\
+	assert(ReadSaveBuf<uint32>(buf) == size);
+
+#define CheckSaveHeaderWithLength(buf,len,a,b,c,d,size)\
+	assert(ReadSaveBuf<char>(buf,len) == a);\
+	assert(ReadSaveBuf<char>(buf,len) == b);\
+	assert(ReadSaveBuf<char>(buf,len) == c);\
+	assert(ReadSaveBuf<char>(buf,len) == d);\
+	assert(ReadSaveBuf<uint32>(buf,len) == size);
+
+
+void cprintf(char*, ...);
diff --git a/src/core/config.h b/src/core/config.h
new file mode 100644
index 0000000..6d30a65
--- /dev/null
+++ b/src/core/config.h
@@ -0,0 +1,516 @@
+#pragma once
+
+// disables (most) stuff that wasn't in original gta-vc.exe - check section at the bottom of this file
+//#define VANILLA_DEFINES
+
+enum Config {
+	NUMPLAYERS = 1,
+
+	NUMCDIMAGES = 6, // gta3.img duplicates (not used on PC)
+	MAX_CDIMAGES = 8, // additional cdimages
+	MAX_CDCHANNELS = 5,
+
+	MODELINFOSIZE = 6500,	// 4900 on PS2
+	TXDSTORESIZE = 1385,
+	COLSTORESIZE = 31,
+	EXTRADIRSIZE = 256,
+	CUTSCENEDIRSIZE = 512,
+
+	SIMPLEMODELSIZE = 3885,
+	TIMEMODELSIZE = 385,
+	CLUMPMODELSIZE = 5,
+	WEAPONMODELSIZE = 37,
+	PEDMODELSIZE = 130,
+	VEHICLEMODELSIZE = 110,
+	TWODFXSIZE = 1210,
+
+	MAXVEHICLESLOADED = 50, // 70 on mobile
+
+	NUMOBJECTINFO = 210,
+
+	// Pool sizes
+	NUMPTRNODES = 50000,
+	NUMENTRYINFOS = 3200,
+	NUMPEDS = 140,
+	NUMVEHICLES = 110,
+	NUMBUILDINGS = 7000,
+	NUMTREADABLES = 1,
+	NUMOBJECTS = 460,
+	NUMDUMMIES = 2340,
+	NUMAUDIOSCRIPTOBJECTS = 192,
+	NUMCOLMODELS = 4400,
+	NUMCUTSCENEOBJECTS = 50,	// not a pool in VC
+
+	NUMANIMBLOCKS = 35,
+	NUMANIMATIONS = 450,
+
+	NUMTEMPOBJECTS = 40,
+
+	// Path data
+	NUM_PATHNODES = 9650,
+	NUM_CARPATHLINKS = 3500,
+	NUM_MAPOBJECTS = 1250,
+	NUM_PATHCONNECTIONS = 20400,
+
+	// Link list lengths
+	NUMALPHALIST = 20,
+	NUMBOATALPHALIST = 20,
+	NUMALPHAENTITYLIST = 200,
+	NUMALPHAUNTERWATERENTITYLIST = 30,
+	NUMCOLCACHELINKS = 50,
+	NUMREFERENCES = 800,
+
+	// Zones
+	NUMAUDIOZONES = 14,
+	NUMINFOZONES = 169,
+	NUMMAPZONES = 39,
+	NUMNAVIGZONES = 20,
+
+	// Cull zones
+	NUMATTRIBZONES = 704,
+
+	NUMOCCLUSIONVOLUMES = 350,
+	NUMACTIVEOCCLUDERS = 48,
+
+	PATHNODESIZE = 4500,
+
+	NUMWEATHERS = 7,
+	NUMHOURS = 24,
+
+	NUMEXTRADIRECTIONALS = 4,
+	NUMANTENNAS = 8,
+	NUMCORONAS = 56,
+	NUMPOINTLIGHTS = 32,
+	NUM3DMARKERS = 32,
+	NUMBRIGHTLIGHTS = 32,
+	NUMSHINYTEXTS = 32,
+	NUMMONEYMESSAGES = 16,
+	NUMPICKUPMESSAGES = 16,
+	NUMBULLETTRACES = 16,
+	NUMMBLURSTREAKS = 4,
+	NUMSKIDMARKS = 32,
+
+	NUMONSCREENCLOCKS = 1,
+	NUMONSCREENCOUNTERS = 3,
+	NUMRADARBLIPS = 75,
+	NUMGENERALPICKUPS = 320,
+	NUMSCRIPTEDPICKUPS = 16,
+	NUMPICKUPS = NUMGENERALPICKUPS + NUMSCRIPTEDPICKUPS,
+	NUMCOLLECTEDPICKUPS = 20,
+	NUMPACMANPICKUPS = 256,
+	NUMEVENTS = 64,
+
+	NUM_CARGENS = 185,
+
+	NUM_PATH_NODES_IN_AUTOPILOT = 8,
+
+	NUM_ACCIDENTS = 20,
+	NUM_FIRES = 40,
+	NUM_GARAGES = 32,
+	NUM_PROJECTILES = 32,
+
+	NUM_GLASSPANES = 45,
+	NUM_GLASSENTITIES = 32,
+	NUM_WATERCANNONS = 3,
+
+	NUMPEDROUTES = 200,
+	NUMPHONES = 50,
+	NUMPEDGROUPS = 67,
+	NUMMODELSPERPEDGROUP = 16,
+	MAXZONEPEDSLOADED = 8,
+	NUMSHOTINFOS = 100,
+
+	NUMROADBLOCKS = 300,
+	NUM_SCRIPT_ROADBLOCKS = 16,
+
+	NUMVISIBLEENTITIES = 2000,
+	NUMINVISIBLEENTITIES = 150,
+
+	NUM_AUDIOENTITY_EVENTS = 4,
+	NUM_PED_COMMENTS_BANKS = 2,
+	NUM_PED_COMMENTS_SLOTS = 20,
+
+	NUM_SOUNDS_SAMPLES_BANKS = 2,
+	NUM_SOUNDS_SAMPLES_SLOTS = 27,
+	NUM_AUDIOENTITIES = 250,
+
+	NUM_AUDIO_REFLECTIONS = 8,
+	NUM_SCRIPT_MAX_ENTITIES = 40,
+
+	NUM_GARAGE_STORED_CARS = 4,
+
+	NUM_CRANES = 8,
+	NUM_ESCALATORS = 22,
+	NUM_WATER_CREATURES = 8,
+
+	NUM_EXPLOSIONS = 48,
+
+	NUM_SETPIECES = 96,
+	NUM_SHORTCUT_START_POINTS = 16
+};
+
+// We don't expect to compile for PS2 or Xbox
+// but it might be interesting for documentation purposes
+#define GTA_PC
+//#define GTA_PS2
+//#define GTA_XBOX
+
+// This enables things from the PS2 version on PC
+#define GTA_PS2_STUFF
+
+// This is enabled for all released games.
+// any debug stuff that isn't left in any game is not in FINAL
+//#define FINAL
+
+// This is enabled for all released games except mobile
+// any debug stuff that is only left in mobile, is not in MASTER
+//#define MASTER
+
+// once and for all:
+// pc: FINAL & MASTER
+// mobile: FINAL
+
+// MASTER builds must be FINAL
+#ifdef MASTER
+#define FINAL
+#endif
+
+// Version defines
+#define GTAVC_PS2	400
+#define GTAVC_PC_10	410
+#define GTAVC_PC_11	411
+#define GTAVC_PC_JAP	412
+// TODO? maybe something for xbox or android?
+
+#define GTA_VERSION	GTAVC_PC_11
+
+// TODO(MIAMI): someone ought to find and check out uses of these defines:
+//#define GTA3_STEAM_PATCH
+//#define GTAVC_JP_PATCH
+
+// quality of life fixes that should also be in FINAL
+#define NASTY_GAME	// nasty game for all languages
+#define NO_CDCHECK
+
+// those infamous texts
+#define DRAW_GAME_VERSION_TEXT
+#ifdef DRAW_GAME_VERSION_TEXT
+	// unlike R* development builds, ours has runtime switch on debug menu & .ini, and disabled as default.
+	#define USE_OUR_VERSIONING // If you disable this then game will fetch version from peds.col, as R* did while in development
+#endif
+
+// Memory allocation and compression
+// #define USE_CUSTOM_ALLOCATOR		// use CMemoryHeap for allocation. use with care, not finished yet
+//#define COMPRESSED_COL_VECTORS	// use compressed vectors for collision vertices
+//#define ANIM_COMPRESSION	// only keep most recently used anims uncompressed
+
+#if defined GTA_PS2
+#	define GTA_PS2_STUFF
+#	define RANDOMSPLASH
+//#	define USE_CUSTOM_ALLOCATOR
+#	define VU_COLLISION
+#elif defined GTA_PC
+#	ifdef GTA_PS2_STUFF
+#		define USE_PS2_RAND
+#		define RANDOMSPLASH	// use random splash as on PS2
+#		define PS2_MATFX
+#	endif
+#	define PC_PLAYER_CONTROLS	// mouse player/cam mode
+#	define GTA_REPLAY
+#	define GTA_SCENE_EDIT
+#elif defined GTA_XBOX
+#endif
+
+#ifdef VU_COLLISION
+#define COMPRESSED_COL_VECTORS	// currently need compressed vectors in this code
+#endif
+
+#ifdef MASTER
+	// only in master builds
+	#undef DRAW_GAME_VERSION_TEXT
+#else
+	// not in master builds
+	#define VALIDATE_SAVE_SIZE
+
+	#define DEBUGMENU
+#endif
+
+#ifdef FINAL
+	// in all games
+#	define USE_MY_DOCUMENTS	// use my documents directory for user files
+#else
+	// not in any game
+#	define CHATTYSPLASH	// print what the game is loading
+#	define TIMEBARS		// print debug timers
+#endif
+
+#define FIX_BUGS		// fixes bugs that we've came across during reversing. You can undefine this only on release builds.
+#define MORE_LANGUAGES		// Add more translations to the game
+#define COMPATIBLE_SAVES // this allows changing structs while keeping saves compatible
+#define LOAD_INI_SETTINGS // as the name suggests. fundamental for CUSTOM_FRONTEND_OPTIONS
+#define FIX_HIGH_FPS_BUGS_ON_FRONTEND
+
+#define NO_MOVIES	// add option to disable intro videos
+
+#if defined(__LP64__) || defined(_WIN64)
+#define FIX_BUGS_64 // Must have fixes to be able to run 64 bit build
+#endif
+
+#define ASCII_STRCMP // use faster ascii str comparisons
+
+#if !defined _WIN32 || defined __MWERKS__ || defined __MINGW32__ || defined VANILLA_DEFINES
+#undef ASCII_STRCMP
+#endif
+
+// Just debug menu entries
+#ifdef DEBUGMENU
+#define RELOADABLES			// some debug menu options to reload TXD files
+#define MISSION_SWITCHER // from debug menu
+#endif
+
+// Rendering/display
+#define ASPECT_RATIO_SCALE	// Not just makes everything scale with aspect ratio, also adds support for all aspect ratios
+#define PROPER_SCALING		// use original DEFAULT_SCREEN_WIDTH/DEFAULT_SCREEN_HEIGHT from PS2 instead of PC(R* changed HEIGHT here to make radar look better, but broke other hud elements aspect ratio).
+#define DEFAULT_NATIVE_RESOLUTION	// Set default video mode to your native resolution (fixes Windows 10 launch)
+#define USE_TXD_CDIMAGE		// generate and load textures from txd.img
+#define PS2_ALPHA_TEST		// emulate ps2 alpha test 
+#define IMPROVED_VIDEOMODE	// save and load videomode parameters instead of a magic number
+#define DISABLE_LOADING_SCREEN // disable the loading screen which vastly improves the loading time
+#define DISABLE_VSYNC_ON_TEXTURE_CONVERSION // make texture conversion work faster by disabling vsync
+#define ANISOTROPIC_FILTERING	// set all textures to max anisotropic filtering
+//#define USE_TEXTURE_POOL
+#ifdef LIBRW
+#define EXTENDED_COLOURFILTER		// more options for colour filter (replaces mblur)
+#define EXTENDED_PIPELINES		// custom render pipelines (includes Neo)
+#define SCREEN_DROPLETS			// neo water droplets
+#define NEW_RENDERER		// leeds-like world rendering, needs librw
+#endif
+
+#define FIX_SPRITES	// fix sprites aspect ratio(moon, coronas, particle etc)
+
+#ifndef EXTENDED_COLOURFILTER
+#undef SCREEN_DROPLETS		// we need the backbuffer for this effect
+#endif
+
+// Water & Particle
+// #define PC_WATER
+#define WATER_CHEATS
+
+//#define USE_CUTSCENE_SHADOW_FOR_PED
+#define DISABLE_CUTSCENE_SHADOWS
+
+// Pad
+#if !defined(RW_GL3) && defined(_WIN32)
+#define XINPUT
+#endif
+#if defined XINPUT || (defined RW_GL3 && !defined LIBRW_SDL2 && !defined __SWITCH__)
+#define DETECT_JOYSTICK_MENU // Then we'll expect user to enter Controller->Detect joysticks if his joystick isn't detected at the start.
+#endif
+#define DETECT_PAD_INPUT_SWITCH // Adds automatic switch of pad related stuff between controller and kb/m
+#define KANGAROO_CHEAT
+#define RESTORE_ALLCARSHELI_CHEAT
+#define BETTER_ALLCARSAREDODO_CHEAT
+#define WALLCLIMB_CHEAT
+#define REGISTER_START_BUTTON
+#define BIND_VEHICLE_FIREWEAPON // Adds ability to rebind fire key for 'in vehicle' controls
+#define BUTTON_ICONS // use textures to show controller buttons
+
+// Hud, frontend and radar
+#define PC_MENU
+#define FIX_RADAR			// use radar size from early version before R* broke it
+#define RADIO_OFF_TEXT		// Won't work without FIX_BUGS
+
+#ifndef PC_MENU
+#	define PS2_MENU
+//#	define PS2_MENU_USEALLPAGEICONS
+#else
+#	define MAP_ENHANCEMENTS			// Adding waypoint and better mouse support
+#	ifdef XINPUT
+#		define GAMEPAD_MENU		// Add gamepad menu
+#	endif
+#	define TRIANGLE_BACK_BUTTON
+//#	define CIRCLE_BACK_BUTTON
+#define LEGACY_MENU_OPTIONS			// i.e. frame sync(vsync)
+#define MUCH_SHORTER_OUTRO_SCREEN
+// #define XBOX_MESSAGE_SCREEN			// Blue background, no "saved successfully press OK" screen etc.
+#	define CUSTOM_FRONTEND_OPTIONS
+
+#	ifdef CUSTOM_FRONTEND_OPTIONS
+#		define GRAPHICS_MENU_OPTIONS // otherwise Display settings will be scrollable
+#		define NO_ISLAND_LOADING  // disable loadscreen between islands via loading all island data at once, consumes more memory and CPU
+#		define CUTSCENE_BORDERS_SWITCH
+#		define MULTISAMPLING		// adds MSAA option
+#		define INVERT_LOOK_FOR_PAD // enable the hidden option
+#	endif
+#endif
+
+// Script
+#define USE_DEBUG_SCRIPT_LOADER	// Loads main.scm by default. Hold R for main_freeroam.scm and D for main_d.scm
+#define USE_MEASUREMENTS_IN_METERS // makes game use meters instead of feet in script
+#define USE_PRECISE_MEASUREMENT_CONVERTION // makes game convert feet to meeters more precisely
+#define SUPPORT_JAPANESE_SCRIPT
+//#define SUPPORT_XBOX_SCRIPT
+//#define SUPPORT_MOBILE_SCRIPT
+#if (defined SUPPORT_XBOX_SCRIPT && defined SUPPORT_MOBILE_SCRIPT)
+static_assert(false, "SUPPORT_XBOX_SCRIPT and SUPPORT_MOBILE_SCRIPT are mutually exclusive");
+#endif
+#ifdef PC_MENU
+//#define MISSION_REPLAY // mobile feature
+#endif
+//#define SIMPLIER_MISSIONS // apply simplifications from mobile
+#define USE_ADVANCED_SCRIPT_DEBUG_OUTPUT
+#define SCRIPT_LOG_FILE_LEVEL 0 // 0 == no log, 1 == overwrite every frame, 2 == full log
+
+#if SCRIPT_LOG_FILE_LEVEL == 0
+#undef USE_ADVANCED_SCRIPT_DEBUG_OUTPUT
+#endif
+
+#ifndef USE_ADVANCED_SCRIPT_DEBUG_OUTPUT
+#define USE_BASIC_SCRIPT_DEBUG_OUTPUT
+#endif
+
+#ifdef MASTER
+#undef USE_ADVANCED_SCRIPT_DEBUG_OUTPUT
+#undef USE_BASIC_SCRIPT_DEBUG_OUTPUT
+#endif
+
+// Replay
+//#define DONT_FIX_REPLAY_BUGS // keeps various bugs in CReplay, some of which are fairly cool!
+//#define USE_BETA_REPLAY_MODE // adds another replay mode, a few seconds slomo (caution: buggy!)
+
+// Vehicles
+#define EXPLODING_AIRTRAIN	// can blow up jumbo jet with rocket launcher
+#define CPLANE_ROTORS		// make the rotors of the NPC police heli rotate
+
+// Pickups
+//#define MONEY_MESSAGES
+#define CAMERA_PICKUP
+
+// Peds
+#define CANCELLABLE_CAR_ENTER
+
+// Camera
+#define IMPROVED_CAMERA		// Better Debug cam, and maybe more in the future
+#define FREE_CAM		// Rotating cam
+
+// Audio
+#define RADIO_SCROLL_TO_PREV_STATION // Won't work without FIX_BUGS
+#define AUDIO_CACHE // cache sound lengths to speed up the cold boot
+//#define PS2_AUDIO_PATHS // changes audio paths for cutscenes and radio to PS2 paths (needs vbdec on MSS builds)
+//#define AUDIO_OAL_USE_SNDFILE // use libsndfile to decode WAVs instead of our internal decoder
+#define AUDIO_OAL_USE_MPG123 // use mpg123 to support mp3 files
+
+#ifdef AUDIO_OPUS
+#define AUDIO_OAL_USE_OPUS // enable support of opus files
+//#define OPUS_AUDIO_PATHS // (not supported on VC yet) changes audio paths to opus paths (doesn't work if AUDIO_OAL_USE_OPUS isn't enabled)
+//#define OPUS_SFX  // enable if your sfx.raw is encoded with opus (doesn't work if AUDIO_OAL_USE_OPUS isn't enabled)
+
+#ifndef AUDIO_OAL_USE_OPUS
+#undef OPUS_AUDIO_PATHS
+#undef OPUS_SFX
+#endif
+
+#endif
+
+// Streaming
+#if !defined(_WIN32) && !defined(__SWITCH__)
+	//#define ONE_THREAD_PER_CHANNEL // Don't use if you're not on SSD/Flash - also not utilized too much right now(see commented LoadAllRequestedModels in Streaming.cpp)
+	#define FLUSHABLE_STREAMING // Make it possible to interrupt reading when processing file isn't needed anymore.
+#endif
+#define BIG_IMG // Not complete - allows to read larger img files
+
+//#define SQUEEZE_PERFORMANCE
+#ifdef SQUEEZE_PERFORMANCE
+	#undef PS2_ALPHA_TEST
+	#undef NO_ISLAND_LOADING
+#endif
+
+// -------
+
+#if defined __MWERKS__ || defined VANILLA_DEFINES
+#define FINAL
+#undef CHATTYSPLASH
+#undef TIMEBARS
+
+#define MASTER
+#undef VALIDATE_SAVE_SIZE
+#undef NO_MOVIES
+#undef DEBUGMENU
+
+#undef DRAW_GAME_VERSION_TEXT
+
+//#undef NASTY_GAME
+//#undef NO_CDCHECK
+
+#undef GTA_PS2_STUFF
+#undef USE_PS2_RAND
+#undef RANDOMSPLASH
+#undef PS2_MATFX
+
+#undef FIX_BUGS
+#define THIS_IS_STUPID
+#undef MORE_LANGUAGES
+#undef COMPATIBLE_SAVES
+#undef LOAD_INI_SETTINGS
+#undef FIX_HIGH_FPS_BUGS_ON_FRONTEND
+
+#undef ASPECT_RATIO_SCALE
+#undef PROPER_SCALING
+//#undef DEFAULT_NATIVE_RESOLUTION
+#undef PS2_ALPHA_TEST
+#undef IMPROVED_VIDEOMODE
+#undef DISABLE_LOADING_SCREEN
+#undef DISABLE_VSYNC_ON_TEXTURE_CONVERSION
+
+#undef FIX_SPRITES
+
+#define PC_WATER
+#undef WATER_CHEATS
+
+#undef USE_CUTSCENE_SHADOW_FOR_PED
+#undef DISABLE_CUTSCENE_SHADOWS
+
+#undef XINPUT
+#undef DETECT_PAD_INPUT_SWITCH
+#undef KANGAROO_CHEAT
+#undef RESTORE_ALLCARSHELI_CHEAT
+#undef BETTER_ALLCARSAREDODO_CHEAT
+#undef WALLCLIMB_CHEAT
+#undef REGISTER_START_BUTTON
+#undef BIND_VEHICLE_FIREWEAPON
+#undef BUTTON_ICONS
+
+#undef FIX_RADAR
+#undef RADIO_OFF_TEXT
+
+#undef MAP_ENHANCEMENTS
+#undef GAMEPAD_MENU
+#undef MUCH_SHORTER_OUTRO_SCREEN
+#undef CUSTOM_FRONTEND_OPTIONS
+
+#undef GRAPHICS_MENU_OPTIONS
+#undef NO_ISLAND_LOADING
+#undef CUTSCENE_BORDERS_SWITCH
+#undef MULTISAMPLING
+#undef INVERT_LOOK_FOR_PAD
+
+#undef USE_DEBUG_SCRIPT_LOADER
+#undef USE_MEASUREMENTS_IN_METERS
+#undef USE_PRECISE_MEASUREMENT_CONVERTION
+#undef SUPPORT_JAPANESE_SCRIPT
+#undef MISSION_REPLAY
+#undef USE_ADVANCED_SCRIPT_DEBUG_OUTPUT
+#undef USE_BASIC_SCRIPT_DEBUG_OUTPUT
+
+#define DONT_FIX_REPLAY_BUGS
+
+#undef EXPLODING_AIRTRAIN
+#undef CPLANE_ROTORS
+#undef CAMERA_PICKUP
+#undef CANCELLABLE_CAR_ENTER
+#undef IMPROVED_CAMERA
+#undef FREE_CAM
+#undef BIG_IMG
+
+#undef RADIO_SCROLL_TO_PREV_STATION
+#endif
diff --git a/src/core/main.cpp b/src/core/main.cpp
new file mode 100644
index 0000000..a38fe72
--- /dev/null
+++ b/src/core/main.cpp
@@ -0,0 +1,2429 @@
+#include "common.h"
+#include <time.h>
+#include "rpmatfx.h"
+#include "rphanim.h"
+#include "rpskin.h"
+#include "rtbmp.h"
+#include "rtpng.h"
+#ifdef ANISOTROPIC_FILTERING
+#include "rpanisot.h"
+#endif
+
+#include "main.h"
+#include "CdStream.h"
+#include "General.h"
+#include "RwHelper.h"
+#include "Clouds.h"
+#include "Draw.h"
+#include "Sprite2d.h"
+#include "Renderer.h"
+#include "Coronas.h"
+#include "WaterLevel.h"
+#include "Weather.h"
+#include "Glass.h"
+#include "WaterCannon.h"
+#include "SpecialFX.h"
+#include "Shadows.h"
+#include "Skidmarks.h"
+#include "Antennas.h"
+#include "Rubbish.h"
+#include "Particle.h"
+#include "Pickups.h"
+#include "WeaponEffects.h"
+#include "PointLights.h"
+#include "Fluff.h"
+#include "Replay.h"
+#include "Camera.h"
+#include "World.h"
+#include "Ped.h"
+#include "Font.h"
+#include "Pad.h"
+#include "Hud.h"
+#include "User.h"
+#include "Messages.h"
+#include "Darkel.h"
+#include "Garages.h"
+#include "MusicManager.h"
+#include "VisibilityPlugins.h"
+#include "NodeName.h"
+#include "DMAudio.h"
+#include "CutsceneMgr.h"
+#include "Lights.h"
+#include "Credits.h"
+#include "ZoneCull.h"
+#include "Timecycle.h"
+#include "TxdStore.h"
+#include "FileMgr.h"
+#include "Text.h"
+#include "RpAnimBlend.h"
+#include "Frontend.h"
+#include "AnimViewer.h"
+#include "Script.h"
+#include "PathFind.h"
+#include "Debug.h"
+#include "Console.h"
+#include "timebars.h"
+#include "GenericGameStorage.h"
+#include "MemoryCard.h"
+#include "MemoryHeap.h"
+#include "SceneEdit.h"
+#include "debugmenu.h"
+#include "Clock.h"
+#include "Occlusion.h"
+#include "Ropes.h"
+#include "postfx.h"
+#include "custompipes.h"
+#include "screendroplets.h"
+#include "VarConsole.h"
+#ifdef USE_OUR_VERSIONING
+#include "GitSHA1.h"
+#endif
+
+GlobalScene Scene;
+
+uint8 work_buff[55000];
+char gString[256];
+char gString2[512];
+wchar gUString[256];
+wchar gUString2[256];
+
+float FramesPerSecond = 30.0f;
+
+bool gbPrintShite = false;
+bool gbModelViewer;
+#ifdef TIMEBARS
+bool gbShowTimebars;
+#endif
+#ifdef DRAW_GAME_VERSION_TEXT
+bool gbDrawVersionText; // Our addition, we think it was always enabled on !MASTER builds
+#endif
+#ifdef NO_MOVIES
+bool gbNoMovies;
+#endif
+
+volatile int32 frameCount;
+
+RwRGBA gColourTop;
+
+bool gameAlreadyInitialised;
+
+float NumberOfChunksLoaded;
+#define TOTALNUMCHUNKS 95.0f
+
+bool g_SlowMode = false;
+char version_name[64];
+
+
+void GameInit(void);
+void SystemInit(void);
+void TheGame(void);
+
+#ifdef DEBUGMENU
+void DebugMenuPopulate(void);
+#endif
+
+#ifndef FINAL
+bool gbPrintMemoryUsage;
+#endif
+
+#ifdef GTA_PS2
+#define WANT_TO_LOAD TheMemoryCard.m_bWantToLoad
+#define FOUND_GAME_TO_LOAD TheMemoryCard.b_FoundRecentSavedGameWantToLoad
+#else
+#define WANT_TO_LOAD FrontEndMenuManager.m_bWantToLoad
+#define FOUND_GAME_TO_LOAD b_FoundRecentSavedGameWantToLoad
+#endif
+
+#ifdef NEW_RENDERER
+bool gbNewRenderer;
+#endif
+#ifdef FIX_BUGS
+// need to clear stencil for mblur fx. no idea why it works in the original game
+// also for clearing out water rects in new renderer
+#define CLEARMODE (rwCAMERACLEARZ | rwCAMERACLEARSTENCIL)
+#else
+#define CLEARMODE (rwCAMERACLEARZ)
+#endif
+
+bool bDisplayNumOfAtomicsRendered = false;
+bool bDisplayPosn = false;
+
+#ifdef __MWERKS__
+void
+debug(char *fmt, ...)
+{
+#ifndef MASTER
+	// TODO put something here
+#endif
+}
+
+void
+Error(char *fmt, ...)
+{
+#ifndef MASTER
+	// TODO put something here
+#endif
+}
+#endif
+
+void
+ValidateVersion()
+{
+	int32 file = CFileMgr::OpenFile("models\\coll\\peds.col", "rb");
+	char buff[128];
+
+	if ( file != -1 )
+	{
+		CFileMgr::Seek(file, 100, SEEK_SET);
+		
+		for ( int i = 0; i < 128; i++ )
+		{
+			CFileMgr::Read(file, &buff[i], sizeof(char));
+			buff[i] -= 23;
+			if ( buff[i] == '\0' )
+				break;
+			CFileMgr::Seek(file, 99, SEEK_CUR);
+		}
+		
+		if ( !strncmp(buff, "grandtheftauto3", 15) )
+		{
+			strncpy(version_name, &buff[15], 64);
+			CFileMgr::CloseFile(file);
+			return;
+		}
+	}
+
+	LoadingScreen("Invalid version", NULL, NULL);
+	
+	while(true)
+	{
+		;
+	}
+}
+
+bool
+DoRWStuffStartOfFrame(int16 TopRed, int16 TopGreen, int16 TopBlue, int16 BottomRed, int16 BottomGreen, int16 BottomBlue, int16 Alpha)
+{
+	CRGBA TopColor(TopRed, TopGreen, TopBlue, Alpha);
+	CRGBA BottomColor(BottomRed, BottomGreen, BottomBlue, Alpha);
+
+	CDraw::CalculateAspectRatio();
+	CameraSize(Scene.camera, nil, SCREEN_VIEWWINDOW, SCREEN_ASPECT_RATIO);
+	CVisibilityPlugins::SetRenderWareCamera(Scene.camera);
+	RwCameraClear(Scene.camera, &TopColor.rwRGBA, CLEARMODE);
+
+	if(!RsCameraBeginUpdate(Scene.camera))
+		return false;
+
+	CSprite2d::InitPerFrame();
+
+	if(Alpha != 0)
+		CSprite2d::DrawRect(CRect(0.0f, 0.0f, SCREEN_WIDTH, SCREEN_HEIGHT), BottomColor, BottomColor, TopColor, TopColor);
+
+	return true;
+}
+
+bool
+DoRWStuffStartOfFrame_Horizon(int16 TopRed, int16 TopGreen, int16 TopBlue, int16 BottomRed, int16 BottomGreen, int16 BottomBlue, int16 Alpha)
+{
+	CDraw::CalculateAspectRatio();
+	CameraSize(Scene.camera, nil, SCREEN_VIEWWINDOW, SCREEN_ASPECT_RATIO);
+	CVisibilityPlugins::SetRenderWareCamera(Scene.camera);
+	RwCameraClear(Scene.camera, &gColourTop, CLEARMODE);
+
+	if(!RsCameraBeginUpdate(Scene.camera))
+		return false;
+
+	TheCamera.m_viewMatrix.Update();
+	CClouds::RenderBackground(TopRed, TopGreen, TopBlue, BottomRed, BottomGreen, BottomBlue, Alpha);
+
+	return true;
+}
+
+// This is certainly a very useful function
+void
+DoRWRenderHorizon(void)
+{
+	CClouds::RenderHorizon();
+}
+
+void
+DoFade(void)
+{
+	if(CTimer::GetIsPaused())
+		return;
+
+#ifdef PS2_MENU
+	if(TheMemoryCard.JustLoadedDontFadeInYet){
+		TheMemoryCard.JustLoadedDontFadeInYet = false;
+		TheMemoryCard.TimeStartedCountingForFade = CTimer::GetTimeInMilliseconds();
+	}
+#else
+	if(JustLoadedDontFadeInYet){
+		JustLoadedDontFadeInYet = false;
+		TimeStartedCountingForFade = CTimer::GetTimeInMilliseconds();
+	}
+#endif
+
+#ifdef PS2_MENU
+	if(TheMemoryCard.StillToFadeOut){
+		if(CTimer::GetTimeInMilliseconds() - TheMemoryCard.TimeStartedCountingForFade > TheMemoryCard.TimeToStayFadedBeforeFadeOut){
+			TheMemoryCard.StillToFadeOut = false;
+#else
+	if(StillToFadeOut){
+		if(CTimer::GetTimeInMilliseconds() - TimeStartedCountingForFade > TimeToStayFadedBeforeFadeOut){
+			StillToFadeOut = false;
+#endif
+			TheCamera.Fade(3.0f, FADE_IN);
+			TheCamera.ProcessFade();
+			TheCamera.ProcessMusicFade();
+		}else{
+			TheCamera.SetFadeColour(0, 0, 0);
+			TheCamera.Fade(0.0f, FADE_OUT);
+			TheCamera.ProcessFade();
+		}
+	}
+
+	if(CDraw::FadeValue != 0 || FrontEndMenuManager.m_PrefsBrightness < 256){
+		CSprite2d *splash = LoadSplash(nil);
+
+		CRGBA fadeColor;
+		CRect rect;
+		int fadeValue = CDraw::FadeValue;
+		float brightness = Min(FrontEndMenuManager.m_PrefsBrightness, 256);
+		if(brightness <= 50)
+			brightness = 50;
+		if(FrontEndMenuManager.m_bMenuActive)
+			brightness = 256;
+
+		if(TheCamera.m_FadeTargetIsSplashScreen)
+			fadeValue = 0;
+
+		float fade = fadeValue + 256 - brightness;
+		if(fade == 0){
+			fadeColor.r = 0;
+			fadeColor.g = 0;
+			fadeColor.b = 0;
+			fadeColor.a = 0;
+		}else{
+			fadeColor.r = fadeValue * CDraw::FadeRed / fade;
+			fadeColor.g = fadeValue * CDraw::FadeGreen / fade;
+			fadeColor.b = fadeValue * CDraw::FadeBlue / fade;
+			int alpha = 255 - brightness*(256 - fadeValue)/256;
+			if(alpha < 0)
+				alpha = 0;
+			fadeColor.a = alpha;
+		}
+
+		TheCamera.GetScreenRect(rect);
+		CSprite2d::DrawRect(rect, fadeColor);
+
+		if(CDraw::FadeValue != 0 && TheCamera.m_FadeTargetIsSplashScreen){
+			RwRenderStateSet(rwRENDERSTATETEXTUREFILTER, (void*)rwFILTERLINEAR);
+			fadeColor.r = 255;
+			fadeColor.g = 255;
+			fadeColor.b = 255;
+			fadeColor.a = CDraw::FadeValue;
+			splash->Draw(CRect(0.0f, 0.0f, SCREEN_WIDTH, SCREEN_HEIGHT), fadeColor, fadeColor, fadeColor, fadeColor);
+		}
+	}
+}
+
+bool
+RwGrabScreen(RwCamera *camera, RwChar *filename)
+{
+	char temp[255];
+	RwImage *pImage = RsGrabScreen(camera);
+	bool result = true;
+
+	if (pImage == nil)
+		return false;
+
+	strcpy(temp, CFileMgr::GetRootDirName());
+	strcat(temp, filename);
+
+#ifndef LIBRW
+	if (RtBMPImageWrite(pImage, &temp[0]) == nil)
+#else
+	if (RtPNGImageWrite(pImage, &temp[0]) == nil)
+#endif
+		result = false;
+	RwImageDestroy(pImage);
+	return result;
+}
+
+#define TILE_WIDTH 576
+#define TILE_HEIGHT 432
+
+void
+DoRWStuffEndOfFrame(void)
+{
+	CDebug::DisplayScreenStrings();	// custom
+	CDebug::DebugDisplayTextBuffer();
+	FlushObrsPrintfs();
+	RwCameraEndUpdate(Scene.camera);
+	RsCameraShowRaster(Scene.camera);
+#ifndef MASTER
+	char s[48];
+#ifdef THIS_IS_STUPID
+	if (CPad::GetPad(1)->GetLeftShockJustDown()) {
+		// try using both controllers for this thing... crazy bastards
+		if (CPad::GetPad(0)->GetRightStickY() > 0) {
+			sprintf(s, "screen%d%d.ras", CClock::ms_nGameClockHours, CClock::ms_nGameClockMinutes);
+			// TODO
+			//RtTileRender(Scene.camera, TILE_WIDTH * 2, TILE_HEIGHT * 2, TILE_WIDTH, TILE_HEIGHT, &NewTileRendererCB, nil, s);
+		} else {
+			sprintf(s, "screen%d%d.bmp", CClock::ms_nGameClockHours, CClock::ms_nGameClockMinutes);
+			RwGrabScreen(Scene.camera, s);
+		}
+	}
+#else
+	if (CPad::GetPad(1)->GetLeftShockJustDown() || CPad::GetPad(0)->GetFJustDown(11)) {
+		sprintf(s, "screen_%11lld.png", time(nil));
+		RwGrabScreen(Scene.camera, s);
+	}
+#endif
+#endif // !MASTER
+}
+
+static RwBool 
+PluginAttach(void)
+{
+	if( !RpWorldPluginAttach() )
+	{
+		printf("Couldn't attach world plugin\n");
+		
+		return FALSE;
+	}
+	
+	if( !RpSkinPluginAttach() )
+	{
+		printf("Couldn't attach RpSkin plugin\n");
+		
+		return FALSE;
+	}
+#ifndef LIBRW
+	if (!RtAnimInitialize())
+	{
+		return FALSE;
+	}
+#endif
+	if( !RpHAnimPluginAttach() )
+	{
+		printf("Couldn't attach RpHAnim plugin\n");
+		
+		return FALSE;
+	}
+	
+	if( !NodeNamePluginAttach() )
+	{
+		printf("Couldn't attach node name plugin\n");
+		
+		return FALSE;
+	}
+	
+	if( !CVisibilityPlugins::PluginAttach() )
+	{
+		printf("Couldn't attach visibility plugins\n");
+		
+		return FALSE;
+	}
+	
+	if( !RpAnimBlendPluginAttach() )
+	{
+		printf("Couldn't attach RpAnimBlend plugin\n");
+		
+		return FALSE;
+	}
+	
+	if( !RpMatFXPluginAttach() )
+	{
+		printf("Couldn't attach RpMatFX plugin\n");
+		
+		return FALSE;
+	}
+#ifdef ANISOTROPIC_FILTERING
+	RpAnisotPluginAttach();
+#endif
+#ifdef EXTENDED_PIPELINES
+	CustomPipes::CustomPipeRegister();
+#endif
+
+	return TRUE;
+}
+
+#ifdef GTA_PS2
+#define NUM_PREALLOC_ATOMICS 1800
+#define NUM_PREALLOC_CLUMPS 80
+#define NUM_PREALLOC_FRAMES 2600
+#define NUM_PREALLOC_GEOMETRIES 850
+#define NUM_PREALLOC_TEXDICTS 121
+#define NUM_PREALLOC_TEXTURES 1700
+#define NUM_PREALLOC_MATERIALS 2600
+bool preAlloc;
+
+void
+PreAllocateRwObjects(void)
+{
+	int i;
+
+	PUSH_MEMID(MEMID_PRE_ALLOC);
+	void **tmp = new void*[0x8000];
+	preAlloc = true;
+
+	for(i = 0; i < NUM_PREALLOC_ATOMICS; i++)
+		tmp[i] = RpAtomicCreate();
+	for(i = 0; i < NUM_PREALLOC_ATOMICS; i++)
+		RpAtomicDestroy((RpAtomic*)tmp[i]);
+
+	for(i = 0; i < NUM_PREALLOC_CLUMPS; i++)
+		tmp[i] = RpClumpCreate();
+	for(i = 0; i < NUM_PREALLOC_CLUMPS; i++)
+		RpClumpDestroy((RpClump*)tmp[i]);
+
+	for(i = 0; i < NUM_PREALLOC_FRAMES; i++)
+		tmp[i] = RwFrameCreate();
+	for(i = 0; i < NUM_PREALLOC_FRAMES; i++)
+		RwFrameDestroy((RwFrame*)tmp[i]);
+
+	for(i = 0; i < NUM_PREALLOC_GEOMETRIES; i++)
+		tmp[i] = RpGeometryCreate(0, 0, 0);
+	for(i = 0; i < NUM_PREALLOC_GEOMETRIES; i++)
+		RpGeometryDestroy((RpGeometry*)tmp[i]);
+
+	for(i = 0; i < NUM_PREALLOC_TEXDICTS; i++)
+		tmp[i] = RwTexDictionaryCreate();
+	for(i = 0; i < NUM_PREALLOC_TEXDICTS; i++)
+		RwTexDictionaryDestroy((RwTexDictionary*)tmp[i]);
+
+	for(i = 0; i < NUM_PREALLOC_TEXTURES; i++)
+		tmp[i] = RwTextureCreate(RwRasterCreate(0, 0, 0, 0));
+	for(i = 0; i < NUM_PREALLOC_TEXDICTS; i++)
+		RwTextureDestroy((RwTexture*)tmp[i]);
+
+	for(i = 0; i < NUM_PREALLOC_MATERIALS; i++)
+		tmp[i] = RpMaterialCreate();
+	for(i = 0; i < NUM_PREALLOC_MATERIALS; i++)
+		RpMaterialDestroy((RpMaterial*)tmp[i]);
+
+	delete[] tmp;
+	preAlloc = false;
+	POP_MEMID();
+}
+#endif
+
+static RwBool 
+Initialise3D(void *param)
+{
+	PUSH_MEMID(MEMID_RENDER);
+
+#ifndef MASTER
+	VarConsole.Add("Display number of atomics rendered", &bDisplayNumOfAtomicsRendered, true);
+	VarConsole.Add("Display posn and framerate", &bDisplayPosn, true);
+#endif
+
+	if (RsRwInitialize(param))
+	{
+		POP_MEMID();
+
+#ifdef DEBUGMENU
+		DebugMenuInit();
+		DebugMenuPopulate();
+#endif // !DEBUGMENU
+		return CGame::InitialiseRenderWare();
+	}
+	POP_MEMID();
+
+	return (FALSE);
+}
+
+static void 
+Terminate3D(void)
+{
+	CGame::ShutdownRenderWare();
+#ifdef DEBUGMENU
+	DebugMenuShutdown();
+#endif // !DEBUGMENU
+	
+	RsRwTerminate();
+
+	return;
+}
+
+CSprite2d splash;
+int splashTxdId = -1;
+
+CSprite2d*
+LoadSplash(const char *name)
+{
+	RwTexDictionary *txd;
+	char filename[140];
+	RwTexture *tex = nil;
+
+	if(name == nil)
+		return &splash;
+	if(splashTxdId == -1)
+		splashTxdId = CTxdStore::AddTxdSlot("splash");
+
+	txd = CTxdStore::GetSlot(splashTxdId)->texDict;
+	if(txd)
+		tex = RwTexDictionaryFindNamedTexture(txd, name);
+	// if texture is found, splash was already set up below
+
+	if(tex == nil){
+		CFileMgr::SetDir("TXD\\");
+		sprintf(filename, "%s.txd", name);
+		if(splash.m_pTexture)
+			splash.Delete();
+		if(txd)
+			CTxdStore::RemoveTxd(splashTxdId);
+		CTxdStore::LoadTxd(splashTxdId, filename);
+		CTxdStore::AddRef(splashTxdId);
+		CTxdStore::PushCurrentTxd();
+		CTxdStore::SetCurrentTxd(splashTxdId);
+		splash.SetTexture(name);
+		CTxdStore::PopCurrentTxd();
+		CFileMgr::SetDir("");
+	}
+
+	return &splash;
+}
+
+void
+DestroySplashScreen(void)
+{
+	splash.Delete();
+	if(splashTxdId != -1)
+		CTxdStore::RemoveTxdSlot(splashTxdId);
+	splashTxdId = -1;
+}
+
+Const char*
+GetRandomSplashScreen(void)
+{
+	int index;
+	static int index2 = 0;
+	static char splashName[128];
+	static int splashIndex[12] = {
+		1, 2,
+		3, 4,
+		5, 11,
+		6, 8,
+		9, 10,
+		7, 12
+	};
+
+	index = splashIndex[2*index2 + CGeneral::GetRandomNumberInRange(0, 2)];
+	index2++;
+	if(index2 == 6)
+		index2 = 0;
+	sprintf(splashName, "loadsc%d", index);
+	return splashName;
+}
+
+Const char*
+GetLevelSplashScreen(int level)
+{
+	static Const char *splashScreens[4] = {
+		nil,
+		"splash1",
+		"splash2",
+		"splash3",
+	};
+
+	return splashScreens[level];
+}
+
+void
+ResetLoadingScreenBar()
+{
+	NumberOfChunksLoaded = 0.0f;
+}
+
+void
+LoadingScreen(const char *str1, const char *str2, const char *splashscreen)
+{
+	CSprite2d *splash;
+
+#ifdef DISABLE_LOADING_SCREEN
+	if (str1 && str2)
+		return;
+#endif
+
+#ifndef RANDOMSPLASH
+	splashscreen = "LOADSC0";
+#endif
+
+	splash = LoadSplash(splashscreen);
+
+#ifndef GTA_PS2
+	if(RsGlobal.quit)
+		return;
+#endif
+
+	if(DoRWStuffStartOfFrame(0, 0, 0, 0, 0, 0, 255)){
+		CSprite2d::SetRecipNearClip();
+		CSprite2d::InitPerFrame();
+		CFont::InitPerFrame();
+		DefinedState();
+		RwRenderStateSet(rwRENDERSTATETEXTUREADDRESS, (void*)rwTEXTUREADDRESSCLAMP);
+		splash->Draw(CRect(0.0f, 0.0f, SCREEN_WIDTH, SCREEN_HEIGHT), CRGBA(255, 255, 255, 255));
+
+		if(str1){
+			NumberOfChunksLoaded += 1;
+
+#ifndef RANDOMSPLASH
+			float hpos = SCREEN_SCALE_X(40);
+			float length = SCREEN_WIDTH - SCREEN_SCALE_X(80);
+			float top = SCREEN_HEIGHT - SCREEN_SCALE_Y(14);
+			float bottom = top + SCREEN_SCALE_Y(5);
+#else
+			float hpos = SCREEN_STRETCH_X(40);
+			float length = SCREEN_STRETCH_X(440);
+			// this is rather weird
+			float top = SCREEN_STRETCH_Y(407.4f - 7.0f/3.0f);
+			float bottom = SCREEN_STRETCH_Y(407.4f + 7.0f/3.0f);
+#endif
+
+			CSprite2d::DrawRect(CRect(hpos-1.0f, top-1.0f, hpos+length+1.0f, bottom+1.0f), CRGBA(40, 53, 68, 255));
+
+			CSprite2d::DrawRect(CRect(hpos, top, hpos+length, bottom), CRGBA(155, 50, 125, 255));
+
+			length *= NumberOfChunksLoaded/TOTALNUMCHUNKS;
+			CSprite2d::DrawRect(CRect(hpos, top, hpos+length, bottom), CRGBA(255, 150, 225, 255));
+
+			// this is done by the game but is unused
+			CFont::SetBackgroundOff();
+			CFont::SetScale(SCREEN_SCALE_X(2), SCREEN_SCALE_Y(2));
+			CFont::SetPropOn();
+			CFont::SetRightJustifyOn();
+			CFont::SetDropShadowPosition(1);
+			CFont::SetDropColor(CRGBA(0, 0, 0, 255));
+			CFont::SetFontStyle(FONT_HEADING);
+
+#ifdef CHATTYSPLASH
+			// my attempt
+			static wchar tmpstr[80];
+			float yscale = SCREEN_SCALE_Y(0.9f);
+			top -= 45*yscale;
+			CFont::SetScale(SCREEN_SCALE_X(0.75f), yscale);
+			CFont::SetPropOn();
+			CFont::SetRightJustifyOff();
+			CFont::SetFontStyle(FONT_STANDARD);
+			CFont::SetColor(CRGBA(255, 255, 255, 255));
+			AsciiToUnicode(str1, tmpstr);
+			CFont::PrintString(hpos, top, tmpstr);
+			top += 22*yscale;
+			if (str2) {
+				AsciiToUnicode(str2, tmpstr);
+				CFont::PrintString(hpos, top, tmpstr);
+			}
+#endif
+		}
+
+		CFont::DrawFonts();
+ 		DoRWStuffEndOfFrame();
+	}
+}
+
+void
+LoadingIslandScreen(const char *levelName)
+{
+	CSprite2d *splash;
+
+	splash = LoadSplash(nil);
+	if(!DoRWStuffStartOfFrame(0, 0, 0, 0, 0, 0, 255))
+		return;
+
+	CSprite2d::SetRecipNearClip();
+	CSprite2d::InitPerFrame();
+	CFont::InitPerFrame();
+	DefinedState();
+	CRGBA col = CRGBA(255, 255, 255, 255);
+	CRGBA col2 = CRGBA(0, 0, 0, 255);
+	CSprite2d::DrawRect(CRect(0.0f, 0.0f, SCREEN_WIDTH, SCREEN_HEIGHT), col2);
+	splash->Draw(CRect(0.0f, 0.0f, SCREEN_WIDTH, SCREEN_HEIGHT), col, col, col, col);
+	CFont::DrawFonts();
+	DoRWStuffEndOfFrame();
+}
+
+void
+ProcessSlowMode(void)
+{  
+	int16 lX = CPad::GetPad(0)->NewState.LeftStickX;
+	int16 lY = CPad::GetPad(0)->NewState.LeftStickY;
+	int16 rX = CPad::GetPad(0)->NewState.RightStickX;
+	int16 rY = CPad::GetPad(0)->NewState.RightStickY;
+	int16 L1 = CPad::GetPad(0)->NewState.LeftShoulder1;
+	int16 L2 = CPad::GetPad(0)->NewState.LeftShoulder2;
+	int16 R1 = CPad::GetPad(0)->NewState.RightShoulder1;
+	int16 R2 = CPad::GetPad(0)->NewState.RightShoulder2;
+	int16 up = CPad::GetPad(0)->NewState.DPadUp;
+	int16 down = CPad::GetPad(0)->NewState.DPadDown;
+	int16 left = CPad::GetPad(0)->NewState.DPadLeft;
+	int16 right = CPad::GetPad(0)->NewState.DPadRight;
+	int16 start = CPad::GetPad(0)->NewState.Start;
+	int16 select = CPad::GetPad(0)->NewState.Select;
+	int16 square = CPad::GetPad(0)->NewState.Square;
+	int16 triangle = CPad::GetPad(0)->NewState.Triangle;
+	int16 cross = CPad::GetPad(0)->NewState.Cross;
+	int16 circle = CPad::GetPad(0)->NewState.Circle;
+	int16 L3 = CPad::GetPad(0)->NewState.LeftShock;
+	int16 R3 = CPad::GetPad(0)->NewState.RightShock;
+	int16 networktalk = CPad::GetPad(0)->NewState.NetworkTalk;
+	int16 stop = true;
+	
+	do
+	{
+		if ( CPad::GetPad(1)->GetSelectJustDown() || CPad::GetPad(1)->GetStart() )
+			break;
+		
+		if ( stop )
+		{
+			CTimer::Stop();
+			stop = false;
+		}
+		
+		CPad::UpdatePads();
+		
+		RwCameraBeginUpdate(Scene.camera);
+		RwCameraEndUpdate(Scene.camera);
+		
+	} while (!CPad::GetPad(1)->GetSelectJustDown() && !CPad::GetPad(1)->GetStart());
+	
+	
+	CPad::GetPad(0)->OldState.LeftStickX = lX;
+	CPad::GetPad(0)->OldState.LeftStickY = lY;
+	CPad::GetPad(0)->OldState.RightStickX = rX;
+	CPad::GetPad(0)->OldState.RightStickY = rY;
+	CPad::GetPad(0)->OldState.LeftShoulder1 = L1;
+	CPad::GetPad(0)->OldState.LeftShoulder2 = L2;
+	CPad::GetPad(0)->OldState.RightShoulder1 = R1;
+	CPad::GetPad(0)->OldState.RightShoulder2 = R2;
+	CPad::GetPad(0)->OldState.DPadUp = up;
+	CPad::GetPad(0)->OldState.DPadDown = down;
+	CPad::GetPad(0)->OldState.DPadLeft = left;
+	CPad::GetPad(0)->OldState.DPadRight = right;
+	CPad::GetPad(0)->OldState.Start = start;
+	CPad::GetPad(0)->OldState.Select = select;
+	CPad::GetPad(0)->OldState.Square = square;
+	CPad::GetPad(0)->OldState.Triangle = triangle;
+	CPad::GetPad(0)->OldState.Cross = cross;
+	CPad::GetPad(0)->OldState.Circle = circle;
+	CPad::GetPad(0)->OldState.LeftShock = L3;
+	CPad::GetPad(0)->OldState.RightShock = R3;
+	CPad::GetPad(0)->OldState.NetworkTalk = networktalk;
+	CPad::GetPad(0)->NewState.LeftStickX = lX;
+	CPad::GetPad(0)->NewState.LeftStickY = lY;
+	CPad::GetPad(0)->NewState.RightStickX = rX;
+	CPad::GetPad(0)->NewState.RightStickY = rY;
+	CPad::GetPad(0)->NewState.LeftShoulder1 = L1;
+	CPad::GetPad(0)->NewState.LeftShoulder2 = L2;
+	CPad::GetPad(0)->NewState.RightShoulder1 = R1;
+	CPad::GetPad(0)->NewState.RightShoulder2 = R2;
+	CPad::GetPad(0)->NewState.DPadUp = up;
+	CPad::GetPad(0)->NewState.DPadDown = down;
+	CPad::GetPad(0)->NewState.DPadLeft = left;
+	CPad::GetPad(0)->NewState.DPadRight = right;
+	CPad::GetPad(0)->NewState.Start = start;
+	CPad::GetPad(0)->NewState.Select = select;
+	CPad::GetPad(0)->NewState.Square = square;
+	CPad::GetPad(0)->NewState.Triangle = triangle;
+	CPad::GetPad(0)->NewState.Cross = cross;
+	CPad::GetPad(0)->NewState.Circle = circle;
+	CPad::GetPad(0)->NewState.LeftShock = L3;
+	CPad::GetPad(0)->NewState.RightShock = R3;
+	CPad::GetPad(0)->NewState.NetworkTalk = networktalk;
+}
+
+
+float FramesPerSecondCounter;
+int32 FrameSamples;
+
+#ifndef MASTER
+struct tZonePrint
+{
+	char name[11];
+	char area[5];
+	CRect rect;
+};
+
+tZonePrint ZonePrint[] =
+{
+	{ "DOWNTOWN", "GM", CRect(-1500.0f, 1500.0f, -300.0f, 980.0f)},
+	{ "DOWNTOWS", "KB", CRect(-1200.0f, 980.0f, -300.0f, 435.0f)},
+	{ "GOLF", "NT", CRect(-300.0f, 660.0f, 320.0f, -255.0f)},
+	{ "LITTLEHA", "AG", CRect(-1250.0f, -310.0f, -746.0f, -926.0f)},
+	{ "HAITI", "CJ", CRect(-1355.0f, 30.0f, -637.0f, -304.0f)},
+	{ "HAITIN", "SM", CRect(-1355.0f, 435.0f, -637.0f, 30.0f)},
+	{ "DOCKS", "AW", CRect(-1122.0f, -926.0f, -609.0f, -1575.0f)},
+	{ "AIRPORT", "NT", CRect(-2000.0f, 200.0f, -871.0f, -2000.0f)},
+	{ "STARISL", "CJ", CRect(-724.0f, -320.0f, -40.0f, -380.0f)},
+	{ "CENT.ISLA", "NT", CRect(-163.0f, 1260.0f,  120.0f, 830.0f)},
+	{ "MALL", "AW", CRect( 300.0f, 1266.0f,  483.0f, 995.0f)},
+	{ "MANSION", "KB", CRect(-724.0f, -500.0f, -40.0f, -670.0f)},
+	{ "NBEACH", "AS", CRect( 120.0f,  1340.0f,  900.0f,  600.0f)},
+	{ "NBEACHBT", "AS", CRect( 200.0f, 680.0f,  660.0f, -50.0f)},
+	{ "NBEACHW", "AS", CRect(-93.0f, 80.0f,  410.0f, -680.0f)},
+	{ "OCEANDRV", "AC", CRect( 200.0f, -964.0f,  955.0f, -1797.0f)},
+	{ "OCEANDN", "WS", CRect( 400.0f, 50.0f,  955.0f,  -964.0f)},
+	{ "WASHINGTN", "AC", CRect(-320.0f, -487.0f,  500.0f, -1200.0f)},
+	{ "WASHINBTM", "AC", CRect(-255.0f, -1200.0f,  500.0f, -1690.0f)}
+};
+
+void
+PrintMemoryUsage(void)
+{
+// little hack
+if(CPools::GetPtrNodePool() == nil)
+return;
+
+	// Style taken from LCS, modified for III
+//	CFont::SetFontStyle(FONT_PAGER);
+	CFont::SetFontStyle(FONT_BANK);
+	CFont::SetBackgroundOff();
+	CFont::SetWrapx(640.0f);
+//	CFont::SetScale(0.5f, 0.75f);
+	CFont::SetScale(0.4f, 0.75f);
+	CFont::SetCentreOff();
+	CFont::SetCentreSize(640.0f);
+	CFont::SetJustifyOff();
+	CFont::SetPropOn();
+	CFont::SetColor(CRGBA(200, 200, 200, 200));
+	CFont::SetBackGroundOnlyTextOff();
+	CFont::SetDropShadowPosition(0);
+
+	float y;
+
+#ifdef USE_CUSTOM_ALLOCATOR
+	y = 24.0f;
+	sprintf(gString, "Total: %d blocks, %d bytes", gMainHeap.m_totalBlocksUsed, gMainHeap.m_totalMemUsed);
+	AsciiToUnicode(gString, gUString);
+	CFont::PrintString(24.0f, y, gUString);
+	y += 12.0f;
+
+	sprintf(gString, "Game: %d blocks, %d bytes", gMainHeap.GetBlocksUsed(MEMID_GAME), gMainHeap.GetMemoryUsed(MEMID_GAME));
+	AsciiToUnicode(gString, gUString);
+	CFont::PrintString(24.0f, y, gUString);
+	y += 12.0f;
+
+	sprintf(gString, "World: %d blocks, %d bytes", gMainHeap.GetBlocksUsed(MEMID_WORLD), gMainHeap.GetMemoryUsed(MEMID_WORLD));
+	AsciiToUnicode(gString, gUString);
+	CFont::PrintString(24.0f, y, gUString);
+	y += 12.0f;
+
+	sprintf(gString, "Render: %d blocks, %d bytes", gMainHeap.GetBlocksUsed(MEMID_RENDER), gMainHeap.GetMemoryUsed(MEMID_RENDER));
+	AsciiToUnicode(gString, gUString);
+	CFont::PrintString(24.0f, y, gUString);
+	y += 12.0f;
+
+	sprintf(gString, "PreAlloc: %d blocks, %d bytes", gMainHeap.GetBlocksUsed(MEMID_PRE_ALLOC), gMainHeap.GetMemoryUsed(MEMID_PRE_ALLOC));
+	AsciiToUnicode(gString, gUString);
+	CFont::PrintString(24.0f, y, gUString);
+	y += 12.0f;
+
+	sprintf(gString, "Default Models: %d blocks, %d bytes", gMainHeap.GetBlocksUsed(MEMID_DEF_MODELS), gMainHeap.GetMemoryUsed(MEMID_DEF_MODELS));
+	AsciiToUnicode(gString, gUString);
+	CFont::PrintString(24.0f, y, gUString);
+	y += 12.0f;
+
+	sprintf(gString, "Textures: %d blocks, %d bytes", gMainHeap.GetBlocksUsed(MEMID_TEXTURES), gMainHeap.GetMemoryUsed(MEMID_TEXTURES));
+	AsciiToUnicode(gString, gUString);
+	CFont::PrintString(24.0f, y, gUString);
+	y += 12.0f;
+
+	sprintf(gString, "Streaming: %d blocks, %d bytes", gMainHeap.GetBlocksUsed(MEMID_STREAM), gMainHeap.GetMemoryUsed(MEMID_STREAM));
+	AsciiToUnicode(gString, gUString);
+	CFont::PrintString(24.0f, y, gUString);
+	y += 12.0f;
+
+	sprintf(gString, "Streamed Models: %d blocks, %d bytes", gMainHeap.GetBlocksUsed(MEMID_STREAM_MODELS), gMainHeap.GetMemoryUsed(MEMID_STREAM_MODELS));
+	AsciiToUnicode(gString, gUString);
+	CFont::PrintString(24.0f, y, gUString);
+	y += 12.0f;
+
+	sprintf(gString, "Streamed LODs: %d blocks, %d bytes", gMainHeap.GetBlocksUsed(MEMID_STREAM_LODS), gMainHeap.GetMemoryUsed(MEMID_STREAM_LODS));
+	AsciiToUnicode(gString, gUString);
+	CFont::PrintString(24.0f, y, gUString);
+	y += 12.0f;
+
+	sprintf(gString, "Streamed Textures: %d blocks, %d bytes", gMainHeap.GetBlocksUsed(MEMID_STREAM_TEXUTRES), gMainHeap.GetMemoryUsed(MEMID_STREAM_TEXUTRES));
+	AsciiToUnicode(gString, gUString);
+	CFont::PrintString(24.0f, y, gUString);
+	y += 12.0f;
+
+	sprintf(gString, "Streamed Collision: %d blocks, %d bytes", gMainHeap.GetBlocksUsed(MEMID_STREAM_COLLISION), gMainHeap.GetMemoryUsed(MEMID_STREAM_COLLISION));
+	AsciiToUnicode(gString, gUString);
+	CFont::PrintString(24.0f, y, gUString);
+	y += 12.0f;
+
+	sprintf(gString, "Streamed Animation: %d blocks, %d bytes", gMainHeap.GetBlocksUsed(MEMID_STREAM_ANIMATION), gMainHeap.GetMemoryUsed(MEMID_STREAM_ANIMATION));
+	AsciiToUnicode(gString, gUString);
+	CFont::PrintString(24.0f, y, gUString);
+	y += 12.0f;
+
+	sprintf(gString, "Ped Attr: %d blocks, %d bytes", gMainHeap.GetBlocksUsed(MEMID_PED_ATTR), gMainHeap.GetMemoryUsed(MEMID_PED_ATTR));
+	AsciiToUnicode(gString, gUString);
+	CFont::PrintString(24.0f, y, gUString);
+	y += 12.0f;
+
+	sprintf(gString, "Animation: %d blocks, %d bytes", gMainHeap.GetBlocksUsed(MEMID_ANIMATION), gMainHeap.GetMemoryUsed(MEMID_ANIMATION));
+	AsciiToUnicode(gString, gUString);
+	CFont::PrintString(24.0f, y, gUString);
+	y += 12.0f;
+
+	sprintf(gString, "Pools: %d blocks, %d bytes", gMainHeap.GetBlocksUsed(MEMID_POOLS), gMainHeap.GetMemoryUsed(MEMID_POOLS));
+	AsciiToUnicode(gString, gUString);
+	CFont::PrintString(24.0f, y, gUString);
+	y += 12.0f;
+
+	sprintf(gString, "Collision: %d blocks, %d bytes", gMainHeap.GetBlocksUsed(MEMID_COLLISION), gMainHeap.GetMemoryUsed(MEMID_COLLISION));
+	AsciiToUnicode(gString, gUString);
+	CFont::PrintString(24.0f, y, gUString);
+	y += 12.0f;
+
+	sprintf(gString, "Game Process: %d blocks, %d bytes", gMainHeap.GetBlocksUsed(MEMID_GAME_PROCESS), gMainHeap.GetMemoryUsed(MEMID_GAME_PROCESS));
+	AsciiToUnicode(gString, gUString);
+	CFont::PrintString(24.0f, y, gUString);
+	y += 12.0f;
+
+	sprintf(gString, "Script: %d blocks, %d bytes", gMainHeap.GetBlocksUsed(MEMID_SCRIPT), gMainHeap.GetMemoryUsed(MEMID_SCRIPT));
+	AsciiToUnicode(gString, gUString);
+	CFont::PrintString(24.0f, y, gUString);
+	y += 12.0f;
+
+	sprintf(gString, "Cars: %d blocks, %d bytes", gMainHeap.GetBlocksUsed(MEMID_CARS), gMainHeap.GetMemoryUsed(MEMID_CARS));
+	AsciiToUnicode(gString, gUString);
+	CFont::PrintString(24.0f, y, gUString);
+	y += 12.0f;
+#endif
+
+	y = 132.0f;
+	AsciiToUnicode("Pools usage:", gUString);
+	CFont::PrintString(400.0f, y, gUString);
+	y += 12.0f;
+
+	sprintf(gString, "PtrNode: %d/%d", CPools::GetPtrNodePool()->GetNoOfUsedSpaces(), CPools::GetPtrNodePool()->GetSize());
+	AsciiToUnicode(gString, gUString);
+	CFont::PrintString(400.0f, y, gUString);
+	y += 12.0f;
+
+	sprintf(gString, "EntryInfoNode: %d/%d", CPools::GetEntryInfoNodePool()->GetNoOfUsedSpaces(), CPools::GetEntryInfoNodePool()->GetSize());
+	AsciiToUnicode(gString, gUString);
+	CFont::PrintString(400.0f, y, gUString);
+	y += 12.0f;
+
+	sprintf(gString, "Ped: %d/%d", CPools::GetPedPool()->GetNoOfUsedSpaces(), CPools::GetPedPool()->GetSize());
+	AsciiToUnicode(gString, gUString);
+	CFont::PrintString(400.0f, y, gUString);
+	y += 12.0f;
+
+	sprintf(gString, "Vehicle: %d/%d", CPools::GetVehiclePool()->GetNoOfUsedSpaces(), CPools::GetVehiclePool()->GetSize());
+	AsciiToUnicode(gString, gUString);
+	CFont::PrintString(400.0f, y, gUString);
+	y += 12.0f;
+
+	sprintf(gString, "Building: %d/%d", CPools::GetBuildingPool()->GetNoOfUsedSpaces(), CPools::GetBuildingPool()->GetSize());
+	AsciiToUnicode(gString, gUString);
+	CFont::PrintString(400.0f, y, gUString);
+	y += 12.0f;
+
+	sprintf(gString, "Treadable: %d/%d", CPools::GetTreadablePool()->GetNoOfUsedSpaces(), CPools::GetTreadablePool()->GetSize());
+	AsciiToUnicode(gString, gUString);
+	CFont::PrintString(400.0f, y, gUString);
+	y += 12.0f;
+
+	sprintf(gString, "Object: %d/%d", CPools::GetObjectPool()->GetNoOfUsedSpaces(), CPools::GetObjectPool()->GetSize());
+	AsciiToUnicode(gString, gUString);
+	CFont::PrintString(400.0f, y, gUString);
+	y += 12.0f;
+
+	sprintf(gString, "Dummy: %d/%d", CPools::GetDummyPool()->GetNoOfUsedSpaces(), CPools::GetDummyPool()->GetSize());
+	AsciiToUnicode(gString, gUString);
+	CFont::PrintString(400.0f, y, gUString);
+	y += 12.0f;
+
+	sprintf(gString, "AudioScriptObjects: %d/%d", CPools::GetAudioScriptObjectPool()->GetNoOfUsedSpaces(), CPools::GetAudioScriptObjectPool()->GetSize());
+	AsciiToUnicode(gString, gUString);
+	CFont::PrintString(400.0f, y, gUString);
+	y += 12.0f;
+}
+
+void
+DisplayGameDebugText()
+{
+	static bool bDisplayCheatStr = false; // custom
+
+#ifndef FINAL
+	{
+		SETTWEAKPATH("Debug");
+		TWEAKBOOL(bDisplayPosn);
+		TWEAKBOOL(bDisplayCheatStr);
+	}
+
+	if(gbPrintMemoryUsage)
+		PrintMemoryUsage();
+#endif
+
+	char str[200];
+	wchar ustr[200];
+
+#ifdef DRAW_GAME_VERSION_TEXT
+	wchar ver[200];
+
+	if(gbDrawVersionText) // This realtime switch is our thing
+	{
+
+#ifdef USE_OUR_VERSIONING
+	char verA[200];
+	sprintf(verA,
+#if defined _WIN32
+			"Win "
+#elif defined __linux__
+		    "Linux "
+#elif defined __APPLE__
+		    "Mac OS X "
+#elif defined __FreeBSD__
+		    "FreeBSD "
+#else
+		    "Posix-compliant "
+#endif
+#if defined __LP64__ || defined _WIN64
+			"64-bit "
+#else
+			"32-bit "
+#endif
+#if defined RW_D3D9
+		    "D3D9 "
+#elif defined RWLIBS
+		    "D3D8 "
+#elif defined RW_GL3
+		    "OpenGL "
+#endif
+#if defined AUDIO_OAL
+		    "OAL "
+#elif defined AUDIO_MSS
+		    "MSS "
+#endif
+#if defined _DEBUG || defined DEBUG
+		    "DEBUG "
+#endif
+		    "%.8s",
+		    g_GIT_SHA1);
+	AsciiToUnicode(verA, ver);
+	CFont::SetScale(SCREEN_SCALE_X(0.5f), SCREEN_SCALE_Y(0.7f));
+#else
+	AsciiToUnicode(version_name, ver);
+	CFont::SetScale(SCREEN_SCALE_X(0.5f), SCREEN_SCALE_Y(0.5f));
+#endif
+
+	CFont::SetPropOn();
+	CFont::SetBackgroundOff();
+	CFont::SetFontStyle(FONT_STANDARD);
+	CFont::SetCentreOff();
+	CFont::SetRightJustifyOff();
+	CFont::SetWrapx(SCREEN_WIDTH);
+	CFont::SetJustifyOff();
+	CFont::SetBackGroundOnlyTextOff();
+	CFont::SetColor(CRGBA(255, 108, 0, 255));
+	CFont::PrintString(SCREEN_SCALE_X(10.0f), SCREEN_SCALE_Y(10.0f), ver);
+	}
+#endif // #ifdef DRAW_GAME_VERSION_TEXT
+
+	FrameSamples++;
+#ifdef FIX_HIGH_FPS_BUGS_ON_FRONTEND
+	FramesPerSecondCounter += frameTime / 1000.f; // convert to seconds
+	FramesPerSecond = FrameSamples / FramesPerSecondCounter;
+#else
+	FramesPerSecondCounter += 1000.0f / (CTimer::GetTimeStepNonClippedInSeconds() * 1000.0f);	
+	FramesPerSecond = FramesPerSecondCounter / FrameSamples;
+#endif
+	
+	if ( FrameSamples > 30 )
+	{
+		FramesPerSecondCounter = 0.0f;
+		FrameSamples = 0;
+	}
+
+	if ( bDisplayPosn )
+	{
+		CVector pos = FindPlayerCoors();
+		int32 ZoneId = ARRAY_SIZE(ZonePrint)-1; // no zone
+		
+		for ( int32 i = 0; i < ARRAY_SIZE(ZonePrint)-1; i++ )
+		{
+			if ( pos.x > ZonePrint[i].rect.left
+				&& pos.x < ZonePrint[i].rect.right
+				&& pos.y > ZonePrint[i].rect.bottom
+				&& pos.y < ZonePrint[i].rect.top )
+			{
+				ZoneId = i;
+			}
+		}
+
+		//NOTE: fps should be 30, but its 29 due to different fp2int conversion 
+		sprintf(str, "X:%4.0f Y:%4.0f Z:%4.0f F-%d %s-%s", pos.x, pos.y, pos.z, (int32)FramesPerSecond,
+			ZonePrint[ZoneId].name, ZonePrint[ZoneId].area);
+
+		AsciiToUnicode(str, ustr);
+		
+		CFont::SetPropOn();
+		CFont::SetBackgroundOff();
+		CFont::SetScale(SCREEN_SCALE_X(0.6f), SCREEN_SCALE_Y(0.8f));
+		CFont::SetCentreOff();
+		CFont::SetRightJustifyOff();
+		CFont::SetJustifyOff();
+		CFont::SetBackGroundOnlyTextOff();
+		CFont::SetWrapx(SCREEN_STRETCH_X(DEFAULT_SCREEN_WIDTH));
+		CFont::SetFontStyle(FONT_STANDARD);
+		CFont::SetDropColor(CRGBA(0, 0, 0, 255));
+		CFont::SetDropShadowPosition(2);
+		CFont::SetColor(CRGBA(0, 0, 0, 255));
+		CFont::PrintString(41.0f, 41.0f, ustr);
+		
+		CFont::SetColor(CRGBA(205, 205, 0, 255));
+		CFont::PrintString(40.0f, 40.0f, ustr);
+	}
+
+	// custom
+	if (bDisplayCheatStr)
+	{
+		sprintf(str, "%s", CPad::KeyBoardCheatString);
+		AsciiToUnicode(str, ustr);
+
+		CFont::SetPropOn();
+		CFont::SetBackgroundOff();
+		CFont::SetScale(SCREEN_SCALE_X(0.6f), SCREEN_SCALE_Y(0.8f));
+		CFont::SetCentreOn();
+		CFont::SetBackGroundOnlyTextOff();
+		CFont::SetWrapx(SCREEN_STRETCH_X(DEFAULT_SCREEN_WIDTH));
+		CFont::SetFontStyle(FONT_STANDARD);
+
+		CFont::SetColor(CRGBA(0, 0, 0, 255));
+		CFont::PrintString(SCREEN_SCALE_X(DEFAULT_SCREEN_WIDTH * 0.5f)+2.f, SCREEN_SCALE_FROM_BOTTOM(20.0f)+2.f, ustr);
+
+		CFont::SetColor(CRGBA(255, 150, 225, 255));
+		CFont::PrintString(SCREEN_SCALE_X(DEFAULT_SCREEN_WIDTH * 0.5f), SCREEN_SCALE_FROM_BOTTOM(20.0f), ustr);
+	}
+}
+#endif
+
+#ifdef NEW_RENDERER
+bool gbRenderRoads = true;
+bool gbRenderEverythingBarRoads = true;
+bool gbRenderFadingInUnderwaterEntities = true;
+bool gbRenderFadingInEntities = true;
+bool gbRenderWater = true;
+bool gbRenderBoats = true;
+bool gbRenderVehicles = true;
+bool gbRenderWorld0 = true;
+bool gbRenderWorld1 = true;
+bool gbRenderWorld2 = true;
+
+void
+MattRenderScene(void)
+{
+	// this calls CMattRenderer::Render
+	/// CWorld::AdvanceCurrentScanCode();
+	// CMattRenderer::ResetRenderStates
+	/// CRenderer::ClearForFrame();		// before ConstructRenderList
+	// CClock::CalcEnvMapTimeMultiplicator
+	RwRenderStateSet(rwRENDERSTATECULLMODE, (void*)rwCULLMODECULLNONE);
+	CWaterLevel::RenderWater();	// actually CMattRenderer::RenderWater
+	// CClock::ms_EnvMapTimeMultiplicator = 1.0f;
+	// cWorldStream::ClearDynamics
+	/// CRenderer::ConstructRenderList();	// before PreRender
+if(gbRenderWorld0)
+	CRenderer::RenderWorld(0);	// roads
+	// CMattRenderer::ResetRenderStates
+	/// CRenderer::PreRender();	// has to be called before BeginUpdate because of cutscene shadows
+	CCoronas::RenderReflections();
+if(gbRenderWorld1)
+	CRenderer::RenderWorld(1);	// opaque
+if(gbRenderRoads)
+	CRenderer::RenderRoads();
+
+	CRenderer::RenderPeds();
+
+	// not sure where to put these since LCS has no underwater entities
+if(gbRenderBoats)
+	CRenderer::RenderBoats();
+if(gbRenderFadingInUnderwaterEntities)
+	CRenderer::RenderFadingInUnderwaterEntities();
+	RwRenderStateSet(rwRENDERSTATECULLMODE, (void*)rwCULLMODECULLNONE);
+if(gbRenderWater)
+	CRenderer::RenderTransparentWater();
+
+if(gbRenderEverythingBarRoads)
+	CRenderer::RenderEverythingBarRoads();
+	// seam fixer
+	// moved this:
+	// CRenderer::RenderFadingInEntities();
+}
+
+void
+RenderScene_new(void)
+{
+	PUSH_RENDERGROUP("RenderScene_new");
+	CClouds::Render();
+	DoRWRenderHorizon();
+
+	MattRenderScene();
+	DefinedState();
+	// CMattRenderer::ResetRenderStates
+	// moved CRenderer::RenderBoats to before transparent water
+	POP_RENDERGROUP();
+}
+
+// TODO
+bool FredIsInFirstPersonCam(void) { return false; }
+void
+RenderEffects_new(void)
+{
+	PUSH_RENDERGROUP("RenderEffects_new");
+	CShadows::RenderStaticShadows();
+	// CRenderer::GenerateEnvironmentMap
+	CShadows::RenderStoredShadows();
+	CSkidmarks::Render();
+	CRubbish::Render();
+
+	// these aren't really effects
+	DefinedState();
+	if(FredIsInFirstPersonCam()){
+		DefinedState();
+		C3dMarkers::Render();	// normally rendered in CSpecialFX::Render()
+if(gbRenderWorld2)
+		CRenderer::RenderWorld(2);	// transparent
+if(gbRenderVehicles)
+		CRenderer::RenderVehicles();
+	}else{
+		// flipped these two, seems to give the best result
+if(gbRenderWorld2)
+		CRenderer::RenderWorld(2);	// transparent
+if(gbRenderVehicles)
+		CRenderer::RenderVehicles();
+	}
+	// better render these after transparent world
+if(gbRenderFadingInEntities)
+	CRenderer::RenderFadingInEntities();
+
+	// actual effects here
+	CGlass::Render();
+	// CMattRenderer::ResetRenderStates
+	DefinedState();
+	CCoronas::RenderSunReflection();
+	CWeather::RenderRainStreaks();
+	// CWeather::AddSnow
+	CWaterCannons::Render();
+	CAntennas::Render();
+	CSpecialFX::Render();
+	CRopes::Render();
+	CCoronas::Render();
+	CParticle::Render();
+	CPacManPickups::Render();
+	CWeaponEffects::Render();
+	CPointLights::RenderFogEffect();
+	CMovingThings::Render();
+	CRenderer::RenderFirstPersonVehicle();
+	POP_RENDERGROUP();
+}
+#endif
+
+void
+RenderScene(void)
+{
+#ifdef NEW_RENDERER
+	if(gbNewRenderer){
+		RenderScene_new();
+		return;
+	}
+#endif
+	PUSH_RENDERGROUP("RenderScene");
+	CClouds::Render();
+	DoRWRenderHorizon();
+	CRenderer::RenderRoads();
+	CCoronas::RenderReflections();
+	CRenderer::RenderEverythingBarRoads();
+	RwRenderStateSet(rwRENDERSTATECULLMODE, (void*)rwCULLMODECULLNONE);
+	CWaterLevel::RenderWater();
+	CRenderer::RenderBoats();
+	CRenderer::RenderFadingInUnderwaterEntities();
+	RwRenderStateSet(rwRENDERSTATECULLMODE, (void*)rwCULLMODECULLNONE);
+	CWaterLevel::RenderTransparentWater();
+	CRenderer::RenderFadingInEntities();
+	RwRenderStateSet(rwRENDERSTATECULLMODE, (void*)rwCULLMODECULLNONE);
+	CWeather::RenderRainStreaks();
+	CCoronas::RenderSunReflection();
+	POP_RENDERGROUP();
+}
+
+void
+RenderDebugShit(void)
+{
+	PUSH_RENDERGROUP("RenderDebugShit");
+	CTheScripts::RenderTheScriptDebugLines();
+#ifndef FINAL
+	if(gbShowCollisionLines)
+		CRenderer::RenderCollisionLines();
+	ThePaths.DisplayPathData();
+	CDebug::DrawLines();
+	DefinedState();
+#endif
+	POP_RENDERGROUP();
+}
+
+void
+RenderEffects(void)
+{
+#ifdef NEW_RENDERER
+	if(gbNewRenderer){
+		RenderEffects_new();
+		return;
+	}
+#endif
+	PUSH_RENDERGROUP("RenderEffects");
+	CGlass::Render();
+	CWaterCannons::Render();
+	CSpecialFX::Render();
+	CRopes::Render();
+	CShadows::RenderStaticShadows();
+	CShadows::RenderStoredShadows();
+	CSkidmarks::Render();
+	CAntennas::Render();
+	CRubbish::Render();
+	CCoronas::Render();
+	CParticle::Render();
+	CPacManPickups::Render();
+	CWeaponEffects::Render();
+	CPointLights::RenderFogEffect();
+	CMovingThings::Render();
+	CRenderer::RenderFirstPersonVehicle();
+	POP_RENDERGROUP();
+}
+
+void
+Render2dStuff(void)
+{
+	PUSH_RENDERGROUP("Render2dStuff");
+	RwRenderStateSet(rwRENDERSTATEZTESTENABLE, (void*)FALSE);
+	RwRenderStateSet(rwRENDERSTATEZWRITEENABLE, (void*)FALSE);
+	RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void*)TRUE);
+	RwRenderStateSet(rwRENDERSTATESRCBLEND, (void*)rwBLENDSRCALPHA);
+	RwRenderStateSet(rwRENDERSTATEDESTBLEND, (void*)rwBLENDINVSRCALPHA);
+	RwRenderStateSet(rwRENDERSTATECULLMODE, (void*)rwCULLMODECULLNONE);
+
+	CReplay::Display();
+	CPickups::RenderPickUpText();
+
+	if(TheCamera.m_WideScreenOn
+#ifdef CUTSCENE_BORDERS_SWITCH
+		&& CMenuManager::m_PrefsCutsceneBorders
+#endif
+		)
+		TheCamera.DrawBordersForWideScreen();
+
+	CPed *player = FindPlayerPed();
+	int weaponType = 0;
+	if(player)
+		weaponType = player->GetWeapon()->m_eWeaponType;
+
+	bool firstPersonWeapon = false;
+	int cammode = TheCamera.Cams[TheCamera.ActiveCam].Mode;
+	if(cammode == CCam::MODE_SNIPER ||
+	   cammode == CCam::MODE_SNIPER_RUNABOUT ||
+	   cammode == CCam::MODE_ROCKETLAUNCHER ||
+	   cammode == CCam::MODE_ROCKETLAUNCHER_RUNABOUT ||
+	   cammode == CCam::MODE_CAMERA)
+		firstPersonWeapon = true;
+
+	// Draw black border for sniper and rocket launcher
+	if((weaponType == WEAPONTYPE_SNIPERRIFLE || weaponType == WEAPONTYPE_ROCKETLAUNCHER || weaponType == WEAPONTYPE_LASERSCOPE) && firstPersonWeapon){
+		CRGBA black(0, 0, 0, 255);
+
+		// top and bottom strips
+		if (weaponType == WEAPONTYPE_ROCKETLAUNCHER) {
+			CSprite2d::DrawRect(CRect(0.0f, 0.0f, SCREEN_WIDTH, SCREEN_HEIGHT / 2 - SCREEN_SCALE_Y(180)), black);
+			CSprite2d::DrawRect(CRect(0.0f, SCREEN_HEIGHT / 2 + SCREEN_SCALE_Y(170), SCREEN_WIDTH, SCREEN_HEIGHT), black);
+		}
+		else {
+			CSprite2d::DrawRect(CRect(0.0f, 0.0f, SCREEN_WIDTH, SCREEN_HEIGHT / 2 - SCREEN_SCALE_Y(210)), black);
+			CSprite2d::DrawRect(CRect(0.0f, SCREEN_HEIGHT / 2 + SCREEN_SCALE_Y(210), SCREEN_WIDTH, SCREEN_HEIGHT), black);
+		}
+		CSprite2d::DrawRect(CRect(0.0f, 0.0f, SCREEN_WIDTH / 2 - SCREEN_SCALE_X(210), SCREEN_HEIGHT), black);
+		CSprite2d::DrawRect(CRect(SCREEN_WIDTH / 2 + SCREEN_SCALE_X(210), 0.0f, SCREEN_WIDTH, SCREEN_HEIGHT), black);
+	}
+
+	MusicManager.DisplayRadioStationName();
+	TheConsole.Display();
+#ifdef GTA_SCENE_EDIT
+	if(CSceneEdit::m_bEditOn)
+		CSceneEdit::Draw();
+	else
+#endif
+		CHud::Draw();
+
+	CSpecialFX::Render2DFXs();
+	CUserDisplay::OnscnTimer.ProcessForDisplay();
+	CMessages::Display();
+	CDarkel::DrawMessages();
+	CGarages::PrintMessages();
+	CPad::PrintErrorMessage();
+	CFont::DrawFonts();
+#ifndef MASTER
+	COcclusion::Render();
+#endif
+
+#ifdef DEBUGMENU
+	DebugMenuRender();
+#endif
+	POP_RENDERGROUP();
+}
+
+void
+RenderMenus(void)
+{
+	if (FrontEndMenuManager.m_bMenuActive)
+	{
+		PUSH_RENDERGROUP("RenderMenus");
+		FrontEndMenuManager.DrawFrontEnd();
+		POP_RENDERGROUP();
+	}
+#ifndef MASTER
+	else
+		VarConsole.Check();
+#endif
+}
+
+void
+Render2dStuffAfterFade(void)
+{
+	PUSH_RENDERGROUP("Render2dStuffAfterFade");
+#ifndef MASTER
+	DisplayGameDebugText();
+#endif
+
+#ifdef MOBILE_IMPROVEMENTS
+	if (CDraw::FadeValue != 0)
+#endif
+	CHud::DrawAfterFade();
+	CFont::DrawFonts();
+	CCredits::Render();
+	POP_RENDERGROUP();
+}
+
+void
+Idle(void *arg)
+{
+	CTimer::Update();
+
+	tbInit();
+
+	CSprite2d::InitPerFrame();
+	CFont::InitPerFrame();
+
+	PUSH_MEMID(MEMID_GAME_PROCESS);
+	CPointLights::InitPerFrame();
+
+	tbStartTimer(0, "CGame::Process");
+	CGame::Process();
+	tbEndTimer("CGame::Process");
+	POP_MEMID();
+
+	tbStartTimer(0, "DMAudio.Service");
+	DMAudio.Service();
+	tbEndTimer("DMAudio.Service");
+
+	if(CGame::bDemoMode && CTimer::GetTimeInMilliseconds() > (3*60 + 30)*1000 && !CCutsceneMgr::IsCutsceneProcessing()){
+		WANT_TO_LOAD = false;
+		FrontEndMenuManager.m_bWantToRestart = true;
+		return;
+	}
+
+	if(FrontEndMenuManager.m_bWantToRestart || FOUND_GAME_TO_LOAD)
+	{
+		return;
+	}
+	
+	SetLightsWithTimeOfDayColour(Scene.world);
+
+	if(arg == nil)
+		return;
+
+	PUSH_MEMID(MEMID_RENDER);
+
+	if(!FrontEndMenuManager.m_bMenuActive && TheCamera.GetScreenFadeStatus() != FADE_2)
+	{
+		// This is from SA, but it's nice for windowed mode
+#if defined(GTA_PC) && !defined(RW_GL3)
+		RwV2d pos;
+		pos.x = SCREEN_WIDTH / 2.0f;
+		pos.y = SCREEN_HEIGHT / 2.0f;
+		RsMouseSetPos(&pos);
+#endif
+
+		tbStartTimer(0, "CnstrRenderList");
+#ifdef PC_WATER
+		CWaterLevel::PreCalcWaterGeometry();
+#endif
+#ifdef NEW_RENDERER
+		if(gbNewRenderer){
+			CWorld::AdvanceCurrentScanCode();	// don't think this is even necessary
+			CRenderer::ClearForFrame();
+		}
+#endif
+		CRenderer::ConstructRenderList();
+		tbEndTimer("CnstrRenderList");
+
+		tbStartTimer(0, "PreRender");
+		CRenderer::PreRender();
+		tbEndTimer("PreRender");
+
+#ifdef FIX_BUGS
+		RwRenderStateSet(rwRENDERSTATEZWRITEENABLE, (void *)FALSE); // TODO: temp? this fixes OpenGL render but there should be a better place for this
+		// This has to be done BEFORE RwCameraBeginUpdate
+		RwCameraSetFarClipPlane(Scene.camera, CTimeCycle::GetFarClip());
+		RwCameraSetFogDistance(Scene.camera, CTimeCycle::GetFogStart());
+#endif
+
+		if(CWeather::LightningFlash && !CCullZones::CamNoRain()){
+			if(!DoRWStuffStartOfFrame_Horizon(255, 255, 255, 255, 255, 255, 255))
+				goto popret;
+		}else{
+			if(!DoRWStuffStartOfFrame_Horizon(CTimeCycle::GetSkyTopRed(), CTimeCycle::GetSkyTopGreen(), CTimeCycle::GetSkyTopBlue(),
+						CTimeCycle::GetSkyBottomRed(), CTimeCycle::GetSkyBottomGreen(), CTimeCycle::GetSkyBottomBlue(),
+						255))
+				goto popret;
+		}
+
+		DefinedState();
+
+#ifndef FIX_BUGS
+		RwCameraSetFarClipPlane(Scene.camera, CTimeCycle::GetFarClip());
+		RwCameraSetFogDistance(Scene.camera, CTimeCycle::GetFogStart());
+#endif
+
+		tbStartTimer(0, "RenderScene");
+		RenderScene();
+		tbEndTimer("RenderScene");
+
+#ifdef EXTENDED_PIPELINES
+		CustomPipes::EnvMapRender();
+#endif
+
+		RenderDebugShit();
+		RenderEffects();
+
+		if((TheCamera.m_BlurType == MOTION_BLUR_NONE || TheCamera.m_BlurType == MOTION_BLUR_LIGHT_SCENE) &&
+		   TheCamera.m_ScreenReductionPercentage > 0.0f)
+		        TheCamera.SetMotionBlurAlpha(150);
+
+#ifdef SCREEN_DROPLETS
+		CPostFX::GetBackBuffer(Scene.camera);
+		ScreenDroplets::Process();
+		ScreenDroplets::Render();
+#endif
+
+		tbStartTimer(0, "RenderMotionBlur");
+		TheCamera.RenderMotionBlur();
+		tbEndTimer("RenderMotionBlur");
+
+		tbStartTimer(0, "Render2dStuff");
+		Render2dStuff();
+		tbEndTimer("Render2dStuff");
+	}else{
+		CDraw::CalculateAspectRatio();
+#ifdef ASPECT_RATIO_SCALE
+		CameraSize(Scene.camera, nil, SCREEN_VIEWWINDOW, SCREEN_ASPECT_RATIO);
+#else
+		CameraSize(Scene.camera, nil, SCREEN_VIEWWINDOW, DEFAULT_ASPECT_RATIO);
+#endif
+		CVisibilityPlugins::SetRenderWareCamera(Scene.camera);
+		RwCameraClear(Scene.camera, &gColourTop, CLEARMODE);
+		if(!RsCameraBeginUpdate(Scene.camera))
+			goto popret;
+	}
+
+	tbStartTimer(0, "RenderMenus");
+	RenderMenus();
+	tbEndTimer("RenderMenus");
+
+#ifdef PS2_MENU
+	if ( TheMemoryCard.m_bWantToLoad )
+		goto popret;
+#endif
+
+	tbStartTimer(0, "DoFade");
+	DoFade();
+	tbEndTimer("DoFade");
+
+	tbStartTimer(0, "Render2dStuff-Fade");
+	Render2dStuffAfterFade();
+	tbEndTimer("Render2dStuff-Fade");
+	// CCredits::Render(); // They added it to function above and also forgot it here
+#ifdef XBOX_MESSAGE_SCREEN
+	FrontEndMenuManager.DrawOverlays();
+#endif
+
+	if (gbShowTimebars)
+		tbDisplay();
+
+	DoRWStuffEndOfFrame();
+
+	POP_MEMID();	// MEMID_RENDER
+
+	if(g_SlowMode) 
+		ProcessSlowMode();
+	return;
+
+popret:	POP_MEMID();	// MEMID_RENDER
+}
+
+void
+FrontendIdle(void)
+{
+	CDraw::CalculateAspectRatio();
+	CTimer::Update();
+	CSprite2d::SetRecipNearClip(); // this should be on InitialiseRenderWare according to PS2 asm. seems like a bug fix
+	CSprite2d::InitPerFrame();
+	CFont::InitPerFrame();
+	CPad::UpdatePads();
+	FrontEndMenuManager.Process();
+
+	if(RsGlobal.quit)
+		return;
+
+	CameraSize(Scene.camera, nil, SCREEN_VIEWWINDOW, SCREEN_ASPECT_RATIO);
+	CVisibilityPlugins::SetRenderWareCamera(Scene.camera);
+	RwCameraClear(Scene.camera, &gColourTop, CLEARMODE);
+	if(!RsCameraBeginUpdate(Scene.camera))
+		return;
+
+	DefinedState(); // seems redundant, but breaks resolution change.
+	RenderMenus();
+#ifdef XBOX_MESSAGE_SCREEN
+	FrontEndMenuManager.DrawOverlays();
+#endif
+	DoFade();
+	Render2dStuffAfterFade();
+	CFont::DrawFonts();
+	DoRWStuffEndOfFrame();
+}
+
+void
+InitialiseGame(void)
+{
+	LoadingScreen(nil, nil, "loadsc0");
+	CGame::Initialise("DATA\\GTA_VC.DAT");
+}
+
+RsEventStatus
+AppEventHandler(RsEvent event, void *param)
+{
+	switch( event )
+	{
+		case rsINITIALIZE:
+		{
+			CGame::InitialiseOnceBeforeRW();
+			return RsInitialize() ? rsEVENTPROCESSED : rsEVENTERROR;
+		}
+
+		case rsCAMERASIZE:
+		{
+											
+			CameraSize(Scene.camera, (RwRect *)param,
+				SCREEN_VIEWWINDOW, DEFAULT_ASPECT_RATIO);
+			
+			return rsEVENTPROCESSED;
+		}
+
+		case rsRWINITIALIZE:
+		{
+			return Initialise3D(param) ? rsEVENTPROCESSED : rsEVENTERROR;
+		}
+
+		case rsRWTERMINATE:
+		{
+			Terminate3D();
+
+			return rsEVENTPROCESSED;
+		}
+
+		case rsTERMINATE:
+		{
+			CGame::FinalShutdown();
+
+			return rsEVENTPROCESSED;
+		}
+
+		case rsPLUGINATTACH:
+		{
+			return PluginAttach() ? rsEVENTPROCESSED : rsEVENTERROR;
+		}
+
+		case rsINPUTDEVICEATTACH:
+		{
+			AttachInputDevices();
+
+			return rsEVENTPROCESSED;
+		}
+
+		case rsIDLE:
+		{
+			Idle(param);
+
+			return rsEVENTPROCESSED;
+		}
+
+		case rsFRONTENDIDLE:
+		{
+			FrontendIdle();
+
+			return rsEVENTPROCESSED;
+		}
+
+		case rsACTIVATE:
+		{
+			param ? DMAudio.ReacquireDigitalHandle() : DMAudio.ReleaseDigitalHandle();
+
+			return rsEVENTPROCESSED;
+		}
+
+		default:
+		{
+			return rsEVENTNOTPROCESSED;
+		}
+	}
+}
+
+#ifndef MASTER
+void
+TheModelViewer(void)
+{
+#if (defined(GTA_PS2) || defined(GTA_XBOX))
+	//TODO
+#else
+
+	// This is not original. Because;
+	// 1- We want 2D things to be initalized, whereas original AnimViewer doesn't use them. my additions marked with X
+	// 2- VC Mobile code run it like main function(as opposed to III and LCS), so it has it's own loop inside it, but our func. already called in a loop.
+
+	CDraw::CalculateAspectRatio(); // X
+	CAnimViewer::Update();
+	SetLightsWithTimeOfDayColour(Scene.world);
+	CRenderer::ConstructRenderList();
+	DoRWStuffStartOfFrame(CTimeCycle::GetSkyTopRed()*0.5f, CTimeCycle::GetSkyTopGreen()*0.5f, CTimeCycle::GetSkyTopBlue()*0.5f,
+		CTimeCycle::GetSkyBottomRed(), CTimeCycle::GetSkyBottomGreen(), CTimeCycle::GetSkyBottomBlue(),
+		255);
+
+	CSprite2d::SetRecipNearClip(); // X
+	CSprite2d::InitPerFrame(); // X
+	CFont::InitPerFrame(); // X
+	DefinedState();
+	CVisibilityPlugins::InitAlphaEntityList();
+	CAnimViewer::Render();
+	Render2dStuff(); // X
+	DoRWStuffEndOfFrame();
+	CTimer::Update();
+#endif
+}
+#endif
+
+
+#ifdef GTA_PS2
+void TheGame(void)
+{
+	printf("Into TheGame!!!\n");
+
+	PUSH_MEMID(MEMID_GAME);	// NB: not popped
+
+	CTimer::Initialise();
+
+	CGame::Initialise("DATA\\GTA3.DAT");
+
+	Const char *splash = GetRandomSplashScreen(); // inlined here
+
+	LoadingScreen("Starting Game", NULL, splash);
+
+#ifdef GTA_PS2
+	// TODO(MIAMI): not checked yet
+	if (   TheMemoryCard.CheckCardInserted(CARD_ONE) == CMemoryCard::NO_ERR_SUCCESS
+		&& TheMemoryCard.ChangeDirectory(CARD_ONE, TheMemoryCard.Cards[CARD_ONE].dir)
+		&& TheMemoryCard.FindMostRecentFileName(CARD_ONE, TheMemoryCard.MostRecentFile) == true
+		&& TheMemoryCard.CheckDataNotCorrupt(TheMemoryCard.MostRecentFile))
+	{
+		strcpy(TheMemoryCard.LoadFileName, TheMemoryCard.MostRecentFile);
+		TheMemoryCard.b_FoundRecentSavedGameWantToLoad = true;
+
+		if (FrontEndMenuManager.m_PrefsLanguage != TheMemoryCard.GetLanguageToLoad())
+		{
+			FrontEndMenuManager.m_PrefsLanguage = TheMemoryCard.GetLanguageToLoad();
+			TheText.Unload();
+			TheText.Load();
+		}
+
+		CGame::currLevel = TheMemoryCard.GetLevelToLoad();
+	}
+#else
+	//TODO
+#endif
+
+	while (true)
+	{
+		if (FOUND_GAME_TO_LOAD)
+		{
+			Const char *splash1 = GetLevelSplashScreen(CGame::currLevel);
+			LoadSplash(splash1);
+		}
+
+		WANT_TO_LOAD = false;
+
+		CTimer::Update();
+
+		while (!(FrontEndMenuManager.m_bWantToRestart || FOUND_GAME_TO_LOAD))
+		{
+			CSprite2d::InitPerFrame();
+			CFont::InitPerFrame();
+
+			PUSH_MEMID(MEMID_GAME_PROCESS)
+			CPointLights::InitPerFrame();
+			CGame::Process();
+			POP_MEMID();
+
+			DMAudio.Service();
+
+			if (CGame::bDemoMode && CTimer::GetTimeInMilliseconds() > (3*60 + 30)*1000 && !CCutsceneMgr::IsCutsceneProcessing())
+			{
+				WANT_TO_LOAD = false;
+				FrontEndMenuManager.m_bWantToRestart = true;
+				break;
+			}
+
+			if (FrontEndMenuManager.m_bWantToRestart || FOUND_GAME_TO_LOAD)
+				break;
+
+			SetLightsWithTimeOfDayColour(Scene.world);
+
+			PUSH_MEMID(MEMID_RENDER);
+
+			CRenderer::ConstructRenderList();
+
+			if ((!FrontEndMenuManager.m_bMenuActive || FrontEndMenuManager.m_bRenderGameInMenu == true) && TheCamera.GetScreenFadeStatus() != FADE_2 )
+			{
+				CRenderer::PreRender();
+				// TODO(MIAMI): something ps2all specific
+
+#ifdef FIX_BUGS
+				// This has to be done BEFORE RwCameraBeginUpdate
+				RwCameraSetFarClipPlane(Scene.camera, CTimeCycle::GetFarClip());
+				RwCameraSetFogDistance(Scene.camera, CTimeCycle::GetFogStart());
+#endif
+
+				if (CWeather::LightningFlash && !CCullZones::CamNoRain())
+					DoRWStuffStartOfFrame_Horizon(255, 255, 255, 255, 255, 255, 255);
+				else
+					DoRWStuffStartOfFrame_Horizon(CTimeCycle::GetSkyTopRed(), CTimeCycle::GetSkyTopGreen(), CTimeCycle::GetSkyTopBlue(), CTimeCycle::GetSkyBottomRed(), CTimeCycle::GetSkyBottomGreen(), CTimeCycle::GetSkyBottomBlue(), 255);
+
+				DefinedState();
+#ifndef FIX_BUGS
+				RwCameraSetFarClipPlane(Scene.camera, CTimeCycle::GetFarClip());
+				RwCameraSetFogDistance(Scene.camera, CTimeCycle::GetFogStart());
+#endif
+
+				RenderScene();
+				RenderDebugShit();
+				RenderEffects();
+
+				if ((TheCamera.m_BlurType == MOTION_BLUR_NONE || TheCamera.m_BlurType == MOTION_BLUR_LIGHT_SCENE) && TheCamera.m_ScreenReductionPercentage > 0.0f)
+					TheCamera.SetMotionBlurAlpha(150);
+				TheCamera.RenderMotionBlur();
+
+				Render2dStuff();
+			}
+			else
+			{
+				CameraSize(Scene.camera, NULL, SCREEN_VIEWWINDOW, SCREEN_ASPECT_RATIO);
+				CVisibilityPlugins::SetRenderWareCamera(Scene.camera);
+				RwCameraClear(Scene.camera, &gColourTop, CLEARMODE);
+				RsCameraBeginUpdate(Scene.camera);
+			}
+
+			RenderMenus();
+
+			if (WANT_TO_LOAD)
+			{
+				POP_MEMID();	// MEMID_RENDER
+				break;
+			}
+
+			DoFade();
+			Render2dStuffAfterFade();
+			CCredits::Render();
+
+			DoRWStuffEndOfFrame();
+
+			while (frameCount < 2)
+				;
+
+			frameCount = 0;
+
+			CTimer::Update();
+
+			POP_MEMID():	// MEMID_RENDER
+
+			if (g_SlowMode)
+				ProcessSlowMode();
+		}
+
+		CPad::ResetCheats();
+		CPad::StopPadsShaking();
+		DMAudio.ChangeMusicMode(MUSICMODE_DISABLE);
+		CGame::ShutDownForRestart();
+		CTimer::Stop();
+
+		if (FrontEndMenuManager.m_bWantToRestart || FOUND_GAME_TO_LOAD)
+		{
+			if (FOUND_GAME_TO_LOAD)
+			{
+				FrontEndMenuManager.m_bWantToRestart = true;
+				WANT_TO_LOAD = true;
+			}
+
+			CGame::InitialiseWhenRestarting();
+			DMAudio.ChangeMusicMode(MUSICMODE_GAME);
+			FrontEndMenuManager.m_bWantToRestart = false;
+
+			continue;
+		}
+
+		break;
+	}
+
+	DMAudio.Terminate();
+}
+
+
+void SystemInit()
+{
+#ifdef USE_CUSTOM_ALLOCATOR
+	InitMemoryMgr();
+#endif
+	
+#ifdef GTA_PS2
+	CFileMgr::InitCdSystem();
+	
+	char path[256];
+	
+	sprintf(path, "cdrom0:\\%s%s;1", "SYSTEM\\", "IOPRP241.IMG");
+	
+	sceSifInitRpc(0);
+	
+	while ( !sceSifRebootIop(path) )
+		;
+	while( !sceSifSyncIop() )
+		;
+	
+	sceSifInitRpc(0);
+	
+	CFileMgr::InitCdSystem();
+	
+	sceFsReset();
+
+	CFileMgr::InitCd();
+	
+	char modulepath[256];
+	
+	strcpy(modulepath, "cdrom0:\\");
+	strcat(modulepath, "SYSTEM\\");
+	strcat(modulepath, "SIO2MAN.IRX");
+	LoadModule(modulepath);
+	
+	strcpy(modulepath, "cdrom0:\\");
+	strcat(modulepath, "SYSTEM\\");
+	strcat(modulepath, "PADMAN.IRX");
+	LoadModule(modulepath);
+	
+	strcpy(modulepath, "cdrom0:\\");
+	strcat(modulepath, "SYSTEM\\");
+	strcat(modulepath, "LIBSD.IRX");
+	LoadModule(modulepath);
+	
+	strcpy(modulepath, "cdrom0:\\");
+	strcat(modulepath, "SYSTEM\\");
+	strcat(modulepath, "SDRDRV.IRX");
+	LoadModule(modulepath);
+	
+	strcpy(modulepath, "cdrom0:\\");
+	strcat(modulepath, "SYSTEM\\");
+	strcat(modulepath, "MCMAN.IRX");
+	LoadModule(modulepath);
+	
+	strcpy(modulepath, "cdrom0:\\");
+	strcat(modulepath, "SYSTEM\\");
+	strcat(modulepath, "MCSERV.IRX");
+	LoadModule(modulepath);
+
+	strcpy(modulepath, "cdrom0:\\");
+	strcat(modulepath, "SYSTEM\\");
+	strcat(modulepath, "CDSTREAM.IRX");
+	LoadModule(modulepath);
+
+	strcpy(modulepath, "cdrom0:\\");
+	strcat(modulepath, "SYSTEM\\");
+	strcat(modulepath, "SAMPMAN2.IRX");
+	LoadModule(modulepath);
+#endif
+	
+
+#ifdef GTA_PS2
+	ThreadParam param;
+	
+	param.entry = &IdleThread;
+	param.stack = idleThreadStack;
+	param.stackSize = 2048;
+	param.initPriority = 127;
+	param.gpReg = &_gp;
+	
+	int thread = CreateThread(&param);
+	StartThread(thread, NULL);
+#else
+	//
+#endif
+	
+#ifdef GTA_PS2_STUFF
+	CPad::Initialise();
+#endif
+	CPad::GetPad(0)->Mode = 0;
+	
+	CGame::frenchGame = false;
+	CGame::germanGame = false;
+	CGame::nastyGame = true;
+	FrontEndMenuManager.m_PrefsAllowNastyGame = true;
+	
+#ifdef GTA_PS2
+	// TODO(MIAMI): this code probably went elsewhere?
+	int32 lang = sceScfGetLanguage();
+	if ( lang  == SCE_ITALIAN_LANGUAGE )
+		FrontEndMenuManager.m_PrefsLanguage = LANGUAGE_ITALIAN;
+	else if ( lang  == SCE_SPANISH_LANGUAGE )
+		FrontEndMenuManager.m_PrefsLanguage = LANGUAGE_SPANISH;
+	else if ( lang  == SCE_GERMAN_LANGUAGE )
+	{
+		CGame::germanGame = true;
+		CGame::nastyGame = false;
+		FrontEndMenuManager.m_PrefsAllowNastyGame = false;
+		FrontEndMenuManager.m_PrefsLanguage = LANGUAGE_GERMAN;
+	}
+	else if ( lang  == SCE_FRENCH_LANGUAGE )
+	{
+		CGame::frenchGame = true;
+		CGame::nastyGame = false;
+		FrontEndMenuManager.m_PrefsAllowNastyGame = false;
+		FrontEndMenuManager.m_PrefsLanguage = LANGUAGE_FRENCH;
+	}
+	else
+		FrontEndMenuManager.m_PrefsLanguage = LANGUAGE_AMERICAN;
+	
+	FrontEndMenuManager.InitialiseMenuContentsAfterLoadingGame();
+#else
+	//
+#endif
+	
+#ifdef GTA_PS2
+	TheMemoryCard.Init();
+#endif
+}
+
+int VBlankCounter(int ca)
+{
+	frameCount++;
+	ExitHandler();
+	return 0;
+}
+
+// linked against by RW!
+extern "C" void WaitVBlank(void)
+{
+	int32 startFrame = frameCount;
+	while(startFrame == frameCount);
+}
+
+void GameInit(bool onlyRW)
+{
+	if(onlyRW)
+	{
+#ifdef GTA_PS2
+		Initialise3D(nil);
+#else
+		Initialise3D(nil);	//TODO: window parameter
+#endif
+		gameAlreadyInitialised = true;
+	}
+	else
+	{
+		if ( !gameAlreadyInitialised )
+#ifdef GTA_PS2
+			Initialise3D(nil);
+#else
+			Initialise3D(nil);	//TODO: window parameter
+#endif
+		}
+
+#ifdef GTA_PS2
+		char *files[] =
+		{
+			"\\ANIM\\CUTS.IMG;1",
+			"\\ANIM\\CUTS.DIR;1",
+			"\\ANIM\\PED.IFP;1",
+			"\\MODELS\\FRONTEN1.TXD;1",
+			"\\MODELS\\FRONTEN2.TXD;1",
+			"\\MODELS\\FONTS.TXD;1",
+			"\\MODELS\\HUD.TXD;1",
+			"\\MODELS\\PARTICLE.TXD;1",
+			"\\MODELS\\MISC.TXD;1",
+			"\\MODELS\\GENERIC.TXD;1",
+			"\\MODELS\\GTA3.DIR;1",
+			// TODO: japanese?
+#ifdef GTA_PAL
+			"\\TEXT\\ENGLISH.GXT;1",
+			"\\TEXT\\FRENCH.GXT;1",
+			"\\TEXT\\GERMAN.GXT;1",
+			"\\TEXT\\ITALIAN.GXT;1",
+			"\\TEXT\\SPANISH.GXT;1",
+#else
+			"\\TEXT\\AMERICAN.GXT;1",
+#endif
+			"\\MODELS\\COLL\\GENERIC.COL;1",
+			"\\MODELS\\COLL\\VEHICLES.COL;1",
+			"\\MODELS\\COLL\\PEDS.COL;1",
+			"\\MODELS\\COLL\\WEAPONS.COL;1",
+			"\\MODELS\\GENERIC\\AIR_VLO.DFF;1",
+			"\\MODELS\\GENERIC\\WHEELS.DFF;1",
+			"\\MODELS\\GENERIC\\ARROW.DFF;1",
+			"\\MODELS\\GENERIC\\ZONECYLB.DFF;1",
+			"\\DATA\\HANDLING.CFG;1",
+			"\\DATA\\SURFACE.DAT;1",
+			"\\DATA\\PEDSTATS.DAT;1",
+			"\\DATA\\TIMECYC.DAT;1",
+			"\\DATA\\PARTICLE.CFG;1",
+			"\\DATA\\DEFAULT.DAT;1",
+			"\\DATA\\DEFAULT.IDE;1",
+			"\\DATA\\GTA_VC.DAT;1",
+			"\\DATA\\OBJECT.DAT;1",
+			"\\DATA\\MAP.ZON;1",
+			"\\DATA\\NAVIG.ZON;1",
+			"\\DATA\\INFO.ZON;1",
+			"\\DATA\\WATERPRO.DAT;1",
+			"\\DATA\\MAIN.SCM;1",
+			"\\DATA\\CARCOLS.DAT;1",
+			"\\DATA\\PED.DAT;1",
+			"\\DATA\\FISTFITE.DAT;1",
+			"\\DATA\\WEAPON.DAT;1",
+			"\\DATA\\PEDGRP.DAT;1",
+			"\\DATA\\PATHS\\FLIGHT.DAT;1",
+			"\\DATA\\PATHS\\FLIGHT2.DAT;1",
+			"\\DATA\\PATHS\\FLIGHT3.DAT;1",
+			"\\DATA\\PATHS\\SPATH0.DAT;1",
+			"\\DATA\\MAPS\\LITTLEHA\\LITTLEHA.IDE;1",
+			"\\DATA\\MAPS\\DOWNTOWN\\DOWNTOWN.IDE;1",
+			"\\DATA\\MAPS\\DOWNTOWS\\DOWNTOWS.IDE;1",
+			"\\DATA\\MAPS\\DOCKS\\DOCKS.IDE;1",
+			"\\DATA\\MAPS\\WASHINTN\\WASHINTN.IDE;1",
+			"\\DATA\\MAPS\\WASHINTS\\WASHINTS.IDE;1",
+			"\\DATA\\MAPS\\OCEANDRV\\OCEANDRV.IDE;1",
+			"\\DATA\\MAPS\\OCEANDN\\OCEANDN.IDE;1",
+			"\\DATA\\MAPS\\GOLF\\GOLF.IDE;1",
+			"\\DATA\\MAPS\\BRIDGE\\BRIDGE.IDE;1",
+			"\\DATA\\MAPS\\STARISL\\STARISL.IDE;1",
+			"\\DATA\\MAPS\\NBEACHBT\\NBEACHBT.IDE;1",
+			"\\DATA\\MAPS\\NBEACHW\\NBEACHW.IDE;1",
+			"\\DATA\\MAPS\\NBEACH\\NBEACH.IDE;1",
+			"\\DATA\\MAPS\\BANK\\BANK.IDE;1",
+			"\\DATA\\MAPS\\MALL\\MALL.IDE;1",
+			"\\DATA\\MAPS\\YACHT\\YACHT.IDE;1",
+			"\\DATA\\MAPS\\CISLAND\\CISLAND.IDE;1",
+			"\\DATA\\MAPS\\CLUB\\CLUB.IDE;1",
+			"\\DATA\\MAPS\\HOTEL\\HOTEL.IDE;1",
+			"\\DATA\\MAPS\\LAWYERS\\LAWYERS.IDE;1",
+			"\\DATA\\MAPS\\STRIPCLB\\STRIPCLB.IDE;1",
+			"\\DATA\\MAPS\\AIRPORT\\AIRPORT.IDE;1",
+			"\\DATA\\MAPS\\HAITI\\HAITI.IDE;1",
+			"\\DATA\\MAPS\\HAITIN\\HAITIN.IDE;1",
+			"\\DATA\\MAPS\\CONCERTH\\CONCERTH.IDE;1",
+			"\\DATA\\MAPS\\MANSION\\MANSION.IDE;1",
+			"\\DATA\\MAPS\\ISLANDSF\\ISLANDSF.IDE;1",
+			"\\DATA\\MAPS\\LITTLEHA\\LITTLEHA.IPL;1",
+			"\\DATA\\MAPS\\DOWNTOWN\\DOWNTOWN.IPL;1",
+			"\\DATA\\MAPS\\DOWNTOWS\\DOWNTOWS.IPL;1",
+			"\\DATA\\MAPS\\DOCKS\\DOCKS.IPL;1",
+			"\\DATA\\MAPS\\WASHINTN\\WASHINTN.IPL;1",
+			"\\DATA\\MAPS\\WASHINTS\\WASHINTS.IPL;1",
+			"\\DATA\\MAPS\\OCEANDRV\\OCEANDRV.IPL;1",
+			"\\DATA\\MAPS\\OCEANDN\\OCEANDN.IPL;1",
+			"\\DATA\\MAPS\\GOLF\\GOLF.IPL;1",
+			"\\DATA\\MAPS\\BRIDGE\\BRIDGE.IPL;1",
+			"\\DATA\\MAPS\\STARISL\\STARISL.IPL;1",
+			"\\DATA\\MAPS\\NBEACHBT\\NBEACHBT.IPL;1",
+			"\\DATA\\MAPS\\NBEACH\\NBEACH.IPL;1",
+			"\\DATA\\MAPS\\NBEACHW\\NBEACHW.IPL;1",
+			"\\DATA\\MAPS\\CISLAND\\CISLAND.IPL;1",
+			"\\DATA\\MAPS\\AIRPORT\\AIRPORT.IPL;1",
+			"\\DATA\\MAPS\\HAITI\\HAITI.IPL;1",
+			"\\DATA\\MAPS\\HAITIN\\HAITIN.IPL;1",
+			"\\DATA\\MAPS\\ISLANDSF\\ISLANDSF.IPL;1",
+			"\\DATA\\MAPS\\BANK\\BANK.IPL;1",
+			"\\DATA\\MAPS\\MALL\\MALL.IPL;1",
+			"\\DATA\\MAPS\\YACHT\\YACHT.IPL;1",
+			"\\DATA\\MAPS\\CLUB\\CLUB.IPL;1",
+			"\\DATA\\MAPS\\HOTEL\\HOTEL.IPL;1",
+			"\\DATA\\MAPS\\LAWYERS\\LAWYERS.IPL;1",
+			"\\DATA\\MAPS\\STRIPCLB\\STRIPCLB.IPL;1",
+			"\\DATA\\MAPS\\CONCERTH\\CONCERTH.IPL;1",
+			"\\DATA\\MAPS\\MANSION\\MANSION.IPL;1",
+			"\\DATA\\MAPS\\GENERIC.IDE;1",
+			"\\DATA\\OCCLU.IPL;1",
+			"\\DATA\\MAPS\\PATHS.IPL;1",
+			"\\TXD\\LOADSC0.TXD;1",
+			"\\TXD\\LOADSC1.TXD;1",
+			"\\TXD\\LOADSC2.TXD;1",
+			"\\TXD\\LOADSC3.TXD;1",
+			"\\TXD\\LOADSC4.TXD;1",
+			"\\TXD\\LOADSC5.TXD;1",
+			"\\TXD\\LOADSC6.TXD;1",
+			"\\TXD\\LOADSC7.TXD;1",
+			"\\TXD\\LOADSC8.TXD;1",
+			"\\TXD\\LOADSC9.TXD;1",
+			"\\TXD\\LOADSC10.TXD;1",
+			"\\TXD\\LOADSC11.TXD;1",
+			"\\TXD\\LOADSC12.TXD;1",
+			"\\TXD\\LOADSC13.TXD;1",
+			"\\TXD\\SPLASH1.TXD;1"
+		};
+		
+		for ( int32 i = 0; i < ARRAY_SIZE(files); i++ )
+			SkyRegisterFileOnCd([i]);
+#endif
+		
+#ifdef GTA_PS2
+		AddIntcHandler(INTC_VBLANK_S, VBlankCounter, 0);
+#endif
+		
+#ifdef GTA_PS2
+		sceCdCLOCK rtc;
+		sceCdReadClock(&rtc);
+		uint32 seed = rtc.minute + rtc.day;
+		uint32 seed2 = (seed << 4)-seed;
+		uint32 seed3 = (seed2 << 4)-seed2;
+		srand ((seed3<<4)+rtc.second);
+#else
+		//TODO: mysrand();
+#endif
+		
+		// gameAlreadyInitialised = true;	// why is this gone?
+	}
+}
+
+int32 SkipAllMPEGs;
+int32 gMemoryStickLoadOK;
+
+void PlayIntroMPEGs()
+{
+#ifdef GTA_PS2
+	if (gameAlreadyInitialised)
+		RpSkySuspend();
+
+	InitMPEGPlayer();
+
+	float skipTime;		// wrong type, should be int
+#ifdef GTA_PAL
+	if(gMemoryStickLoadOK)
+		skipTime = 2500000;
+	else
+		skipTime = 5300000;
+
+	if(!SkipAllMPEGs)
+		PlayMPEG("cdrom0:\\MOVIES\\VCPAL.PSS;1", false, unk);
+
+	if(!SkipAllMPEGs){
+		SkipAllMPEGs = true;
+		PlayMPEG("cdrom0:\\MOVIES\\VICEPAL.PSS;1", true, 0);
+	}
+#else
+	if(gMemoryStickLoadOK)
+		skipTime = 2750000;
+	else
+		skipTime = 5500000;
+
+	if(!SkipAllMPEGs)
+		PlayMPEG("cdrom0:\\MOVIES\\VCNTSC.PSS;1", false, unk);
+
+	if(!SkipAllMPEGs){
+		SkipAllMPEGs = true;
+		PlayMPEG("cdrom0:\\MOVIES\\VICE.PSS;1", true, 0);
+	}
+#endif
+
+	ShutdownMPEGPlayer();
+
+	if ( gameAlreadyInitialised )
+		RpSkyResume();
+#else
+	//TODO
+#endif
+}
+
+int
+main(int argc, char *argv[])
+{
+#ifdef __MWERKS__
+	mwInit(); // metrowerks initialisation
+#endif
+
+	SystemInit();
+
+	if(RsEventHandler(rsINITIALIZE, nil) == rsEVENTERROR)
+		return 0;
+
+#ifdef GTA_PS2
+	int32 r = TheMemoryCard.CheckCardStateAtGameStartUp(CARD_ONE);
+		
+	if ( r == CMemoryCard::ERR_DIRNOENTRY  || r == CMemoryCard::ERR_NOFORMAT )
+	{
+		GameInit(true);
+		
+		TheText.Unload();
+		TheText.Load();
+		
+		CFont::Initialise();
+		
+		FrontEndMenuManager.DrawMemoryCardStartUpMenus();
+	}else if(r == CMemoryCard::ERR_OPENNOENTRY)
+		gMemoryStickLoadOK = false;
+	else if(r == CMemoryCard::ERR_NONE)
+		gMemoryStickLoadOK = true;
+#endif
+
+	PlayIntroMPEGs();
+
+	GameInit(false);
+
+	frameCount = 0;
+	while(frameCount < 100);
+
+	CGame::InitialiseOnceAfterRW();
+
+	TheGame();
+
+#if 0	// maybe ifndef FINAL or MASTER?
+	CGame::ShutDown();
+	
+	RwEngineStop();
+	RwEngineClose();
+	RwEngineTerm();
+	
+#ifdef __MWERKS__
+	mwExit(); // metrowerks shutdown
+#endif
+#endif
+	return 0;
+}
+#endif
diff --git a/src/core/main.h b/src/core/main.h
new file mode 100644
index 0000000..803afb1
--- /dev/null
+++ b/src/core/main.h
@@ -0,0 +1,76 @@
+#pragma once
+
+#ifndef FINAL
+// defined in RwHelpder.cpp
+void PushRendergroup(const char *name);
+void PopRendergroup(void);
+#define PUSH_RENDERGROUP(str) PushRendergroup(str)
+#define POP_RENDERGROUP() PopRendergroup()
+#else
+#define PUSH_RENDERGROUP(str)
+#define POP_RENDERGROUP()
+#endif
+
+struct GlobalScene
+{
+	RpWorld *world;
+	RwCamera *camera;
+};
+extern GlobalScene Scene;
+
+extern uint8 work_buff[55000];
+extern char gString[256];
+extern char gString2[512];
+extern wchar gUString[256];
+extern wchar gUString2[256];
+extern bool gbPrintShite;
+extern bool gbModelViewer;
+#ifdef TIMEBARS
+extern bool gbShowTimebars;
+#else
+#define gbShowTimebars false
+#endif
+
+#ifndef FINAL
+extern bool gbPrintMemoryUsage;
+#endif
+
+class CSprite2d;
+
+bool DoRWStuffStartOfFrame(int16 TopRed, int16 TopGreen, int16 TopBlue, int16 BottomRed, int16 BottomGreen, int16 BottomBlue, int16 Alpha);
+bool DoRWStuffStartOfFrame_Horizon(int16 TopRed, int16 TopGreen, int16 TopBlue, int16 BottomRed, int16 BottomGreen, int16 BottomBlue, int16 Alpha);
+void DoRWStuffEndOfFrame(void);
+void PreAllocateRwObjects(void);
+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);
+Const char *GetLevelSplashScreen(int level);
+Const char *GetRandomSplashScreen(void);
+void LittleTest(void);
+void ValidateVersion();
+void ResetLoadingScreenBar(void);
+#ifndef MASTER
+void TheModelViewer(void);
+#endif
+
+#ifdef LOAD_INI_SETTINGS
+bool LoadINISettings();
+void SaveINISettings();
+void LoadINIControllerSettings();
+void SaveINIControllerSettings();
+#endif
+
+#ifdef NEW_RENDERER
+extern bool gbNewRenderer;
+bool FredIsInFirstPersonCam(void);
+#endif
+
+#ifdef DRAW_GAME_VERSION_TEXT
+extern bool gbDrawVersionText;
+#endif
+
+#ifdef NO_MOVIES
+extern bool gbNoMovies;
+#endif
diff --git a/src/core/obrstr.cpp b/src/core/obrstr.cpp
new file mode 100644
index 0000000..d9f7e9b
--- /dev/null
+++ b/src/core/obrstr.cpp
@@ -0,0 +1,119 @@
+#include "common.h"
+#include "Debug.h"
+#include "obrstr.h"
+
+char obrstr[128];
+char obrstr2[128];
+
+void ObrInt(int32 n1)
+{
+	IntToStr(n1, obrstr);
+	CDebug::DebugAddText(obrstr);
+}
+
+void ObrInt2(int32 n1, int32 n2)
+{
+	IntToStr(n1, obrstr);
+	strcat(obrstr, "  ");
+	IntToStr(n2, obrstr2);
+	strcat(obrstr, obrstr2);
+	CDebug::DebugAddText(obrstr);
+}
+
+void ObrInt3(int32 n1, int32 n2, int32 n3)
+{
+	IntToStr(n1, obrstr);
+	strcat(obrstr, "  ");
+	IntToStr(n2, obrstr2);
+	strcat(obrstr, obrstr2);
+	strcat(obrstr, "  ");
+	IntToStr(n3, obrstr2);
+	strcat(obrstr, obrstr2);
+	CDebug::DebugAddText(obrstr);
+}
+
+void ObrInt4(int32 n1, int32 n2, int32 n3, int32 n4)
+{
+	IntToStr(n1, obrstr);
+	strcat(obrstr, "  ");
+	IntToStr(n2, obrstr2);
+	strcat(obrstr, obrstr2);
+	strcat(obrstr, "  ");
+	IntToStr(n3, obrstr2);
+	strcat(obrstr, obrstr2);
+	strcat(obrstr, "  ");
+	IntToStr(n4, obrstr2);
+	strcat(obrstr, obrstr2);
+	CDebug::DebugAddText(obrstr);
+}
+
+void ObrInt5(int32 n1, int32 n2, int32 n3, int32 n4, int32 n5)
+{
+	IntToStr(n1, obrstr);
+	strcat(obrstr, "  ");
+	IntToStr(n2, obrstr2);
+	strcat(obrstr, obrstr2);
+	strcat(obrstr, "  ");
+	IntToStr(n3, obrstr2);
+	strcat(obrstr, obrstr2);
+	strcat(obrstr, "  ");
+	IntToStr(n4, obrstr2);
+	strcat(obrstr, obrstr2);
+	strcat(obrstr, "  ");
+	IntToStr(n5, obrstr2);
+	strcat(obrstr, obrstr2);
+	CDebug::DebugAddText(obrstr);
+}
+
+void ObrInt6(int32 n1, int32 n2, int32 n3, int32 n4, int32 n5, int32 n6)
+{
+	IntToStr(n1, obrstr);
+	strcat(obrstr, "  ");
+	IntToStr(n2, obrstr2);
+	strcat(obrstr, obrstr2);
+	strcat(obrstr, "  ");
+	IntToStr(n3, obrstr2);
+	strcat(obrstr, obrstr2);
+	strcat(obrstr, "  ");
+	IntToStr(n4, obrstr2);
+	strcat(obrstr, obrstr2);
+	strcat(obrstr, "  ");
+	IntToStr(n5, obrstr2);
+	strcat(obrstr, obrstr2);
+	strcat(obrstr, "  ");
+	IntToStr(n6, obrstr2);
+	strcat(obrstr, obrstr2);
+	CDebug::DebugAddText(obrstr);
+}
+
+void IntToStr(int32 inNum, char *outStr)
+{
+	bool isNeg = inNum < 0;
+
+	if (isNeg) {
+		inNum = -inNum;
+		*outStr = '-';
+	}
+
+	int16 digits = 1;
+
+	if (inNum > 9) {
+		int32 _inNum = inNum;
+		do {
+			digits++;
+			_inNum /= 10;
+		} while (_inNum > 9);
+	}
+
+	int32 strSize = digits;
+	if (isNeg)
+		strSize++;
+
+	char *pStr = &outStr[strSize];
+	int32 i = 0;
+	do {
+		*(pStr-- - 1) = (inNum % 10) + '0';
+		inNum /= 10;
+	} while (++i < strSize);
+	outStr[strSize] = '\0';
+}
\ No newline at end of file
diff --git a/src/core/obrstr.h b/src/core/obrstr.h
new file mode 100644
index 0000000..c163361
--- /dev/null
+++ b/src/core/obrstr.h
@@ -0,0 +1,9 @@
+#pragma once
+
+void ObrInt(int32 n1);
+void ObrInt2(int32 n1, int32 n2);
+void ObrInt3(int32 n1, int32 n2, int32 n3);
+void ObrInt4(int32 n1, int32 n2, int32 n3, int32 n4);
+void ObrInt5(int32 n1, int32 n2, int32 n3, int32 n4, int32 n5);
+void ObrInt6(int32 n1, int32 n2, int32 n3, int32 n4, int32 n5, int32 n6);
+void IntToStr(int32 inNum, char *outStr);
\ No newline at end of file
diff --git a/src/core/re3.cpp b/src/core/re3.cpp
new file mode 100644
index 0000000..0ce7f83
--- /dev/null
+++ b/src/core/re3.cpp
@@ -0,0 +1,1270 @@
+#include <csignal>
+#define WITHWINDOWS
+#include "common.h"
+#if defined DETECT_JOYSTICK_MENU && defined XINPUT
+#include <xinput.h>
+#if !defined(PSAPI_VERSION) || (PSAPI_VERSION > 1)
+#pragma comment( lib, "Xinput9_1_0.lib" )
+#else
+#pragma comment( lib, "Xinput.lib" )
+#endif
+#endif
+#include "Renderer.h"
+#include "Occlusion.h"
+#include "Credits.h"
+#include "Camera.h"
+#include "Weather.h"
+#include "Timecycle.h"
+#include "Clock.h"
+#include "World.h"
+#include "Vehicle.h"
+#include "ModelIndices.h"
+#include "Streaming.h"
+#include "Boat.h"
+#include "Heli.h"
+#include "Automobile.h"
+#include "Bike.h"
+#include "Console.h"
+#include "Debug.h"
+#include "Hud.h"
+#include "SceneEdit.h"
+#include "Pad.h"
+#include "PlayerPed.h"
+#include "Radar.h"
+#include "debugmenu.h"
+#include "Frontend.h"
+#include "WaterLevel.h"
+#include "main.h"
+#include "Script.h"
+#include "MBlur.h"
+#include "postfx.h"
+#include "custompipes.h"
+#include "MemoryHeap.h"
+#include "FileMgr.h"
+#include "Camera.h"
+#include "MBlur.h"
+#include "ControllerConfig.h"
+
+#ifdef DETECT_JOYSTICK_MENU
+#include "crossplatform.h"
+#endif
+
+#ifndef _WIN32
+#include "assert.h"
+#include <stdarg.h>
+#endif
+
+#include <list>
+
+#ifdef RWLIBS
+extern "C" int vsprintf(char* const _Buffer, char const* const _Format, va_list  _ArgList);
+#endif
+
+
+#ifdef USE_PS2_RAND
+unsigned long long myrand_seed = 1;
+#else
+unsigned long int myrand_seed = 1;
+#endif
+
+int
+myrand(void)
+{
+#ifdef USE_PS2_RAND
+	// Use our own implementation of rand, stolen from PS2
+	myrand_seed = 0x5851F42D4C957F2D * myrand_seed + 1;
+	return ((myrand_seed >> 32) & 0x7FFFFFFF);
+#else
+	// or original codewarrior rand
+	myrand_seed = myrand_seed * 1103515245 + 12345;
+	return((myrand_seed >> 16) & 0x7FFF);
+#endif
+}
+
+void
+mysrand(unsigned int seed)
+{
+	myrand_seed = seed;
+}
+
+#ifdef CUSTOM_FRONTEND_OPTIONS
+#include "frontendoption.h"
+
+
+
+#ifdef MORE_LANGUAGES
+void LangPolSelect(int8 action)
+{
+	if (action == FEOPTION_ACTION_SELECT) {
+		FrontEndMenuManager.m_PrefsLanguage = CMenuManager::LANGUAGE_POLISH;
+		FrontEndMenuManager.m_bFrontEnd_ReloadObrTxtGxt = true;
+		FrontEndMenuManager.InitialiseChangedLanguageSettings();
+		FrontEndMenuManager.SaveSettings();
+	}
+}
+
+void LangRusSelect(int8 action)
+{
+	if (action == FEOPTION_ACTION_SELECT) {
+		FrontEndMenuManager.m_PrefsLanguage = CMenuManager::LANGUAGE_RUSSIAN;
+		FrontEndMenuManager.m_bFrontEnd_ReloadObrTxtGxt = true;
+		FrontEndMenuManager.InitialiseChangedLanguageSettings();
+		FrontEndMenuManager.SaveSettings();
+	}
+}
+
+void LangJapSelect(int8 action)
+{
+	if (action == FEOPTION_ACTION_SELECT) {
+		FrontEndMenuManager.m_PrefsLanguage = CMenuManager::LANGUAGE_JAPANESE;
+		FrontEndMenuManager.m_bFrontEnd_ReloadObrTxtGxt = true;
+		FrontEndMenuManager.InitialiseChangedLanguageSettings();
+		FrontEndMenuManager.SaveSettings();
+	}
+}
+#endif
+
+void
+CustomFrontendOptionsPopulate(void)
+{
+	// Moved to an array in MenuScreensCustom.cpp, but APIs are still available. see frontendoption.h
+
+	int fd;
+	// These work only if we have neo folder, so they're dynamically added
+#ifdef EXTENDED_PIPELINES
+	const char *vehPipelineNames[] = { "FED_MFX", "FED_NEO" };
+	const char *off_on[] = { "FEM_OFF", "FEM_ON" };
+	fd = CFileMgr::OpenFile("neo/neo.txd","r");
+	if (fd) {
+#ifdef GRAPHICS_MENU_OPTIONS
+		FrontendOptionSetCursor(MENUPAGE_GRAPHICS_SETTINGS, -3, false);
+		FrontendOptionAddSelect("FED_VPL", 0, 0, MENUALIGN_LEFT, vehPipelineNames, ARRAY_SIZE(vehPipelineNames), (int8*)&CustomPipes::VehiclePipeSwitch, false, nil, "Graphics", "VehiclePipeline");
+		FrontendOptionAddSelect("FED_PRM", 0, 0, MENUALIGN_LEFT, off_on, 2, (int8*)&CustomPipes::RimlightEnable, false, nil, "Graphics", "NeoRimLight");
+		FrontendOptionAddSelect("FED_WLM", 0, 0, MENUALIGN_LEFT, off_on, 2, (int8*)&CustomPipes::LightmapEnable, false, nil, "Graphics", "NeoLightMaps");
+		FrontendOptionAddSelect("FED_RGL", 0, 0, MENUALIGN_LEFT, off_on, 2, (int8*)&CustomPipes::GlossEnable, false, nil, "Graphics", "NeoRoadGloss");
+#else
+		FrontendOptionSetCursor(MENUPAGE_DISPLAY_SETTINGS, -3, false);
+		FrontendOptionAddSelect("FED_VPL", 0, 0, MENUALIGN_LEFT, vehPipelineNames, ARRAY_SIZE(vehPipelineNames), (int8*)&CustomPipes::VehiclePipeSwitch, false, nil, "Graphics", "VehiclePipeline");
+		FrontendOptionAddSelect("FED_PRM", 0, 0, MENUALIGN_LEFT, off_on, 2, (int8*)&CustomPipes::RimlightEnable, false, nil, "Graphics", "NeoRimLight");
+		FrontendOptionAddSelect("FED_WLM", 0, 0, MENUALIGN_LEFT, off_on, 2, (int8*)&CustomPipes::LightmapEnable, false, nil, "Graphics", "NeoLightMaps");
+		FrontendOptionAddSelect("FED_RGL", 0, 0, MENUALIGN_LEFT, off_on, 2, (int8*)&CustomPipes::GlossEnable, false, nil, "Graphics", "NeoRoadGloss");
+#endif
+		CFileMgr::CloseFile(fd);
+	}
+#endif
+	// Add outsourced language translations, if files are found
+#ifdef MORE_LANGUAGES
+	int fd2;
+	FrontendOptionSetCursor(MENUPAGE_LANGUAGE_SETTINGS, 5, false);
+#if 0
+	if (fd = CFileMgr::OpenFile("text/polish.gxt")) {
+		if (fd2 = CFileMgr::OpenFile("models/fonts_p.txd")) {
+			FrontendOptionAddDynamic("FEL_POL", 0, 0, MENUALIGN_CENTER, nil, nil, LangPolSelect, nil, nil);
+			CFileMgr::CloseFile(fd2);
+		}
+		CFileMgr::CloseFile(fd);
+	}
+#endif
+
+	if (fd = CFileMgr::OpenFile("text/russian.gxt")) {
+		if (fd2 = CFileMgr::OpenFile("models/fonts_r.txd")) {
+			FrontendOptionAddDynamic("FEL_RUS", 0, 0, MENUALIGN_CENTER, nil, nil, LangRusSelect, nil, nil);
+			CFileMgr::CloseFile(fd2);
+		}
+		CFileMgr::CloseFile(fd);
+	}
+
+#if 0
+	if (fd = CFileMgr::OpenFile("text/japanese.gxt")) {
+		if (fd2 = CFileMgr::OpenFile("models/fonts_j.txd")) {
+			FrontendOptionAddDynamic("FEL_JAP", 0, 0, MENUALIGN_CENTER, nil, nil, LangJapSelect, nil, nil);
+			CFileMgr::CloseFile(fd2);
+		}
+		CFileMgr::CloseFile(fd);
+	}
+#endif
+#endif
+
+}
+#endif
+
+#ifdef LOAD_INI_SETTINGS
+#include "ini_parser.hpp"
+
+linb::ini cfg;
+bool ReadIniIfExists(const char *cat, const char *key, uint32 *out)
+{
+	std::string strval = cfg.get(cat, key, "\xBA");
+	const char *value = strval.c_str();
+	char *endPtr;
+	if (value && value[0] != '\xBA') {
+		*out = strtoul(value, &endPtr, 0);
+		return true;
+	}
+	return false;
+}
+
+bool ReadIniIfExists(const char *cat, const char *key, bool *out)
+{
+	std::string strval = cfg.get(cat, key, "\xBA");
+	const char *value = strval.c_str();
+	char *endPtr;
+	if (value && value[0] != '\xBA') {
+		*out = strtoul(value, &endPtr, 0);
+		return true;
+	}
+	return false;
+}
+
+bool ReadIniIfExists(const char *cat, const char *key, int32 *out)
+{
+	std::string strval = cfg.get(cat, key, "\xBA");
+	const char *value = strval.c_str();
+	char *endPtr;
+	if (value && value[0] != '\xBA') {
+		*out = strtol(value, &endPtr, 0);
+		return true;
+	}
+	return false;
+}
+
+bool ReadIniIfExists(const char *cat, const char *key, int8 *out)
+{
+	std::string strval = cfg.get(cat, key, "\xBA");
+	const char *value = strval.c_str();
+	char *endPtr;
+	if (value && value[0] != '\xBA') {
+		*out = strtol(value, &endPtr, 0);
+		return true;
+	}
+	return false;
+}
+
+bool ReadIniIfExists(const char *cat, const char *key, float *out)
+{
+	std::string strval = cfg.get(cat, key, "\xBA");
+	const char *value = strval.c_str();
+	if (value && value[0] != '\xBA') {
+		*out = atof(value);
+		return true;
+	}
+	return false;
+}
+
+bool ReadIniIfExists(const char *cat, const char *key, char *out, int size)
+{
+	std::string strval = cfg.get(cat, key, "\xBA");
+	const char *value = strval.c_str();
+	if (value && value[0] != '\xBA') {
+		strncpy(out, value, size);
+		return true;
+	}
+	return false;
+}
+
+void StoreIni(const char *cat, const char *key, uint32 val)
+{
+	char temp[10];
+sprintf(temp, "%u", val);
+	cfg.set(cat, key, temp);
+}
+
+void StoreIni(const char *cat, const char *key, uint8 val)
+{
+	char temp[10];
+	sprintf(temp, "%u", (uint32)val);
+	cfg.set(cat, key, temp);
+}
+
+void StoreIni(const char *cat, const char *key, int32 val)
+{
+	char temp[10];
+	sprintf(temp, "%d", val);
+	cfg.set(cat, key, temp);
+}
+
+void StoreIni(const char *cat, const char *key, int8 val)
+{
+	char temp[10];
+	sprintf(temp, "%d", (int32)val);
+	cfg.set(cat, key, temp);
+}
+
+void StoreIni(const char *cat, const char *key, float val)
+{
+	char temp[10];
+	sprintf(temp, "%f", val);
+	cfg.set(cat, key, temp);
+}
+
+void StoreIni(const char *cat, const char *key, char *val, int size)
+{
+	cfg.set(cat, key, val);
+}
+
+const char *iniControllerActions[] = { "PED_FIREWEAPON", "PED_CYCLE_WEAPON_RIGHT", "PED_CYCLE_WEAPON_LEFT", "GO_FORWARD", "GO_BACK", "GO_LEFT", "GO_RIGHT", "PED_SNIPER_ZOOM_IN",
+	"PED_SNIPER_ZOOM_OUT", "VEHICLE_ENTER_EXIT", "CAMERA_CHANGE_VIEW_ALL_SITUATIONS", "PED_JUMPING", "PED_SPRINT", "PED_LOOKBEHIND", "PED_DUCK", "PED_ANSWER_PHONE", 
+#ifdef BIND_VEHICLE_FIREWEAPON
+	"VEHICLE_FIREWEAPON",
+#endif
+	"VEHICLE_ACCELERATE", "VEHICLE_BRAKE", "VEHICLE_CHANGE_RADIO_STATION", "VEHICLE_HORN", "TOGGLE_SUBMISSIONS", "VEHICLE_HANDBRAKE", "PED_1RST_PERSON_LOOK_LEFT",
+	"PED_1RST_PERSON_LOOK_RIGHT", "VEHICLE_LOOKLEFT", "VEHICLE_LOOKRIGHT", "VEHICLE_LOOKBEHIND", "VEHICLE_TURRETLEFT", "VEHICLE_TURRETRIGHT", "VEHICLE_TURRETUP", "VEHICLE_TURRETDOWN",
+	"PED_CYCLE_TARGET_LEFT", "PED_CYCLE_TARGET_RIGHT", "PED_CENTER_CAMERA_BEHIND_PLAYER", "PED_LOCK_TARGET", "NETWORK_TALK", "PED_1RST_PERSON_LOOK_UP", "PED_1RST_PERSON_LOOK_DOWN",
+	"_CONTROLLERACTION_36", "TOGGLE_DPAD", "SWITCH_DEBUG_CAM_ON", "TAKE_SCREEN_SHOT", "SHOW_MOUSE_POINTER_TOGGLE", "UNKNOWN_ACTION" };
+
+const char *iniControllerTypes[] = { "kbd:", "2ndKbd:", "mouse:", "joy:" };
+
+const char *iniMouseButtons[] = {"LEFT","MIDDLE","RIGHT","WHLUP","WHLDOWN","X1","X2"};
+
+const char *iniKeyboardButtons[] = {"ESC","F1","F2","F3","F4","F5","F6","F7","F8","F9","F10","F11","F12",
+	"INS","DEL","HOME","END","PGUP","PGDN","UP","DOWN","LEFT","RIGHT","DIVIDE","TIMES","PLUS","MINUS","PADDEL",
+	"PADEND","PADDOWN","PADPGDN","PADLEFT","PAD5","NUMLOCK","PADRIGHT","PADHOME","PADUP","PADPGUP","PADINS",
+	"PADENTER", "SCROLL","PAUSE","BACKSP","TAB","CAPSLK","ENTER","LSHIFT","RSHIFT","SHIFT","LCTRL","RCTRL","LALT",
+	"RALT", "LWIN", "RWIN", "APPS", "NULL"};
+
+void LoadINIControllerSettings()
+{
+#ifdef DETECT_JOYSTICK_MENU
+#ifdef XINPUT
+	int storedJoy1 = -1;
+	if (ReadIniIfExists("Controller", "JoystickName", &storedJoy1)) {
+		CPad::XInputJoy1 = -1;
+		CPad::XInputJoy2 = -1;
+		XINPUT_STATE xstate;
+		memset(&xstate, 0, sizeof(XINPUT_STATE));
+
+		// Firstly confirm & set joy 1
+		if (XInputGetState(storedJoy1, &xstate) == ERROR_SUCCESS) {
+			CPad::XInputJoy1 = storedJoy1;
+		}
+
+		for (int i = 0; i <= 3; i++) {
+			if (XInputGetState(i, &xstate) == ERROR_SUCCESS) {
+				if (CPad::XInputJoy1 == -1)
+					CPad::XInputJoy1 = i;
+				else if (CPad::XInputJoy2 == -1 && i != CPad::XInputJoy1)
+					CPad::XInputJoy2 = i;
+			}
+		}
+
+		// There is no plug event on XInput, so let's leave XInputJoy1/2 as 0/1 respectively, and hotplug will be possible.
+		if (CPad::XInputJoy1 == -1) {
+			CPad::XInputJoy1 = 0;
+			CPad::XInputJoy2 = 1;
+		} else if (CPad::XInputJoy2 == -1) {
+			CPad::XInputJoy2 = (CPad::XInputJoy1 + 1) % 4;
+		}
+	}
+#else
+	ReadIniIfExists("Controller", "JoystickName", gSelectedJoystickName, 128);
+#endif
+#endif
+	// force to default GTA behaviour (never overwrite bindings on joy change/initialization) if user init'ed/set bindings before we introduced that
+	if (!ReadIniIfExists("Controller", "PadButtonsInited", &ControlsManager.ms_padButtonsInited)) {
+		ControlsManager.ms_padButtonsInited = cfg.category_size("Bindings") != 0 ? 16 : 0;
+	}
+
+	for (int32 i = 0; i < MAX_CONTROLLERACTIONS; i++) {
+		char value[128];
+		if (ReadIniIfExists("Bindings", iniControllerActions[i], value, 128)) {
+			for (int32 j = 0; j < MAX_CONTROLLERTYPES; j++){
+				ControlsManager.ClearSettingsAssociatedWithAction((e_ControllerAction)i, (eControllerType)j);
+			}
+
+			for (char *binding = strtok(value,", "); binding != nil; binding = strtok(nil, ", ")) {
+				int contType = -1;
+				for (int32 k = 0; k < ARRAY_SIZE(iniControllerTypes); k++) {
+					int len = strlen(iniControllerTypes[k]);
+					if (strncmp(binding, iniControllerTypes[k], len) == 0) {
+						contType = k;
+						binding += len;
+						break;
+					}
+				}
+				if (contType == -1)
+					continue;
+
+				int contKey;
+				if (contType == JOYSTICK) {
+					char *temp;
+					contKey = strtol(binding, &temp, 0);
+
+				} else if (contType == KEYBOARD || contType == OPTIONAL_EXTRA) {
+					if (strlen(binding) == 1) {
+						contKey = binding[0];
+					} else if(strcmp(binding, "SPC") == 0) {
+						contKey = ' ';
+					} else {
+						for (int32 k = 0; k < ARRAY_SIZE(iniKeyboardButtons); k++) {
+							if(strcmp(binding, iniKeyboardButtons[k]) == 0) {
+								contKey = 1000 + k;
+								break;
+							}
+						}
+					}
+				} else if (contType == MOUSE) {
+					for (int32 k = 0; k < ARRAY_SIZE(iniMouseButtons); k++) {
+						if(strcmp(binding, iniMouseButtons[k]) == 0) {
+							contKey = 1 + k;
+							break;
+						}
+					}
+				}
+
+				ControlsManager.SetControllerKeyAssociatedWithAction((e_ControllerAction)i, contKey, (eControllerType)contType);
+			}
+		}
+	}
+}
+
+void SaveINIControllerSettings()
+{
+	for (int32 i = 0; i < MAX_CONTROLLERACTIONS; i++) {
+		char value[128] = { '\0' };
+
+		// upper limit should've been GetNumOfSettingsForAction(i), but sadly even R* doesn't use it's own system correctly, and there are gaps between orders.
+		for (int32 j = SETORDER_1; j < MAX_SETORDERS; j++){
+
+			// We respect the m_ContSetOrder, and join/implode/order the bindings according to that; using comma as seperator.
+			for (int32 k = 0; k < MAX_CONTROLLERTYPES; k++){
+				if (ControlsManager.m_aSettings[i][k].m_ContSetOrder == j) {
+					char next[32];
+					if (k == JOYSTICK) {
+						snprintf(next, 32, "%s%d,", iniControllerTypes[k], ControlsManager.m_aSettings[i][k].m_Key);
+
+					} else if (k == KEYBOARD || k == OPTIONAL_EXTRA) {
+						if (ControlsManager.m_aSettings[i][k].m_Key == ' ')
+							snprintf(next, 32, "%sSPC,", iniControllerTypes[k]);
+						else if (ControlsManager.m_aSettings[i][k].m_Key < 256)
+							snprintf(next, 32, "%s%c,", iniControllerTypes[k], ControlsManager.m_aSettings[i][k].m_Key);
+						else
+							snprintf(next, 32, "%s%s,", iniControllerTypes[k], iniKeyboardButtons[ControlsManager.m_aSettings[i][k].m_Key - 1000]);
+
+					} else if (k == MOUSE) {
+						snprintf(next, 32, "%s%s,", iniControllerTypes[k], iniMouseButtons[ControlsManager.m_aSettings[i][k].m_Key - 1]);
+					}
+					strcat(value, next);
+					break;
+				}
+			}
+		}
+		int len = strlen(value);
+		if (len > 0)
+			value[len - 1] = '\0'; // to remove comma
+
+		StoreIni("Bindings", iniControllerActions[i], value, 128);
+	}
+
+#ifdef DETECT_JOYSTICK_MENU
+#ifdef XINPUT
+	StoreIni("Controller", "JoystickName", CPad::XInputJoy1);
+#else
+	StoreIni("Controller", "JoystickName", gSelectedJoystickName, 128);
+#endif
+#endif
+	StoreIni("Controller", "PadButtonsInited", ControlsManager.ms_padButtonsInited);
+	cfg.write_file("reVC.ini");
+}
+
+bool LoadINISettings()
+{
+	if (!cfg.load_file("reVC.ini"))
+		return false;
+
+#ifdef IMPROVED_VIDEOMODE
+	ReadIniIfExists("VideoMode", "Width", &FrontEndMenuManager.m_nPrefsWidth);
+	ReadIniIfExists("VideoMode", "Height", &FrontEndMenuManager.m_nPrefsHeight);
+	ReadIniIfExists("VideoMode", "Depth", &FrontEndMenuManager.m_nPrefsDepth);
+	ReadIniIfExists("VideoMode", "Subsystem", &FrontEndMenuManager.m_nPrefsSubsystem);
+	// Windowed mode is loaded below in CUSTOM_FRONTEND_OPTIONS section
+#else
+	ReadIniIfExists("Graphics", "VideoMode", &FrontEndMenuManager.m_nDisplayVideoMode);
+#endif
+	ReadIniIfExists("Controller", "HeadBob1stPerson", &TheCamera.m_bHeadBob);
+	ReadIniIfExists("Controller", "HorizantalMouseSens", &TheCamera.m_fMouseAccelHorzntl);
+	ReadIniIfExists("Controller", "InvertMouseVertically", &MousePointerStateHelper.bInvertVertically);
+	ReadIniIfExists("Controller", "DisableMouseSteering", &CVehicle::m_bDisableMouseSteering);
+	ReadIniIfExists("Controller", "Vibration", &FrontEndMenuManager.m_PrefsUseVibration);
+	ReadIniIfExists("Audio", "SfxVolume", &FrontEndMenuManager.m_PrefsSfxVolume);
+	ReadIniIfExists("Audio", "MusicVolume", &FrontEndMenuManager.m_PrefsMusicVolume);
+	ReadIniIfExists("Audio", "MP3BoostVolume", &FrontEndMenuManager.m_PrefsMP3BoostVolume);
+	ReadIniIfExists("Audio", "Radio", &FrontEndMenuManager.m_PrefsRadioStation);
+	ReadIniIfExists("Audio", "SpeakerType", &FrontEndMenuManager.m_PrefsSpeakers);
+	ReadIniIfExists("Audio", "Provider", &FrontEndMenuManager.m_nPrefsAudio3DProviderIndex);
+	ReadIniIfExists("Audio", "DynamicAcoustics", &FrontEndMenuManager.m_PrefsDMA);
+	ReadIniIfExists("Display", "Brightness", &FrontEndMenuManager.m_PrefsBrightness);
+	ReadIniIfExists("Display", "DrawDistance", &FrontEndMenuManager.m_PrefsLOD);
+	ReadIniIfExists("Display", "Subtitles", &FrontEndMenuManager.m_PrefsShowSubtitles);
+	ReadIniIfExists("Graphics", "AspectRatio", &FrontEndMenuManager.m_PrefsUseWideScreen);
+	ReadIniIfExists("Graphics", "FrameLimiter", &FrontEndMenuManager.m_PrefsFrameLimiter);
+#ifdef LEGACY_MENU_OPTIONS
+	ReadIniIfExists("Graphics", "VSync", &FrontEndMenuManager.m_PrefsVsyncDisp);
+	ReadIniIfExists("Graphics", "Trails", &CMBlur::BlurOn);
+#endif
+	ReadIniIfExists("General", "SkinFile", FrontEndMenuManager.m_PrefsSkinFile, 256);
+	ReadIniIfExists("Controller", "Method", &FrontEndMenuManager.m_ControlMethod);
+	ReadIniIfExists("General", "Language", &FrontEndMenuManager.m_PrefsLanguage);
+	ReadIniIfExists("Display", "ShowHud", &FrontEndMenuManager.m_PrefsShowHud);
+	ReadIniIfExists("Display", "RadarMode", &FrontEndMenuManager.m_PrefsRadarMode);
+	ReadIniIfExists("Display", "ShowLegends", &FrontEndMenuManager.m_PrefsShowLegends);
+
+#ifdef EXTENDED_COLOURFILTER
+	ReadIniIfExists("CustomPipesValues", "PostFXIntensity", &CPostFX::Intensity);
+#endif
+#ifdef EXTENDED_PIPELINES
+	ReadIniIfExists("CustomPipesValues", "NeoVehicleShininess", &CustomPipes::VehicleShininess);
+	ReadIniIfExists("CustomPipesValues", "NeoVehicleSpecularity", &CustomPipes::VehicleSpecularity);
+	ReadIniIfExists("CustomPipesValues", "RimlightMult", &CustomPipes::RimlightMult);
+	ReadIniIfExists("CustomPipesValues", "LightmapMult", &CustomPipes::LightmapMult);
+	ReadIniIfExists("CustomPipesValues", "GlossMult", &CustomPipes::GlossMult);
+#endif
+	ReadIniIfExists("Rendering", "BackfaceCulling", &gBackfaceCulling);
+#ifdef NEW_RENDERER
+	ReadIniIfExists("Rendering", "NewRenderer", &gbNewRenderer);
+#endif
+
+#ifdef PROPER_SCALING
+	ReadIniIfExists("Draw", "ProperScaling", &CDraw::ms_bProperScaling);	
+#endif
+#ifdef FIX_RADAR
+	ReadIniIfExists("Draw", "FixRadar", &CDraw::ms_bFixRadar);	
+#endif
+#ifdef FIX_SPRITES
+	ReadIniIfExists("Draw", "FixSprites", &CDraw::ms_bFixSprites);	
+#endif
+#ifdef DRAW_GAME_VERSION_TEXT
+	ReadIniIfExists("General", "DrawVersionText", &gbDrawVersionText);
+#endif
+#ifdef NO_MOVIES
+	ReadIniIfExists("General", "NoMovies", &gbNoMovies);
+#endif
+
+#ifdef CUSTOM_FRONTEND_OPTIONS
+	bool migrate = cfg.category_size("FrontendOptions") != 0;
+	for (int i = 0; i < MENUPAGES; i++) {
+		for (int j = 0; j < NUM_MENUROWS; j++) {
+			CMenuScreenCustom::CMenuEntry &option = aScreens[i].m_aEntries[j];
+			if (option.m_Action == MENUACTION_NOTHING)
+				break;
+				
+			// CFO check
+			if (option.m_Action < MENUACTION_NOTHING && option.m_CFO->save) {
+				// CFO only supports saving uint8 right now
+
+				// Migrate from old .ini to new .ini
+				if (migrate && ReadIniIfExists("FrontendOptions", option.m_CFO->save, option.m_CFO->value))
+					cfg.remove("FrontendOptions", option.m_CFO->save);
+				else
+					ReadIniIfExists(option.m_CFO->saveCat, option.m_CFO->save, option.m_CFO->value);
+
+				if (option.m_Action == MENUACTION_CFO_SELECT) {
+					option.m_CFOSelect->lastSavedValue = option.m_CFOSelect->displayedValue = *option.m_CFO->value;
+				}
+			}
+		}
+	}
+#endif
+
+	return true;
+}
+
+void SaveINISettings()
+{
+#ifdef IMPROVED_VIDEOMODE
+	StoreIni("VideoMode", "Width", FrontEndMenuManager.m_nPrefsWidth);
+	StoreIni("VideoMode", "Height", FrontEndMenuManager.m_nPrefsHeight);
+	StoreIni("VideoMode", "Depth", FrontEndMenuManager.m_nPrefsDepth);
+	StoreIni("VideoMode", "Subsystem", FrontEndMenuManager.m_nPrefsSubsystem);
+	// Windowed mode is loaded below in CUSTOM_FRONTEND_OPTIONS section
+#else
+	StoreIni("Graphics", "VideoMode", FrontEndMenuManager.m_nDisplayVideoMode);
+#endif
+	StoreIni("Controller", "HeadBob1stPerson", TheCamera.m_bHeadBob);
+	StoreIni("Controller", "HorizantalMouseSens", TheCamera.m_fMouseAccelHorzntl);
+	StoreIni("Controller", "InvertMouseVertically", MousePointerStateHelper.bInvertVertically);
+	StoreIni("Controller", "DisableMouseSteering", CVehicle::m_bDisableMouseSteering);
+	StoreIni("Controller", "Vibration", FrontEndMenuManager.m_PrefsUseVibration);
+	StoreIni("Audio", "SfxVolume", FrontEndMenuManager.m_PrefsSfxVolume);
+	StoreIni("Audio", "MusicVolume", FrontEndMenuManager.m_PrefsMusicVolume);
+	StoreIni("Audio", "MP3BoostVolume", FrontEndMenuManager.m_PrefsMP3BoostVolume);
+	StoreIni("Audio", "Radio", FrontEndMenuManager.m_PrefsRadioStation);
+	StoreIni("Audio", "SpeakerType", FrontEndMenuManager.m_PrefsSpeakers);
+	StoreIni("Audio", "Provider", FrontEndMenuManager.m_nPrefsAudio3DProviderIndex);
+	StoreIni("Audio", "DynamicAcoustics", FrontEndMenuManager.m_PrefsDMA);
+	StoreIni("Display", "Brightness", FrontEndMenuManager.m_PrefsBrightness);
+	StoreIni("Display", "DrawDistance", FrontEndMenuManager.m_PrefsLOD);
+	StoreIni("Display", "Subtitles", FrontEndMenuManager.m_PrefsShowSubtitles);
+	StoreIni("Graphics", "AspectRatio", FrontEndMenuManager.m_PrefsUseWideScreen);
+#ifdef LEGACY_MENU_OPTIONS
+	StoreIni("Graphics", "VSync", FrontEndMenuManager.m_PrefsVsyncDisp);
+	StoreIni("Graphics", "Trails", CMBlur::BlurOn);
+#endif
+	StoreIni("Graphics", "FrameLimiter", FrontEndMenuManager.m_PrefsFrameLimiter);
+	StoreIni("General", "SkinFile", FrontEndMenuManager.m_PrefsSkinFile, 256);
+	StoreIni("Controller", "Method", FrontEndMenuManager.m_ControlMethod);
+	StoreIni("General", "Language", FrontEndMenuManager.m_PrefsLanguage);
+	StoreIni("Display", "ShowHud", FrontEndMenuManager.m_PrefsShowHud);
+	StoreIni("Display", "RadarMode", FrontEndMenuManager.m_PrefsRadarMode);
+	StoreIni("Display", "ShowLegends", FrontEndMenuManager.m_PrefsShowLegends);
+
+#ifdef EXTENDED_COLOURFILTER
+	StoreIni("CustomPipesValues", "PostFXIntensity", CPostFX::Intensity);
+#endif
+#ifdef EXTENDED_PIPELINES
+	StoreIni("CustomPipesValues", "NeoVehicleShininess", CustomPipes::VehicleShininess);
+	StoreIni("CustomPipesValues", "NeoVehicleSpecularity", CustomPipes::VehicleSpecularity);
+	StoreIni("CustomPipesValues", "RimlightMult", CustomPipes::RimlightMult);
+	StoreIni("CustomPipesValues", "LightmapMult", CustomPipes::LightmapMult);
+	StoreIni("CustomPipesValues", "GlossMult", CustomPipes::GlossMult);
+#endif
+	StoreIni("Rendering", "BackfaceCulling", gBackfaceCulling);
+#ifdef NEW_RENDERER
+	StoreIni("Rendering", "NewRenderer", gbNewRenderer);
+#endif
+
+#ifdef PROPER_SCALING	
+	StoreIni("Draw", "ProperScaling", CDraw::ms_bProperScaling);	
+#endif
+#ifdef FIX_RADAR
+	StoreIni("Draw", "FixRadar", CDraw::ms_bFixRadar);
+#endif
+#ifdef FIX_SPRITES
+	StoreIni("Draw", "FixSprites", CDraw::ms_bFixSprites);	
+#endif
+#ifdef DRAW_GAME_VERSION_TEXT
+	StoreIni("General", "DrawVersionText", gbDrawVersionText);
+#endif
+#ifdef NO_MOVIES
+	StoreIni("General", "NoMovies", gbNoMovies);
+#endif
+#ifdef CUSTOM_FRONTEND_OPTIONS
+	for (int i = 0; i < MENUPAGES; i++) {
+		for (int j = 0; j < NUM_MENUROWS; j++) {
+			CMenuScreenCustom::CMenuEntry &option = aScreens[i].m_aEntries[j];
+			if (option.m_Action == MENUACTION_NOTHING)
+				break;
+				
+			if (option.m_Action < MENUACTION_NOTHING && option.m_CFO->save) {
+				// Beware: CFO only supports saving uint8 right now
+				StoreIni(option.m_CFO->saveCat, option.m_CFO->save, *option.m_CFO->value);
+			}
+		}
+	}
+#endif
+
+	cfg.write_file("reVC.ini");
+}
+
+#endif
+
+#ifdef DEBUGMENU
+void WeaponCheat1();
+void WeaponCheat2();
+void WeaponCheat3();
+void HealthCheat();
+void VehicleCheat(int model);
+void BlowUpCarsCheat();
+void ChangePlayerCheat();
+void MayhemCheat();
+void EverybodyAttacksPlayerCheat();
+void WeaponsForAllCheat();
+void FastTimeCheat();
+void SlowTimeCheat();
+void MoneyCheat();
+void ArmourCheat();
+void WantedLevelUpCheat();
+void WantedLevelDownCheat();
+void SunnyWeatherCheat();
+void CloudyWeatherCheat();
+void RainyWeatherCheat();
+void FoggyWeatherCheat();
+void FastWeatherCheat();
+void OnlyRenderWheelsCheat();
+void ChittyChittyBangBangCheat();
+void StrongGripCheat();
+void SpecialCarCheats();
+void PickUpChicksCheat();
+
+DebugMenuEntry *carCol1;
+DebugMenuEntry *carCol2;
+
+void
+SpawnCar(int id)
+{
+	CVector playerpos;
+	CStreaming::RequestModel(id, 0);
+	CStreaming::LoadAllRequestedModels(false);
+	if(CStreaming::HasModelLoaded(id)){
+		playerpos = FindPlayerCoors();
+		int node;
+		if(!CModelInfo::IsBoatModel(id)){
+			node = ThePaths.FindNodeClosestToCoors(playerpos, 0, 100.0f, false, false);
+			if(node < 0)
+				return;
+		}
+
+		CVehicle *v;
+		if(CModelInfo::IsBoatModel(id))
+			v = new CBoat(id, RANDOM_VEHICLE);
+		else if(CModelInfo::IsBikeModel(id))
+			v = new CBike(id, RANDOM_VEHICLE);
+		else
+			v = new CAutomobile(id, RANDOM_VEHICLE);
+
+		v->bHasBeenOwnedByPlayer = true;
+		if(carCol1)
+			DebugMenuEntrySetAddress(carCol1, &v->m_currentColour1);
+		if(carCol2)
+			DebugMenuEntrySetAddress(carCol2, &v->m_currentColour2);
+
+		if(CModelInfo::IsBoatModel(id))
+			v->SetPosition(TheCamera.GetPosition() + TheCamera.GetForward()*15.0f);
+		else
+			v->SetPosition(ThePaths.m_pathNodes[node].GetPosition());
+
+		v->GetMatrix().GetPosition().z += 4.0f;
+		v->SetOrientation(0.0f, 0.0f, 3.49f);
+		v->SetStatus(STATUS_ABANDONED);
+		v->m_nDoorLock = CARLOCK_UNLOCKED;
+		CWorld::Add(v);
+	}
+}
+
+static void
+FixCar(void)
+{
+	CVehicle *veh = FindPlayerVehicle();
+	if(veh == nil)
+		return;
+	veh->m_fHealth = 1000.0f;
+	if(veh->IsCar()){
+		((CAutomobile*)veh)->Damage.SetEngineStatus(0);
+		((CAutomobile*)veh)->Fix();
+	}else if(veh->IsBike()){
+		((CBike*)veh)->Fix();
+	}
+}
+
+#ifdef MAP_ENHANCEMENTS
+static void
+TeleportToWaypoint(void)
+{
+	if (FindPlayerVehicle()) {
+		if (CRadar::TargetMarkerId != -1)
+			FindPlayerVehicle()->Teleport(CRadar::TargetMarkerPos + CVector(0.0f, 0.0f, FindPlayerVehicle()->GetColModel()->boundingSphere.center.z));
+	} else
+		if(CRadar::TargetMarkerId != -1)
+			FindPlayerPed()->Teleport(CRadar::TargetMarkerPos + CVector(0.0f, 0.0f, FEET_OFFSET));
+}
+#endif
+
+static void
+SwitchCarCollision(void)
+{
+	if (FindPlayerVehicle() && FindPlayerVehicle()->IsCar())
+		FindPlayerVehicle()->bUsesCollision = !FindPlayerVehicle()->bUsesCollision;
+}
+
+static void
+ToggleComedy(void)
+{
+	CVehicle *veh = FindPlayerVehicle();
+	if(veh == nil)
+		return;
+	veh->bComedyControls = !veh->bComedyControls;
+}
+
+static void
+PlaceOnRoad(void)
+{
+	CVehicle *veh = FindPlayerVehicle();
+	if(veh == nil)
+		return;
+
+	if(veh->IsCar())
+		((CAutomobile*)veh)->PlaceOnRoadProperly();
+}
+
+static void
+ResetCamStatics(void)
+{
+	TheCamera.Cams[TheCamera.ActiveCam].ResetStatics = true;
+}
+
+#ifdef MISSION_SWITCHER
+int8 nextMissionToSwitch = 0;
+static void
+SwitchToMission(void)
+{
+	CTheScripts::SwitchToMission(nextMissionToSwitch);
+}
+#endif
+
+static const char *carnames[] = {
+	"landstal", "idaho", "stinger", "linerun", "peren", "sentinel", "rio", "firetruk", "trash", "stretch", "manana",
+	"infernus", "voodoo", "pony", "mule", "cheetah", "ambulan", "fbicar", "moonbeam", "esperant", "taxi", "washing",
+	"bobcat", "mrwhoop", "bfinject", "hunter", "police", "enforcer", "securica", "banshee", "predator", "bus",
+	"rhino", "barracks", "cuban", "chopper", "angel", "coach", "cabbie", "stallion", "rumpo", "rcbandit", "romero",
+	"packer", "sentxs", "admiral", "squalo", "seaspar", "pizzaboy", "gangbur", "airtrain", "deaddodo", "speeder",
+	"reefer", "tropic", "flatbed", "yankee", "caddy", "zebra", "topfun", "skimmer", "pcj600", "faggio", "freeway",
+	"rcbaron", "rcraider", "glendale", "oceanic", "sanchez", "sparrow", "patriot", "lovefist", "coastg", "dinghy",
+	"hermes", "sabre", "sabretur", "pheonix", "walton", "regina", "comet", "deluxo", "burrito", "spand", "marquis",
+	"baggage", "kaufman", "maverick", "vcnmav", "rancher", "fbiranch", "virgo", "greenwoo", "jetmax", "hotring",
+	"sandking", "blistac", "polmav", "boxville", "benson", "mesa", "rcgoblin", "hotrina", "hotrinb",
+	"bloodra", "bloodrb", "vicechee"
+};
+
+static CTweakVar** TweakVarsList;
+static int TweakVarsListSize = -1;
+static bool bAddTweakVarsNow = false;
+static const char *pTweakVarsDefaultPath = NULL;
+
+void CTweakVars::Add(CTweakVar *var)
+{
+	if(TweakVarsListSize == -1) {
+		TweakVarsList = (CTweakVar**)malloc(64 * sizeof(CTweakVar*));
+		TweakVarsListSize = 0;
+	}
+	if(TweakVarsListSize > 63)
+		TweakVarsList = (CTweakVar**) realloc(TweakVarsList, (TweakVarsListSize + 1) * sizeof(CTweakVar*));
+
+	TweakVarsList[TweakVarsListSize++] = var;
+//	TweakVarsList.push_back(var);
+	
+	if ( bAddTweakVarsNow )
+		var->AddDBG(pTweakVarsDefaultPath);
+}
+
+void CTweakVars::AddDBG(const char *path)
+{
+	pTweakVarsDefaultPath = path;
+
+	for(int i = 0; i < TweakVarsListSize; ++i)
+		TweakVarsList[i]->AddDBG(pTweakVarsDefaultPath);
+	
+	bAddTweakVarsNow = true;
+}
+
+void CTweakSwitch::AddDBG(const char *path)
+{		
+	DebugMenuEntry *e = DebugMenuAddVar(m_pPath == NULL ? path : m_pPath, m_pVarName, (int32_t *)m_pIntVar, m_pFunc, 1, m_nMin, m_nMax, m_aStr);
+	DebugMenuEntrySetWrap(e, true);
+}
+	
+void CTweakFunc::AddDBG  (const char *path) { DebugMenuAddCmd     (m_pPath == NULL ? path : m_pPath, m_pVarName, m_pFunc); }
+void CTweakBool::AddDBG  (const char *path) { DebugMenuAddVarBool8(m_pPath == NULL ? path : m_pPath, m_pVarName, (int8_t *)m_pBoolVar,  NULL); }
+void CTweakInt8::AddDBG  (const char *path) { DebugMenuAddVar     (m_pPath == NULL ? path : m_pPath, m_pVarName, (int8_t *)m_pIntVar,   NULL, m_nStep, m_nLoawerBound, m_nUpperBound, NULL); }
+void CTweakUInt8::AddDBG (const char *path) { DebugMenuAddVar     (m_pPath == NULL ? path : m_pPath, m_pVarName, (uint8_t *)m_pIntVar,  NULL, m_nStep, m_nLoawerBound, m_nUpperBound, NULL); }
+void CTweakInt16::AddDBG (const char *path) { DebugMenuAddVar     (m_pPath == NULL ? path : m_pPath, m_pVarName, (int16_t *)m_pIntVar,  NULL, m_nStep, m_nLoawerBound, m_nUpperBound, NULL); }
+void CTweakUInt16::AddDBG(const char *path) { DebugMenuAddVar     (m_pPath == NULL ? path : m_pPath, m_pVarName, (uint16_t *)m_pIntVar, NULL, m_nStep, m_nLoawerBound, m_nUpperBound, NULL); }
+void CTweakInt32::AddDBG (const char *path) { DebugMenuAddVar     (m_pPath == NULL ? path : m_pPath, m_pVarName, (int32_t *)m_pIntVar,  NULL, m_nStep, m_nLoawerBound, m_nUpperBound, NULL); }
+void CTweakUInt32::AddDBG(const char *path) { DebugMenuAddVar     (m_pPath == NULL ? path : m_pPath, m_pVarName, (uint32_t *)m_pIntVar, NULL, m_nStep, m_nLoawerBound, m_nUpperBound, NULL); }
+void CTweakFloat::AddDBG (const char *path) { DebugMenuAddVar     (m_pPath == NULL ? path : m_pPath, m_pVarName, (float *)m_pIntVar,    NULL, m_nStep, m_nLoawerBound, m_nUpperBound); }
+
+/*
+static const char *wt[] = {
+			"Sunny", "Cloudy", "Rainy", "Foggy"
+		};
+
+SETTWEAKPATH("TEST");		
+TWEAKSWITCH(CWeather::NewWeatherType, 0, 3, wt, NULL);
+*/
+
+void
+switchWeather(void)
+{
+	CWeather::StreamAfterRainTimer = 0;
+}
+
+void
+DebugMenuPopulate(void)
+{
+	if(1){
+		static const char *weathers[] = {
+			"Sunny", "Cloudy", "Rainy", "Foggy", "Extrasunny", "Stormy"
+		};
+		static const char *extracols[] = {
+			"1 - Malibu club",
+			"2 - Strib club",
+			"3 - Hotel",
+			"4 - Bank",
+			"5 - Police HQ",
+			"6 - Mall",
+			"7 - Rifle Range",
+			"8 - Mansion",
+			"9 - Dirt ring",
+			"10 - Blood ring",
+			"11 - Hot ring",
+			"12 - Concert hall",
+			"13 - Auntie Poulets",
+			"14 - Intro at docks",
+			"15 - Biker bar",
+			"16 - Intro cafe",
+			"17 - Studio",
+			"18", "19", "20", "21", "22", "23", "24"
+		};
+		DebugMenuEntry *e;
+		e = DebugMenuAddVar("Time & Weather", "Current Hour", &CClock::GetHoursRef(), nil, 1, 0, 23, nil);
+		DebugMenuEntrySetWrap(e, true);
+		e = DebugMenuAddVar("Time & Weather", "Current Minute", &CClock::GetMinutesRef(),
+			[](){ CWeather::InterpolationValue = CClock::GetMinutes()/60.0f; }, 1, 0, 59, nil);
+			DebugMenuEntrySetWrap(e, true);
+		e = DebugMenuAddVar("Time & Weather", "Old Weather", (int16*)&CWeather::OldWeatherType, switchWeather, 1, 0, 5, weathers);
+		DebugMenuEntrySetWrap(e, true);
+		e = DebugMenuAddVar("Time & Weather", "New Weather", (int16*)&CWeather::NewWeatherType, switchWeather, 1, 0, 5, weathers);
+		DebugMenuEntrySetWrap(e, true);
+		DebugMenuAddVarBool32("Time & Weather", "Extracolours On", &CTimeCycle::m_bExtraColourOn, nil);
+		DebugMenuAddVar("Time & Weather", "Extracolour", &CTimeCycle::m_ExtraColour, nil, 1, 0, 23, extracols);
+		DebugMenuAddVar("Time & Weather", "Time scale", (float*)&CTimer::GetTimeScale(), nil, 0.1f, 0.0f, 10.0f);
+
+		DebugMenuAddCmd("Cheats", "Weapon set 1", WeaponCheat1);
+		DebugMenuAddCmd("Cheats", "Weapon set 2", WeaponCheat2);
+		DebugMenuAddCmd("Cheats", "Weapon set 3", WeaponCheat3);
+		DebugMenuAddCmd("Cheats", "Money", MoneyCheat);
+		DebugMenuAddCmd("Cheats", "Health", HealthCheat);
+		DebugMenuAddCmd("Cheats", "Wanted level up", WantedLevelUpCheat);
+		DebugMenuAddCmd("Cheats", "Wanted level down", WantedLevelDownCheat);
+		DebugMenuAddCmd("Cheats", "Tank", []() { VehicleCheat(MI_TAXI); });
+		DebugMenuAddCmd("Cheats", "Blow up cars", BlowUpCarsCheat);
+		DebugMenuAddCmd("Cheats", "Change player", ChangePlayerCheat);
+		DebugMenuAddCmd("Cheats", "Mayhem", MayhemCheat);
+		DebugMenuAddCmd("Cheats", "Everybody attacks player", EverybodyAttacksPlayerCheat);
+		DebugMenuAddCmd("Cheats", "Weapons for all", WeaponsForAllCheat);
+		DebugMenuAddCmd("Cheats", "Fast time", FastTimeCheat);
+		DebugMenuAddCmd("Cheats", "Slow time", SlowTimeCheat);
+		DebugMenuAddCmd("Cheats", "Armour", ArmourCheat);
+		DebugMenuAddCmd("Cheats", "Sunny weather", SunnyWeatherCheat);
+		DebugMenuAddCmd("Cheats", "Cloudy weather", CloudyWeatherCheat);
+		DebugMenuAddCmd("Cheats", "Rainy weather", RainyWeatherCheat);
+		DebugMenuAddCmd("Cheats", "Foggy weather", FoggyWeatherCheat);
+		DebugMenuAddCmd("Cheats", "Fast weather", FastWeatherCheat);
+		DebugMenuAddCmd("Cheats", "Only render wheels", OnlyRenderWheelsCheat);
+		DebugMenuAddCmd("Cheats", "Chitty chitty bang bang", ChittyChittyBangBangCheat);
+		DebugMenuAddCmd("Cheats", "Strong grip", StrongGripCheat);
+		DebugMenuAddCmd("Cheats", "Special car", SpecialCarCheats);
+		DebugMenuAddCmd("Cheats", "Pickup chicks", PickUpChicksCheat);
+
+		static int spawnCarId = MI_LANDSTAL;
+		e = DebugMenuAddVar("Spawn", "Spawn Car ID", &spawnCarId, nil, 1, MI_LANDSTAL, MI_VICECHEE, carnames);
+		DebugMenuEntrySetWrap(e, true);
+		DebugMenuAddCmd("Spawn", "Spawn Car", [](){
+			if(spawnCarId == MI_CHOPPER ||
+			   spawnCarId == MI_AIRTRAIN ||
+			   spawnCarId == MI_DEADDODO)
+				return;
+			SpawnCar(spawnCarId);
+		});
+		static uint8 dummy;
+		carCol1 = DebugMenuAddVar("Spawn", "First colour", &dummy, nil, 1, 0, 255, nil);
+		carCol2 = DebugMenuAddVar("Spawn", "Second colour", &dummy, nil, 1, 0, 255, nil);
+		DebugMenuAddCmd("Spawn", "Spawn Stinger", [](){ SpawnCar(MI_STINGER); });
+		DebugMenuAddCmd("Spawn", "Spawn Infernus", [](){ SpawnCar(MI_INFERNUS); });
+		DebugMenuAddCmd("Spawn", "Spawn Cheetah", [](){ SpawnCar(MI_CHEETAH); });
+		DebugMenuAddCmd("Spawn", "Spawn Phoenix", [](){ SpawnCar(MI_PHEONIX); });
+		DebugMenuAddCmd("Spawn", "Spawn Banshee", [](){ SpawnCar(MI_BANSHEE); });
+		DebugMenuAddCmd("Spawn", "Spawn Esperanto", [](){ SpawnCar(MI_ESPERANT); });
+		DebugMenuAddCmd("Spawn", "Spawn Stallion", [](){ SpawnCar(MI_STALLION); });
+		DebugMenuAddCmd("Spawn", "Spawn Admiral", [](){ SpawnCar(MI_ADMIRAL); });
+		DebugMenuAddCmd("Spawn", "Spawn Washington", [](){ SpawnCar(MI_WASHING); });
+		DebugMenuAddCmd("Spawn", "Spawn Taxi", [](){ SpawnCar(MI_TAXI); });
+		DebugMenuAddCmd("Spawn", "Spawn Police", [](){ SpawnCar(MI_POLICE); });
+		DebugMenuAddCmd("Spawn", "Spawn Enforcer", [](){ SpawnCar(MI_ENFORCER); });
+		DebugMenuAddCmd("Spawn", "Spawn Cuban", [](){ SpawnCar(MI_CUBAN); });
+		DebugMenuAddCmd("Spawn", "Spawn Voodoo", [](){ SpawnCar(MI_VOODOO); });
+		DebugMenuAddCmd("Spawn", "Spawn BF injection", [](){ SpawnCar(MI_BFINJECT); });
+		DebugMenuAddCmd("Spawn", "Spawn Maverick", [](){ SpawnCar(MI_MAVERICK); });
+		DebugMenuAddCmd("Spawn", "Spawn VCN Maverick", [](){ SpawnCar(MI_VCNMAV); });
+		DebugMenuAddCmd("Spawn", "Spawn Sparrow", [](){ SpawnCar(MI_SPARROW); });
+		DebugMenuAddCmd("Spawn", "Spawn Sea Sparrow", [](){ SpawnCar(MI_SEASPAR); });
+		DebugMenuAddCmd("Spawn", "Spawn Hunter", [](){ SpawnCar(MI_HUNTER); });
+		DebugMenuAddCmd("Spawn", "Spawn Rhino", [](){ SpawnCar(MI_RHINO); });
+		DebugMenuAddCmd("Spawn", "Spawn Firetruck", [](){ SpawnCar(MI_FIRETRUCK); });
+		DebugMenuAddCmd("Spawn", "Spawn Predator", [](){ SpawnCar(MI_PREDATOR); });
+		DebugMenuAddCmd("Spawn", "Spawn PCJ 600", [](){ SpawnCar(MI_PCJ600); });
+		DebugMenuAddCmd("Spawn", "Spawn Faggio", [](){ SpawnCar(MI_FAGGIO); });
+		DebugMenuAddCmd("Spawn", "Spawn Freeway", [](){ SpawnCar(MI_FREEWAY); });
+		DebugMenuAddCmd("Spawn", "Spawn Squalo", [](){ SpawnCar(MI_SQUALO); });
+		DebugMenuAddCmd("Spawn", "Spawn Skimmer", [](){ SpawnCar(MI_SKIMMER); });
+
+		DebugMenuAddVarBool8("Render", "Draw hud", &CHud::m_Wants_To_Draw_Hud, nil);
+#ifdef PROPER_SCALING	
+		DebugMenuAddVarBool8("Render", "Proper Scaling", &CDraw::ms_bProperScaling, nil);
+#endif
+#ifdef FIX_RADAR
+		DebugMenuAddVarBool8("Render", "Fix Radar", &CDraw::ms_bFixRadar, nil);
+#endif
+#ifdef FIX_SPRITES
+		DebugMenuAddVarBool8("Render", "Fix Sprites", &CDraw::ms_bFixSprites, nil);
+#endif
+		DebugMenuAddVarBool8("Render", "Backface Culling", &gBackfaceCulling, nil);
+		DebugMenuAddVarBool8("Render", "PS2 Alpha test Emu", &gPS2alphaTest, nil);
+		DebugMenuAddVarBool8("Render", "Frame limiter", &FrontEndMenuManager.m_PrefsFrameLimiter, nil);
+		DebugMenuAddVarBool8("Render", "VSynch", &FrontEndMenuManager.m_PrefsVsync, nil);
+		DebugMenuAddVar("Render", "Max FPS", &RsGlobal.maxFPS, nil, 1, 1, 1000, nil);
+#ifdef NEW_RENDERER
+		DebugMenuAddVarBool8("Render", "New Renderer", &gbNewRenderer, nil);
+extern bool gbRenderRoads;
+extern bool gbRenderEverythingBarRoads;
+extern bool gbRenderFadingInUnderwaterEntities;
+extern bool gbRenderFadingInEntities;
+extern bool gbRenderWater;
+extern bool gbRenderBoats;
+extern bool gbRenderVehicles;
+extern bool gbRenderWorld0;
+extern bool gbRenderWorld1;
+extern bool gbRenderWorld2;
+		DebugMenuAddVarBool8("Debug Render", "gbRenderRoads", &gbRenderRoads, nil);
+		DebugMenuAddVarBool8("Debug Render", "gbRenderEverythingBarRoads", &gbRenderEverythingBarRoads, nil);
+		DebugMenuAddVarBool8("Debug Render", "gbRenderFadingInUnderwaterEntities", &gbRenderFadingInUnderwaterEntities, nil);
+		DebugMenuAddVarBool8("Debug Render", "gbRenderFadingInEntities", &gbRenderFadingInEntities, nil);
+		DebugMenuAddVarBool8("Debug Render", "gbRenderWater", &gbRenderWater, nil);
+		DebugMenuAddVarBool8("Debug Render", "gbRenderBoats", &gbRenderBoats, nil);
+		DebugMenuAddVarBool8("Debug Render", "gbRenderVehicles", &gbRenderVehicles, nil);
+		DebugMenuAddVarBool8("Debug Render", "gbRenderWorld0", &gbRenderWorld0, nil);
+		DebugMenuAddVarBool8("Debug Render", "gbRenderWorld1", &gbRenderWorld1, nil);
+		DebugMenuAddVarBool8("Debug Render", "gbRenderWorld2", &gbRenderWorld2, nil);
+#endif
+
+#ifdef EXTENDED_COLOURFILTER
+		static const char *filternames[] = { "None", "Simple", "Normal", "Mobile" };
+		e = DebugMenuAddVar("Render", "Colourfilter", &CPostFX::EffectSwitch, nil, 1, CPostFX::POSTFX_OFF, CPostFX::POSTFX_MOBILE, filternames);
+		DebugMenuEntrySetWrap(e, true);
+		DebugMenuAddVar("Render", "Intensity", &CPostFX::Intensity, nil, 0.05f, 0, 10.0f);
+		DebugMenuAddVarBool8("Render", "Blur", &CPostFX::BlurOn, nil);
+		DebugMenuAddVarBool8("Render", "Motion Blur", &CPostFX::MotionBlurOn, nil);
+#endif
+		DebugMenuAddVar("Render", "Drunkness", &CMBlur::Drunkness, nil, 0.05f, 0, 1.0f);
+#ifndef MASTER
+		DebugMenuAddVarBool8("Render", "Occlusion debug", &bDispayOccDebugStuff, nil);
+#endif
+#ifdef EXTENDED_PIPELINES
+		static const char *vehpipenames[] = { "MatFX", "Neo" };
+		e = DebugMenuAddVar("Render", "Vehicle Pipeline", &CustomPipes::VehiclePipeSwitch, nil,
+			1, CustomPipes::VEHICLEPIPE_MATFX, CustomPipes::VEHICLEPIPE_NEO, vehpipenames);
+		DebugMenuEntrySetWrap(e, true);
+		DebugMenuAddVar("Render", "Neo Vehicle Shininess", &CustomPipes::VehicleShininess, nil, 0.1f, 0, 1.0f);
+		DebugMenuAddVar("Render", "Neo Vehicle Specularity", &CustomPipes::VehicleSpecularity, nil, 0.1f, 0, 1.0f);
+		DebugMenuAddVarBool8("Render", "Neo Ped Rim light enable", &CustomPipes::RimlightEnable, nil);
+		DebugMenuAddVar("Render", "Mult", &CustomPipes::RimlightMult, nil, 0.1f, 0, 1.0f);
+		DebugMenuAddVarBool8("Render", "Neo World Lightmaps enable", &CustomPipes::LightmapEnable, nil);
+		DebugMenuAddVar("Render", "Mult", &CustomPipes::LightmapMult, nil, 0.1f, 0, 1.0f);
+		DebugMenuAddVarBool8("Render", "Neo Road Gloss enable", &CustomPipes::GlossEnable, nil);
+		DebugMenuAddVar("Render", "Mult", &CustomPipes::GlossMult, nil, 0.1f, 0, 1.0f);
+#endif
+		DebugMenuAddVarBool8("Debug Render", "Show Ped Paths", &gbShowPedPaths, nil);
+		DebugMenuAddVarBool8("Debug Render", "Show Car Paths", &gbShowCarPaths, nil);
+		DebugMenuAddVarBool8("Debug Render", "Show Car Path Links", &gbShowCarPathsLinks, nil);
+		DebugMenuAddVarBool8("Debug Render", "Show Collision Lines", &gbShowCollisionLines, nil);
+		DebugMenuAddVarBool8("Debug Render", "Show Collision Polys", &gbShowCollisionPolys, nil);
+		DebugMenuAddVarBool8("Debug Render", "Don't render Buildings", &gbDontRenderBuildings, nil);
+		DebugMenuAddVarBool8("Debug Render", "Don't render Big Buildings", &gbDontRenderBigBuildings, nil);
+		DebugMenuAddVarBool8("Debug Render", "Don't render Peds", &gbDontRenderPeds, nil);
+		DebugMenuAddVarBool8("Debug Render", "Don't render Vehicles", &gbDontRenderVehicles, nil);
+		DebugMenuAddVarBool8("Debug Render", "Don't render Objects", &gbDontRenderObjects, nil);
+		DebugMenuAddVarBool8("Debug Render", "Don't Render Water", &gbDontRenderWater, nil);
+		
+		
+#ifdef DRAW_GAME_VERSION_TEXT
+		DebugMenuAddVarBool8("Debug", "Version Text", &gbDrawVersionText, nil);
+#endif
+		DebugMenuAddVarBool8("Debug", "Show DebugStuffInRelease", &gbDebugStuffInRelease, nil);
+#ifdef TIMEBARS
+		DebugMenuAddVarBool8("Debug", "Show Timebars", &gbShowTimebars, nil);
+#endif
+#ifndef FINAL
+		DebugMenuAddVarBool8("Debug", "Use debug render groups", &bDebugRenderGroups, nil);
+		DebugMenuAddVarBool8("Debug", "Print Memory Usage", &gbPrintMemoryUsage, nil);
+#ifdef USE_CUSTOM_ALLOCATOR
+		DebugMenuAddCmd("Debug", "Parse Heap", ParseHeap);
+#endif
+#endif
+
+		DebugMenuAddVarBool8("Debug", "pad 1 -> pad 2", &CPad::m_bMapPadOneToPadTwo, nil);
+#ifdef GTA_SCENE_EDIT
+		DebugMenuAddVarBool8("Debug", "Edit on", &CSceneEdit::m_bEditOn, nil);
+#endif
+		//DebugMenuAddCmd("Debug", "Start Credits", CCredits::Start);
+		//DebugMenuAddCmd("Debug", "Stop Credits", CCredits::Stop);
+
+#ifdef RELOADABLES
+// maybe put it back if we have more to reload 
+//		DebugMenuAddCmd("Reload", "HUD.TXD", CHud::ReloadTXD);
+#endif
+
+#ifdef MAP_ENHANCEMENTS
+		DebugMenuAddCmd("Game", "Teleport to map waypoint", TeleportToWaypoint);
+#endif
+		DebugMenuAddCmd("Game", "Fix Car", FixCar);
+		DebugMenuAddCmd("Game", "Place Car on Road", PlaceOnRoad);
+		DebugMenuAddCmd("Game", "Switch car collision", SwitchCarCollision);
+		DebugMenuAddCmd("Game", "Toggle Comedy Controls", ToggleComedy);
+
+
+#ifdef MISSION_SWITCHER
+		DebugMenuEntry *missionEntry;
+		static const char* missions[] = {
+			"Initial", "Intro", "An Old Friend", "The Party", "Back Alley Brawl", "Jury Fury", "Riot",
+			"Treacherous Swine", "Mall Shootout", "Guardian Angels", "Sir, Yes Sir!", "All Hands On Deck!",
+			"The Chase", "Phnom Penh '86", "The Fastest Boat", "Supply & Demand", "Rub Out", "Death Row",
+			"Four Iron", "Demolition Man", "Two Bit Hit", "No Escape?", "The Shootist", "The Driver",
+			"The Job", "Gun Runner", "Boomshine Saigon", "Recruitment Drive", "Dildo Dodo", "Martha's Mug Shot",
+			"G-spotlight", "Shakedown", "Bar Brawl", "Cop Land", "Spilling the Beans", "Hit the Courier",
+			"Printworks Buy", "Sunshine Autos", "Interglobal Films Buy", "Cherry Popper Icecreams Buy",
+			"Kaufman Cabs Buy", "Malibu Club Buy", "The Boatyard Buy", "Pole Position Club Buy", "El Swanko Casa Buy",
+			"Links View Apartment Buy", "Hyman Condo Buy", "Ocean Heighs Aprt. Buy", "1102 Washington Street Buy",
+			"Vice Point Buy", "Skumole Shack Buy", "Cap the Collector", "Keep your Friends Close...",
+			"Alloy Wheels of Steel", "Messing with the Man", "Hog Tied", "Stunt Boat Challenge", "Cannon Fodder",
+			"Naval Engagement", "Trojan Voodoo", "Juju Scramble", "Bombs Away!", "Dirty Lickin's", "Love Juice",
+			"Psycho Killer", "Publicity Tour", "Weapon Range", "Road Kill", "Waste the Wife", "Autocide",
+			"Check Out at the Check In", "Loose Ends", "V.I.P.", "Friendly Rivalry", "Cabmaggedon", "TAXI DRIVER",
+			"PARAMEDIC", "FIREFIGHTER", "VIGILANTE", "HOTRING", "BLOODRING", "DIRTRING", "Sunshine Autos Races",
+			"Distribution", "Downtown Chopper Checkpoint", "Ocean Beach Chopper Checkpoint", "Vice Point Chopper Checkpoint",
+			"Little Haiti Chopper Checkpoint", "Trial by Dirt", "Test Track", "PCJ Playground", "Cone Crazy",
+			"PIZZA BOY", "RC Raider Pickup", "RC Bandit Race", "RC Baron Race", "Checkpoint Charlie"
+		};
+
+		missionEntry = DebugMenuAddVar("Game", "Select mission", &nextMissionToSwitch, nil, 1, 0, ARRAY_SIZE(missions) - 1, missions);
+		DebugMenuEntrySetWrap(missionEntry, true);
+		DebugMenuAddCmd("Game", "Start selected mission ", SwitchToMission);
+#endif
+		extern bool PrintDebugCode;
+		extern int16 DebugCamMode;
+		DebugMenuAddVarBool8("Cam", "Use mouse Cam", &CCamera::m_bUseMouse3rdPerson, nil);
+#ifdef FREE_CAM
+		DebugMenuAddVarBool8("Cam", "Free Cam", &CCamera::bFreeCam, nil);
+#endif
+		DebugMenuAddVarBool8("Cam", "Print Debug Code", &PrintDebugCode, nil);
+		DebugMenuAddVar("Cam", "Cam Mode", &DebugCamMode, nil, 1, 0, CCam::MODE_EDITOR, nil);
+		DebugMenuAddCmd("Cam", "Normal", []() { DebugCamMode = 0; });
+		DebugMenuAddCmd("Cam", "Reset Statics", ResetCamStatics);
+
+		CTweakVars::AddDBG("Debug");
+	}
+}
+#endif
+
+#ifndef __MWERKS__
+#ifndef MASTER
+const int   re3_buffsize = 1024;
+static char re3_buff[re3_buffsize];
+#endif
+
+#ifndef MASTER
+void re3_assert(const char *expr, const char *filename, unsigned int lineno, const char *func)
+{
+#ifdef _WIN32
+	int nCode;
+
+	strcpy_s(re3_buff, re3_buffsize, "Assertion failed!" );
+	strcat_s(re3_buff, re3_buffsize, "\n" );	
+	
+	strcat_s(re3_buff, re3_buffsize, "File: ");
+	strcat_s(re3_buff, re3_buffsize, filename );
+	strcat_s(re3_buff, re3_buffsize, "\n" );	
+
+	strcat_s(re3_buff, re3_buffsize, "Line: " );
+	_itoa_s( lineno, re3_buff + strlen(re3_buff), re3_buffsize - strlen(re3_buff), 10 );
+	strcat_s(re3_buff, re3_buffsize, "\n");
+	
+	strcat_s(re3_buff, re3_buffsize, "Function: ");
+	strcat_s(re3_buff, re3_buffsize, func );
+	strcat_s(re3_buff, re3_buffsize, "\n" );	
+	
+	strcat_s(re3_buff, re3_buffsize, "Expression: ");
+	strcat_s(re3_buff, re3_buffsize, expr);
+	strcat_s(re3_buff, re3_buffsize, "\n");
+
+	strcat_s(re3_buff, re3_buffsize, "\n" );
+	strcat_s(re3_buff, re3_buffsize, "(Press Retry to debug the application)");
+
+
+	nCode = ::MessageBoxA(nil, re3_buff, "REVC Assertion Failed!",
+		MB_ABORTRETRYIGNORE|MB_ICONHAND|MB_SETFOREGROUND|MB_TASKMODAL);
+
+	if (nCode == IDABORT)
+	{
+		raise(SIGABRT);
+		_exit(3);
+	}
+
+	if (nCode == IDRETRY)
+	{
+		__debugbreak();
+		return;
+	}
+
+	if (nCode == IDIGNORE)
+		return;
+
+	abort();
+#else
+	// TODO
+	printf("\nREVC ASSERT FAILED\n\tFile: %s\n\tLine: %d\n\tFunction: %s\n\tExpression: %s\n",filename,lineno,func,expr);
+	assert(false);
+#endif
+}
+#endif
+
+void re3_debug(const char *format, ...)
+{
+#ifndef MASTER
+	va_list va;
+	va_start(va, format);
+#ifdef _WIN32
+	vsprintf_s(re3_buff, re3_buffsize, format, va);
+#else
+	vsprintf(re3_buff, format, va);
+#endif
+	va_end(va);
+
+	printf("%s", re3_buff);
+	CDebug::DebugAddText(re3_buff);
+#endif
+}
+
+#ifndef MASTER
+void re3_trace(const char *filename, unsigned int lineno, const char *func, const char *format, ...)
+{
+	char buff[re3_buffsize *2];
+	va_list va;
+	va_start(va, format);
+#ifdef _WIN32
+	vsprintf_s(re3_buff, re3_buffsize, format, va);
+	va_end(va);
+	
+	sprintf_s(buff, re3_buffsize * 2, "[%s.%s:%d]: %s", filename, func, lineno, re3_buff);
+#else
+	vsprintf(re3_buff, format, va);
+	va_end(va);
+	
+	sprintf(buff, "[%s.%s:%d]: %s", filename, func, lineno, re3_buff);
+#endif
+
+	OutputDebugString(buff);
+}
+
+void re3_usererror(const char *format, ...)
+{
+	va_list va;
+	va_start(va, format);
+#ifdef _WIN32
+	vsprintf_s(re3_buff, re3_buffsize, format, va);
+	va_end(va);
+	
+	::MessageBoxA(nil, re3_buff, "REVC Error!",
+		MB_OK|MB_ICONHAND|MB_SETFOREGROUND|MB_TASKMODAL);
+
+	raise(SIGABRT);
+	_exit(3);
+#else
+	vsprintf(re3_buff, format, va);
+	printf("\nREVC Error!\n\t%s\n",re3_buff);
+	assert(false);
+#endif
+}
+#endif
+#endif
+
+#ifdef VALIDATE_SAVE_SIZE
+int32 _saveBufCount;
+#endif
diff --git a/src/core/templates.h b/src/core/templates.h
new file mode 100644
index 0000000..7bc85ee
--- /dev/null
+++ b/src/core/templates.h
@@ -0,0 +1,270 @@
+#pragma once
+
+template<typename T, int32 n>
+class CStore
+{
+public:
+	int32 allocPtr;
+	T store[n];
+
+	T *Alloc(void){
+		if(allocPtr >= n){
+			printf("Size of this thing:%d needs increasing\n", n);
+			assert(0);
+		}
+		return &store[allocPtr++];
+	}
+	void Clear(void){
+		allocPtr = 0;
+	}
+	int32 GetIndex(T *item){
+		assert(item >= &store[0]);
+		assert(item < &store[n]);
+		return item - store;
+	}
+	T *GetItem(int32 index){
+		assert(index >= 0);
+		assert(index < n);
+		return &store[index];
+	}
+};
+
+#define POOLFLAG_ID     0x7f
+#define POOLFLAG_ISFREE 0x80
+
+template<typename T, typename U = T>
+class CPool
+{
+	U     *m_entries;
+	uint8 *m_flags;
+	int32  m_size;
+	int32  m_allocPtr;
+
+public:
+	CPool(int32 size, const char *name){
+		m_entries = (U*)new uint8[sizeof(U)*size];
+		m_flags = new uint8[size];
+		m_size = size;
+		m_allocPtr = -1;
+		for(int i = 0; i < size; i++){
+			SetId(i, 0);
+			SetIsFree(i, true);
+		}
+	}
+
+	int GetId(int i) const
+	{
+		return m_flags[i] & POOLFLAG_ID;
+	}
+
+	bool GetIsFree(int i) const
+	{
+		return !!(m_flags[i] & POOLFLAG_ISFREE);
+	}
+
+	void SetId(int i, int id)
+	{
+		m_flags[i] = (m_flags[i] & POOLFLAG_ISFREE) | (id & POOLFLAG_ID);
+	}
+
+	void SetIsFree(int i, bool isFree)
+	{
+		if (isFree)
+			m_flags[i] |= POOLFLAG_ISFREE;
+		else
+			m_flags[i] &= ~POOLFLAG_ISFREE;
+	}
+	~CPool() {
+		Flush();
+	}
+	void Flush() {
+		if (m_size > 0) {
+			delete[] (uint8*)m_entries;
+			delete[] m_flags;
+			m_entries = nil;
+			m_flags = nil;
+			m_size = 0;
+			m_allocPtr = 0;
+		}
+	}
+	int32 GetSize(void) const { return m_size; }
+	T *New(void){
+		bool wrapped = false;
+		do
+#ifdef FIX_BUGS
+			if (++m_allocPtr >= m_size) {
+				m_allocPtr = 0;
+				if (wrapped)
+					return nil;
+				wrapped = true;
+			}
+#else
+			if(++m_allocPtr == m_size){
+				if(wrapped)
+					return nil;
+				wrapped = true;
+				m_allocPtr = 0;
+			}
+#endif
+		while(!GetIsFree(m_allocPtr));
+		SetIsFree(m_allocPtr, false);
+		SetId(m_allocPtr, GetId(m_allocPtr)+1);
+		return (T*)&m_entries[m_allocPtr];
+	}
+	T *New(int32 handle){
+		T *entry = (T*)&m_entries[handle>>8];
+		SetNotFreeAt(handle);
+		return entry;
+	}
+	void SetNotFreeAt(int32 handle){
+		int idx = handle>>8;
+		SetIsFree(idx, false);
+		SetId(idx, handle & POOLFLAG_ID);
+		for(m_allocPtr = 0; m_allocPtr < m_size; m_allocPtr++)
+			if(GetIsFree(m_allocPtr))
+				return;
+	}
+	void Delete(T *entry){
+		int i = GetJustIndex(entry);
+		SetIsFree(i, true);
+		if(i < m_allocPtr)
+			m_allocPtr = i;
+	}
+	T *GetSlot(int i){
+		return GetIsFree(i) ? nil : (T*)&m_entries[i];
+	}
+	T *GetAt(int handle){
+#ifdef FIX_BUGS
+		if (handle == -1)
+			return nil;
+#endif
+		return m_flags[handle>>8] == (handle & 0xFF) ?
+		       (T*)&m_entries[handle >> 8] : nil;
+	}
+	int32 GetIndex(T* entry) {
+		int i = GetJustIndex_NoFreeAssert(entry);
+		return m_flags[i] + (i<<8);
+	}
+	int32 GetJustIndex(T* entry) {
+		int index = GetJustIndex_NoFreeAssert(entry);
+		assert((U*)entry == (U*)&m_entries[index]); // cast is unsafe - check required
+		assert(!GetIsFree(index));
+		return index;
+	}
+	int32 GetJustIndex_NoFreeAssert(T* entry) {
+		int index = ((U*)entry - m_entries);
+		// Please don't add unsafe assert here, because at least one func. use this to check if entity is ped or vehicle.
+		return index;
+	}
+	int32 GetNoOfUsedSpaces(void) const {
+		int i;
+		int n = 0;
+		for(i = 0; i < m_size; i++)
+			if(!GetIsFree(i))
+				n++;
+		return n;
+	}
+	void ClearStorage(uint8 *&flags, U *&entries){
+		delete[] flags;
+		delete[] (uint8*)entries;
+		flags = nil;
+		entries = nil;
+	}
+	uint32 GetMaxEntrySize() const { return sizeof(U); }
+	void CopyBack(uint8 *&flags, U *&entries){
+		memcpy(m_flags, flags, sizeof(uint8)*m_size);
+		memcpy(m_entries, entries, sizeof(U)*m_size);
+		debug("Size copied:%d (%d)\n", sizeof(U)*m_size, m_size);
+		m_allocPtr = 0;
+		ClearStorage(flags, entries);
+		debug("CopyBack:%d (/%d)\n", GetNoOfUsedSpaces(), m_size); /* Assumed inlining */
+	}
+	void Store(uint8 *&flags, U *&entries){
+		flags = (uint8*)new uint8[sizeof(uint8)*m_size];
+		entries = (U*)new uint8[sizeof(U)*m_size];
+		memcpy(flags, m_flags, sizeof(uint8)*m_size);
+		memcpy(entries, m_entries, sizeof(U)*m_size);
+		debug("Stored:%d (/%d)\n", GetNoOfUsedSpaces(), m_size); /* Assumed inlining */
+	}
+	int32 GetNoOfFreeSpaces() const { return GetSize() - GetNoOfUsedSpaces(); }
+};
+
+template<typename T>
+class CLink
+{
+public:
+	T item;
+	CLink<T> *prev;
+	CLink<T> *next;
+
+	void Insert(CLink<T> *link){
+		link->next = this->next;
+		this->next->prev = link;
+		link->prev = this;
+		this->next = link;
+	}
+	void Remove(void){
+		this->prev->next = this->next;
+		this->next->prev = this->prev;
+	}
+};
+
+template<typename T>
+class CLinkList
+{
+public:
+	CLink<T> head, tail;
+	CLink<T> freeHead, freeTail;
+	CLink<T> *links;
+
+	void Init(int n){
+		links = new CLink<T>[n];
+		head.next = &tail;
+		tail.prev = &head;
+		freeHead.next = &freeTail;
+		freeTail.prev = &freeHead;
+		while(n--)
+			freeHead.Insert(&links[n]);
+	}
+	void Shutdown(void){
+		delete[] links;
+		links = nil;
+	}
+	void Clear(void){
+		while(head.next != &tail)
+			Remove(head.next);
+	}
+	CLink<T> *Insert(T const &item){
+		CLink<T> *node = freeHead.next;
+		if(node == &freeTail)
+			return nil;
+		node->item = item;
+		node->Remove();		// remove from free list
+		head.Insert(node);
+		return node;
+	}
+	CLink<T> *InsertSorted(T const &item){
+		CLink<T> *sort;
+		for(sort = head.next; sort != &tail; sort = sort->next)
+			if(sort->item.sort >= item.sort)
+				break;
+		CLink<T> *node = freeHead.next;
+		if(node == &freeTail)
+			return nil;
+		node->item = item;
+		node->Remove();		// remove from free list
+		sort->prev->Insert(node);
+		return node;
+	}
+	void Remove(CLink<T> *link){
+		link->Remove();		// remove from list
+		freeHead.Insert(link);	// insert into free list
+	}
+	int32 Count(void){
+		int n = 0;
+		CLink<T> *lnk;
+		for(lnk = head.next; lnk != &tail; lnk = lnk->next)
+			n++;
+		return n;
+	}
+};
diff --git a/src/core/timebars.cpp b/src/core/timebars.cpp
new file mode 100644
index 0000000..169fef8
--- /dev/null
+++ b/src/core/timebars.cpp
@@ -0,0 +1,121 @@
+#include "common.h"
+#ifndef MASTER
+#include "Font.h"
+#include "Frontend.h"
+#include "Timer.h"
+#include "Text.h"
+
+#define MAX_TIMERS (50)
+#define MAX_MS_COLLECTED (40)
+
+// enables frame time output
+#define FRAMETIME
+
+struct sTimeBar
+{
+	char name[20];
+	float startTime;
+	float endTime;
+	int32 unk;
+};
+
+struct
+{
+	sTimeBar Timers[MAX_TIMERS];
+	uint32 count;
+} TimerBar;
+float MaxTimes[MAX_TIMERS];
+float MaxFrameTime;
+
+uint32 curMS;
+uint32 msCollected[MAX_MS_COLLECTED];
+#ifdef FRAMETIME
+float FrameInitTime;
+#endif
+
+void tbInit()
+{
+	TimerBar.count = 0;
+	uint32 i = CTimer::GetFrameCounter() & 0x7F;
+	if (i == 0) {
+		do
+			MaxTimes[i++] = 0.0f;
+		while (i != MAX_TIMERS);
+#ifdef FRAMETIME
+		MaxFrameTime = 0.0f;
+#endif
+	}
+#ifdef FRAMETIME
+	FrameInitTime = (float)CTimer::GetCurrentTimeInCycles() / (float)CTimer::GetCyclesPerFrame();
+#endif
+}
+
+void tbStartTimer(int32 unk, Const char *name)
+{
+	strcpy(TimerBar.Timers[TimerBar.count].name, name);
+	TimerBar.Timers[TimerBar.count].unk = unk;
+	TimerBar.Timers[TimerBar.count].startTime = (float)CTimer::GetCurrentTimeInCycles() / (float)CTimer::GetCyclesPerFrame();
+	TimerBar.count++;
+}
+
+void tbEndTimer(Const char* name)
+{
+	uint32 n = 1500;
+	for (uint32 i = 0; i < TimerBar.count; i++) {
+		if (strcmp(name, TimerBar.Timers[i].name) == 0)
+			n = i;
+	}
+	assert(n != 1500);
+	TimerBar.Timers[n].endTime = (float)CTimer::GetCurrentTimeInCycles() / (float)CTimer::GetCyclesPerFrame();
+}
+
+float Diag_GetFPS()
+{
+	return 39000.0f / (msCollected[(curMS - 1) % MAX_MS_COLLECTED] - msCollected[curMS % MAX_MS_COLLECTED]);
+}
+
+void tbDisplay()
+{
+	char temp[200];
+	wchar wtemp[200];
+
+#ifdef FRAMETIME
+	float FrameEndTime = (float)CTimer::GetCurrentTimeInCycles() / (float)CTimer::GetCyclesPerFrame();
+#endif
+
+	msCollected[(curMS++) % MAX_MS_COLLECTED] = RsTimer();
+	CFont::SetBackgroundOff();
+	CFont::SetBackgroundColor(CRGBA(0, 0, 0, 128));
+	CFont::SetScale(0.48f, 1.12f);
+	CFont::SetCentreOff();
+	CFont::SetJustifyOff();
+	CFont::SetWrapx(SCREEN_STRETCH_X(DEFAULT_SCREEN_WIDTH));
+	CFont::SetRightJustifyOff();
+	CFont::SetPropOn();
+	CFont::SetFontStyle(FONT_STANDARD);
+	sprintf(temp, "FPS: %.2f", Diag_GetFPS());
+	AsciiToUnicode(temp, wtemp);
+	CFont::SetColor(CRGBA(255, 255, 255, 255));
+	if (!CMenuManager::m_PrefsMarketing || !CMenuManager::m_PrefsDisableTutorials) {
+		CFont::PrintString(RsGlobal.maximumWidth * (4.0f / DEFAULT_SCREEN_WIDTH), RsGlobal.maximumHeight * (4.0f / DEFAULT_SCREEN_HEIGHT), wtemp);
+
+#ifndef FINAL
+		// Timers output (my own implementation)
+		for (uint32 i = 0; i < TimerBar.count; i++) {
+			MaxTimes[i] = Max(MaxTimes[i], TimerBar.Timers[i].endTime - TimerBar.Timers[i].startTime);
+			sprintf(temp, "%s: %.2f", &TimerBar.Timers[i].name[0], MaxTimes[i]);
+			AsciiToUnicode(temp, wtemp);
+			CFont::PrintString(RsGlobal.maximumWidth * (4.0f / DEFAULT_SCREEN_WIDTH), RsGlobal.maximumHeight * ((8.0f * (i + 2)) / DEFAULT_SCREEN_HEIGHT), wtemp);
+		}
+
+#ifdef FRAMETIME
+		MaxFrameTime = Max(MaxFrameTime, FrameEndTime - FrameInitTime);
+		sprintf(temp, "Frame Time: %.2f", MaxFrameTime);
+		AsciiToUnicode(temp, wtemp);
+
+		CFont::PrintString(RsGlobal.maximumWidth * (4.0f / DEFAULT_SCREEN_WIDTH), RsGlobal.maximumHeight * ((8.0f * (TimerBar.count + 4)) / DEFAULT_SCREEN_HEIGHT), wtemp);
+#endif // FRAMETIME
+#endif // !FINAL
+	}
+}
+#endif // !MASTER
\ No newline at end of file
diff --git a/src/core/timebars.h b/src/core/timebars.h
new file mode 100644
index 0000000..c493980
--- /dev/null
+++ b/src/core/timebars.h
@@ -0,0 +1,13 @@
+#pragma once
+
+#ifdef TIMEBARS
+void tbInit();
+void tbStartTimer(int32, Const char*);
+void tbEndTimer(Const char*);
+void tbDisplay();
+#else
+#define tbInit()
+#define tbStartTimer(a, b)
+#define tbEndTimer(a)
+#define tbDisplay()
+#endif