Merge branch 'master' into ps2menu

src/core/AnimViewer.cpp

@@ -47,6 +47,12 @@ CAnimViewer::Render(void) {
 	if (pTarget) {
 //		pTarget->GetPosition() = CVector(0.0f, 0.0f, 0.0f);
 		if (pTarget) {
+#ifdef FIX_BUGS
+#ifdef PED_SKIN
+			if(pTarget->IsPed())
+				((CPed*)pTarget)->UpdateRpHAnim();
+#endif
+#endif
 			pTarget->Render();
 			CRenderer::RenderOneNonRoad(pTarget);
 		}
@@ -67,11 +73,7 @@ CAnimViewer::Initialise(void) {
 	CReferences::Init();
 	TheCamera.Init();
 	TheCamera.SetRwCamera(Scene.camera);
-
-	// I didn't get which camera og code selects.
-	for (int i = 0; i < 3; i++) {
-		TheCamera.Cams[i].Distance = 5.0f;
-	}
+	TheCamera.Cams[TheCamera.ActiveCam].Distance = 5.0f;
 
 	gbModelViewer = true;
 	CHud::m_Wants_To_Draw_Hud = false;
@@ -146,30 +148,33 @@ int
 LastPedModelId(int modelId)
 {
 	CBaseModelInfo *model;
-	for (int i = modelId; i >= 0; i--) {
-		model = CModelInfo::GetModelInfo(i);
-		if (model->GetModelType() == MITYPE_PED)
-			return i;
+	for(;;){
+		assert(modelId < MODELINFOSIZE);
+		model = CModelInfo::GetModelInfo(modelId);
+		if (model && model->GetModelType() == MITYPE_PED)
+			break;
+		modelId--;
 	}
 	return modelId;
 }
 
 int
-LastVehicleModelId(int modelId)
+FirstCarModelId(int modelId)
 {
-	CBaseModelInfo* model;
-	for (int i = modelId; i >= 0; i--) {
-		model = CModelInfo::GetModelInfo(i);
-		if (model->GetModelType() == MITYPE_VEHICLE)
-			return i;
+	CBaseModelInfo *model;
+	for(;;){
+		assert(modelId < MODELINFOSIZE);
+		model = CModelInfo::GetModelInfo(modelId);
+		if (model && model->GetModelType() == MITYPE_VEHICLE)
+			break;
+		modelId++;
 	}
 	return modelId;
 }
 
 
-// It's me that named this.
 int
-FindMeAModelID(int modelId, int wantedChange)
+NextModelId(int modelId, int wantedChange)
 {
 	// Max. 2 trials wasn't here, it's me that added it.
 
@@ -220,7 +225,6 @@ CAnimViewer::Update(void)
 	AssocGroupId animGroup = ASSOCGRP_STD;
 	int nextModelId = modelId;
 	CBaseModelInfo *modelInfo = CModelInfo::GetModelInfo(modelId);
-	CEntity *newEntity = nil;
 
 	if (modelInfo->GetModelType() == MITYPE_PED) {
 		int animGroup = ((CPedModelInfo*)modelInfo)->m_animGroup;
@@ -261,40 +265,30 @@ CAnimViewer::Update(void)
 			if (modelInfo->GetModelType() == MITYPE_VEHICLE) {
 
 				CVehicleModelInfo* veh = (CVehicleModelInfo*)modelInfo;
-				if (veh->m_vehicleType != VEHICLE_TYPE_CAR) {
-					// Not ready yet
-/*					if (veh->m_vehicleType == VEHICLE_TYPE_BOAT)
-					{
-						v33 = (CBoat*)CVehicle::operator new((CVehicle*)0x488, v6);
-						CBoat::CBoat(v33, modelId, 1u);
-						newEntity = (int)v33;
-						pTarget = (int)v33;
-					}
-					else
-					{
-*/						newEntity = pTarget = new CObject(modelId, true);
-						if (!modelInfo->GetColModel()) {
-							modelInfo->SetColModel(&CTempColModels::ms_colModelWheel1);
-						}
-//					}
+				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 {
-					newEntity = pTarget = new CAutomobile(modelId, RANDOM_VEHICLE);
-					newEntity->SetStatus(STATUS_ABANDONED);
+					pTarget = new CObject(modelId, true);
+					if (!modelInfo->GetColModel()) {
+						modelInfo->SetColModel(&CTempColModels::ms_colModelWheel1);
+					}
 				}
-				newEntity->bIsStuck = true;
+				pTarget->SetStatus(STATUS_ABANDONED);
 			} else if (modelInfo->GetModelType() == MITYPE_PED) {
-				pTarget = newEntity = new CPed(PEDTYPE_CIVMALE);
-				newEntity->SetModelIndex(modelId);
+				pTarget = new CPed(PEDTYPE_CIVMALE);
+				pTarget->SetModelIndex(modelId);
 			} else {
-				newEntity = pTarget = new CObject(modelId, true);
+				pTarget = new CObject(modelId, true);
 				if (!modelInfo->GetColModel())
 				{
 					modelInfo->SetColModel(&CTempColModels::ms_colModelWheel1);
 				}
-				newEntity->bIsStuck = true;
+				pTarget->SetStatus(STATUS_ABANDONED);
 			}
-			newEntity->SetPosition(0.0f, 0.0f, 0.0f);
-			CWorld::Add(newEntity);
+			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()) {
@@ -302,43 +296,26 @@ CAnimViewer::Update(void)
 		}
 		pTarget->GetMatrix().GetPosition().z = 0.0f;
 
-		if (modelInfo->GetModelType() != MITYPE_PED) {
-
-			if (modelInfo->GetModelType() == MITYPE_VEHICLE) {
-
-				if (pad->NewState.LeftShoulder1 && !pad->OldState.LeftShoulder1) {
-					nextModelId = LastPedModelId(modelId);
-					AsciiToUnicode("Switched to peds", gUString);
-					CMessages::AddMessage(gUString, 1000, 0);
-				} else {
-					// Start in mobile
-					if (pad->NewState.Square && !pad->OldState.Square) {
-						CVehicleModelInfo::LoadVehicleColours();
-						AsciiToUnicode("Carcols.dat reloaded", gUString);
-						CMessages::AddMessage(gUString, 1000, 0);
-					}
-				}
-			}
-		} else {
+		if (modelInfo->GetModelType() == MITYPE_PED) {
 			((CPed*)pTarget)->bKindaStayInSamePlace = true;
 
 			// Triangle in mobile
-			if (pad->NewState.Square && !pad->OldState.Square) {
+			if (pad->GetSquareJustDown()) {
 				reloadIFP = 1;
 				AsciiToUnicode("IFP reloaded", gUString);
 				CMessages::AddMessage(gUString, 1000, 0);
 
-			} else if (pad->NewState.Cross && !pad->OldState.Cross) {
+			} else if (pad->GetCrossJustDown()) {
 				PlayAnimation(pTarget->GetClump(), animGroup, (AnimationId)animId);
 				AsciiToUnicode("Animation restarted", gUString);
 				CMessages::AddMessage(gUString, 1000, 0);
 
-			} else if (pad->NewState.Circle && !pad->OldState.Circle) {
+			} else if (pad->GetCircleJustDown()) {
 				PlayAnimation(pTarget->GetClump(), animGroup, ANIM_IDLE_STANCE);
 				AsciiToUnicode("Idle animation playing", gUString);
 				CMessages::AddMessage(gUString, 1000, 0);
 
-			} else if (pad->NewState.DPadUp && pad->OldState.DPadUp == 0) {
+			} else if (pad->GetDPadUpJustDown()) {
 				animId--;
 				if (animId < 0) {
 					animId = NUM_ANIMS - 1;
@@ -349,7 +326,7 @@ CAnimViewer::Update(void)
 				AsciiToUnicode(gString, gUString);
 				CMessages::AddMessage(gUString, 1000, 0);
 
-			} else if (pad->NewState.DPadDown && !pad->OldState.DPadDown) {
+			} else if (pad->GetDPadDownJustDown()) {
 				animId = (animId == (NUM_ANIMS - 1) ? 0 : animId + 1);
 				PlayAnimation(pTarget->GetClump(), animGroup, (AnimationId)animId);
 
@@ -357,42 +334,48 @@ CAnimViewer::Update(void)
 				AsciiToUnicode(gString, gUString);
 				CMessages::AddMessage(gUString, 1000, 0);
 
-			} else {
-				if (pad->NewState.Start && !pad->OldState.Start) {
+			} else if (pad->GetStartJustDown()) {
 
-				} else {
-					if (pad->NewState.LeftShoulder1 && !pad->OldState.LeftShoulder1) {
-						nextModelId = LastVehicleModelId(modelId);
-						AsciiToUnicode("Switched to vehicles", gUString);
-						CMessages::AddMessage(gUString, 1000, 0);
-					} else {
-						// Originally it was GetPad(1)->LeftShoulder2
-						if (pad->NewState.Triangle) {
+			} 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) {
 #ifdef PED_SKIN
-							if(IsClumpSkinned(pTarget->GetClump()))
-								((CPedModelInfo *)CModelInfo::GetModelInfo(pTarget->GetModelIndex()))->AnimatePedColModelSkinned(pTarget->GetClump());
-							else
+				if(IsClumpSkinned(pTarget->GetClump()))
+					((CPedModelInfo *)CModelInfo::GetModelInfo(pTarget->GetModelIndex()))->AnimatePedColModelSkinned(pTarget->GetClump());
+				else
 #endif
-								CPedModelInfo::AnimatePedColModel(((CPedModelInfo *)CModelInfo::GetModelInfo(pTarget->GetModelIndex()))->GetHitColModel(),
-								                                  RpClumpGetFrame(pTarget->GetClump()));
-							AsciiToUnicode("Ped Col model will be animated as long as you hold the button", gUString);
-							CMessages::AddMessage(gUString, 100, 0);
-						}
-					}
-				}
+					CPedModelInfo::AnimatePedColModel(((CPedModelInfo *)CModelInfo::GetModelInfo(pTarget->GetModelIndex()))->GetHitColModel(),
+					                                  RpClumpGetFrame(pTarget->GetClump()));
+				AsciiToUnicode("Ped Col model will be animated as long as you hold the button", gUString);
+				CMessages::AddMessage(gUString, 100, 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->NewState.DPadLeft && pad->OldState.DPadLeft == 0) {
-		nextModelId = FindMeAModelID(modelId, -1);
+	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->NewState.DPadRight && pad->OldState.DPadRight == 0) {
-		nextModelId = FindMeAModelID(modelId, 1);
+	} else if (pad->GetDPadRightJustDown()) {
+		nextModelId = NextModelId(modelId, 1);
 
 		sprintf(gString, "Current model ID: %d", nextModelId);
 		AsciiToUnicode(gString, gUString);

src/core/Camera.cpp

@@ -123,7 +123,7 @@ CCamera::Init(void)
 	Cams[0].Mode = CCam::MODE_FOLLOWPED;
 	Cams[1].Mode = CCam::MODE_FOLLOWPED;
 	unknown = 0;
-	m_bJustJumpedOutOf1stPersonBecauseOfTarget = 0;
+	m_bJustJumpedOutOf1stPersonBecauseOfTarget = false;
 	ClearPlayerWeaponMode();
 	m_bInATunnelAndABigVehicle = false;
 	m_iModeObbeCamIsInForCar = OBBE_INVALID;
@@ -141,8 +141,8 @@ CCamera::Init(void)
 	Cams[1].m_fPlayerVelocity = 0.0f;
 	Cams[2].m_fPlayerVelocity = 0.0f;
 	m_bHeadBob = false;
-	m_fFractionInterToStopMovingTarget = 0.25f;
-	m_fFractionInterToStopCatchUpTarget = 0.75f;
+	m_fFractionInterToStopMoving = 0.25f;
+	m_fFractionInterToStopCatchUp = 0.75f;
 	m_fGaitSwayBuffer = 0.85f;
 	m_bScriptParametersSetForInterPol = false;
 	m_uiCamShakeStart = 0;
@@ -249,13 +249,14 @@ void
 CCamera::Process(void)
 {
 	// static bool InterpolatorNotInitialised = true;	// unused
+	static CVector PreviousFudgedTargetCoors;	// only PS2
 	static float PlayerMinDist = 1.6f;	// not on PS2
-	static bool WasPreviouslyInterSyhonFollowPed = false;	// only written
+	static bool WasPreviouslyInterSyhonFollowPed = false;	// only used on PS2
 	float FOV = 0.0f;
 	float oldBeta, newBeta;
 	float deltaBeta = 0.0f;
 	bool lookLRBVehicle = false;
-	CVector CamFront, CamUp, CamSource, Target;
+	CVector CamFront, CamUp, CamRight, CamSource, Target;
 
 	m_bJust_Switched = false;
 	m_RealPreviousCameraPosition = GetPosition();
@@ -308,19 +309,19 @@ CCamera::Process(void)
 
 	// Stop transition when it's done
 	if(m_uiTransitionState != 0){
-/*
-		// PS2:
+#ifdef PS2_CAM_TRANSITION
 		if(!m_bWaitForInterpolToFinish){
 			Cams[(ActiveCam+1)%2].Process();
 			Cams[(ActiveCam+1)%2].ProcessSpecialHeightRoutines();
 		}
-*/
-		// not PS2 (done in CamControl there it seems)
+#else
+		// done in CamControl on PS2 it seems
 		if(CTimer::GetTimeInMilliseconds() > m_uiTransitionDuration+m_uiTimeTransitionStart){
 			m_uiTransitionState = 0;
 			m_vecDoingSpecialInterPolation = false;
 			m_bWaitForInterpolToFinish = false;
 		}
+#endif
 	}
 
 	if(m_bUseNearClipScript)
@@ -343,19 +344,165 @@ CCamera::Process(void)
 
 	if(m_uiTransitionState != 0 && !lookLRBVehicle){
 		// Process transition
-		// different on PS2
+#ifdef PS2_CAM_TRANSITION
+		bool lookingAtPlayerNow = false;
+		bool wasLookingAtPlayer = false;
+		bool transitionPedMode = false;
+		bool setWait = false;
+		if(Cams[ActiveCam].CamTargetEntity == Cams[(ActiveCam+1)%2].CamTargetEntity){
+			if(Cams[ActiveCam].Mode == CCam::MODE_SYPHON ||
+			   Cams[ActiveCam].Mode == CCam::MODE_SYPHON_CRIM_IN_FRONT ||
+			   Cams[ActiveCam].Mode == CCam::MODE_FOLLOWPED ||
+			   Cams[ActiveCam].Mode == CCam::MODE_SPECIAL_FIXED_FOR_SYPHON)
+				lookingAtPlayerNow = true;
+			if(Cams[(ActiveCam+1)%2].Mode == CCam::MODE_SYPHON ||
+			   Cams[(ActiveCam+1)%2].Mode == CCam::MODE_SYPHON_CRIM_IN_FRONT ||
+			   Cams[(ActiveCam+1)%2].Mode == CCam::MODE_FOLLOWPED ||
+			   Cams[(ActiveCam+1)%2].Mode == CCam::MODE_SPECIAL_FIXED_FOR_SYPHON)	// checked twice for some reason
+				wasLookingAtPlayer = true;
 
+			if(!m_vecDoingSpecialInterPolation &&
+			   (Cams[ActiveCam].Mode == CCam::MODE_FOLLOWPED || Cams[ActiveCam].Mode == CCam::MODE_FIGHT_CAM) &&
+			   (Cams[(ActiveCam+1)%2].Mode == CCam::MODE_FOLLOWPED || Cams[(ActiveCam+1)%2].Mode == CCam::MODE_FIGHT_CAM))
+				transitionPedMode = true;
+		}
+
+		if(lookingAtPlayerNow && wasLookingAtPlayer){
+			CVector playerDist;
+			playerDist.x = FindPlayerPed()->GetPosition().x - GetPosition().x;
+			playerDist.y = FindPlayerPed()->GetPosition().y - GetPosition().y;
+			playerDist.z = FindPlayerPed()->GetPosition().z - GetPosition().z;
+			if(playerDist.Magnitude() > 17.5f &&
+			   (Cams[ActiveCam].Mode == CCam::MODE_SYPHON || Cams[ActiveCam].Mode == CCam::MODE_SYPHON_CRIM_IN_FRONT))
+				setWait = true;
+		}
+		if(setWait)
+			m_bWaitForInterpolToFinish = true;
+
+
+		uint32 currentTime = CTimer::GetTimeInMilliseconds() - m_uiTimeTransitionStart;
+		if(currentTime >= m_uiTransitionDuration)
+			currentTime = m_uiTransitionDuration;
+		float inter = (float) currentTime / m_uiTransitionDuration;
+		inter = 0.5f - 0.5*Cos(inter*PI);	// smooth it
+
+		if(m_vecDoingSpecialInterPolation){
+			Cams[(ActiveCam+1)%2].Source = m_vecOldSourceForInter;
+			Cams[(ActiveCam+1)%2].Front = m_vecOldFrontForInter;
+			Cams[(ActiveCam+1)%2].Up = m_vecOldUpForInter;
+			Cams[(ActiveCam+1)%2].FOV = m_vecOldFOVForInter;
+			if(WasPreviouslyInterSyhonFollowPed)
+				Cams[(ActiveCam+1)%2].m_cvecTargetCoorsForFudgeInter.z = PreviousFudgedTargetCoors.z;
+		}
+
+		CamSource = inter*Cams[ActiveCam].Source + (1.0f-inter)*Cams[(ActiveCam+1)%2].Source;
+		FOV = inter*Cams[ActiveCam].FOV + (1.0f-inter)*Cams[(ActiveCam+1)%2].FOV;
+
+		CVector tmpFront = Cams[(ActiveCam+1)%2].Front;
+		float Alpha_other = CGeneral::GetATanOfXY(tmpFront.Magnitude2D(), tmpFront.z);
+		if(Alpha_other > PI) Alpha_other -= TWOPI;
+		float Beta_other = 0.0f;
+		if(tmpFront.x != 0.0f || tmpFront.y != 0.0f)
+			Beta_other = CGeneral::GetATanOfXY(-tmpFront.y, tmpFront.x);
+		tmpFront = Cams[ActiveCam].Front;
+		float Alpha_active = CGeneral::GetATanOfXY(tmpFront.Magnitude2D(), tmpFront.z);
+		if(Alpha_active > PI) Alpha_active -= TWOPI;
+		float Beta_active = 0.0f;
+		if(tmpFront.x != 0.0f || tmpFront.y != 0.0f)
+			Beta_active = CGeneral::GetATanOfXY(-tmpFront.y, tmpFront.x);
+
+		float DeltaBeta = Beta_active - Beta_other;
+		float Alpha = inter*Alpha_active + (1.0f-inter)*Alpha_other;
+
+		if(m_uiTransitionJUSTStarted){
+			while(DeltaBeta > PI) DeltaBeta -= TWOPI;
+			while(DeltaBeta <= -PI) DeltaBeta += TWOPI;
+			m_uiTransitionJUSTStarted = false;
+		}else{
+			if(DeltaBeta < m_fOldBetaDiff)
+				while(Abs(DeltaBeta - m_fOldBetaDiff) > PI) DeltaBeta += TWOPI;
+			else
+				while(Abs(DeltaBeta - m_fOldBetaDiff) > PI) DeltaBeta -= TWOPI;
+		}
+		m_fOldBetaDiff = DeltaBeta;
+		float Beta = inter*DeltaBeta + Beta_other;
+
+		CVector FudgedTargetCoors;
+		if(lookingAtPlayerNow && wasLookingAtPlayer){
+			// BUG? how is this interpolation ever used when values are overwritten below?
+			float PlayerDist = (pTargetEntity->GetPosition() - CamSource).Magnitude2D();
+			float MinDist = Min(Cams[(ActiveCam+1)%2].m_fMinDistAwayFromCamWhenInterPolating, Cams[ActiveCam].m_fMinDistAwayFromCamWhenInterPolating);
+			if(PlayerDist < MinDist){
+				CamSource.x = pTargetEntity->GetPosition().x - MinDist*Cos(Beta - HALFPI);
+				CamSource.y = pTargetEntity->GetPosition().y - MinDist*Sin(Beta - HALFPI);
+			}else{
+				CamSource.x = pTargetEntity->GetPosition().x - PlayerDist*Cos(Beta - HALFPI);
+				CamSource.y = pTargetEntity->GetPosition().y - PlayerDist*Sin(Beta - HALFPI);
+			}
+
+			CColPoint colpoint;
+			CEntity *entity = nil;
+			if(CWorld::ProcessLineOfSight(pTargetEntity->GetPosition(), CamSource, colpoint, entity, true, false, false, true, false, true, true)){
+				CamSource = colpoint.point;
+				RwCameraSetNearClipPlane(Scene.camera, 0.05f);
+			}
+
+			CamFront = pTargetEntity->GetPosition() - CamSource;
+			FudgedTargetCoors = inter*Cams[ActiveCam].m_cvecTargetCoorsForFudgeInter + (1.0f-inter)*Cams[(ActiveCam+1)%2].m_cvecTargetCoorsForFudgeInter;
+			PreviousFudgedTargetCoors = FudgedTargetCoors;
+			CamFront.Normalise();
+			CamUp = CVector(0.0f, 0.0f, 1.0f);
+			CamRight = CrossProduct(CamFront, CamUp);
+			CamRight.Normalise();
+			CamUp = CrossProduct(CamRight, CamFront);
+
+			WasPreviouslyInterSyhonFollowPed = true;
+		}else
+			WasPreviouslyInterSyhonFollowPed = false;
+
+		if(transitionPedMode){
+			FudgedTargetCoors = inter*Cams[ActiveCam].m_cvecTargetCoorsForFudgeInter + (1.0f-inter)*Cams[(ActiveCam+1)%2].m_cvecTargetCoorsForFudgeInter;
+			PreviousFudgedTargetCoors = FudgedTargetCoors;
+			CVector CamToTarget = pTargetEntity->GetPosition() - CamSource;
+			float tmpBeta = CGeneral::GetATanOfXY(CamToTarget.x, CamToTarget.y);
+			float PlayerDist = (pTargetEntity->GetPosition() - CamSource).Magnitude2D();
+			float MinDist = Min(Cams[(ActiveCam+1)%2].m_fMinDistAwayFromCamWhenInterPolating, Cams[ActiveCam].m_fMinDistAwayFromCamWhenInterPolating);
+			if(PlayerDist < MinDist){
+				CamSource.x = pTargetEntity->GetPosition().x - MinDist*Cos(tmpBeta - HALFPI);
+				CamSource.y = pTargetEntity->GetPosition().y - MinDist*Sin(tmpBeta - HALFPI);
+			}
+			CamFront = FudgedTargetCoors - CamSource;
+			CamFront.Normalise();
+			CamUp = CVector(0.0f, 0.0f, 1.0f);
+			CamUp.Normalise();
+			CamRight = CrossProduct(CamFront, CamUp);
+			CamRight.Normalise();
+			CamUp = CrossProduct(CamRight, CamFront);
+			CamUp.Normalise();
+		}else{
+			CamFront.x = Cos(Alpha) * Sin(Beta);
+			CamFront.y = Cos(Alpha) * -Cos(Beta);
+			CamFront.z = Sin(Alpha);
+			CamFront.Normalise();
+			CamUp = inter*Cams[ActiveCam].Up + (1.0f-inter)*Cams[(ActiveCam+1)%2].Up;
+			CamUp.Normalise();
+			CamRight = CrossProduct(CamFront, CamUp);
+			CamRight.Normalise();
+			CamUp = CrossProduct(CamRight, CamFront);
+			CamUp.Normalise();
+		}
+#else
 		uint32 currentTime = CTimer::GetTimeInMilliseconds() - m_uiTimeTransitionStart;
 		if(currentTime >= m_uiTransitionDuration)
 			currentTime = m_uiTransitionDuration;
 		float fractionInter = (float) currentTime / m_uiTransitionDuration;
 
-		if(fractionInter <= m_fFractionInterToStopMovingTarget){
+		if(fractionInter <= m_fFractionInterToStopMoving){
 			float inter;
-			if(m_fFractionInterToStopMovingTarget == 0.0f)
+			if(m_fFractionInterToStopMoving == 0.0f)
 				inter = 0.0f;
 			else
-				inter = (m_fFractionInterToStopMovingTarget - fractionInter)/m_fFractionInterToStopMovingTarget;
+				inter = (m_fFractionInterToStopMoving - fractionInter)/m_fFractionInterToStopMoving;
 			inter = 0.5f - 0.5*Cos(inter*PI);	// smooth it
 
 			m_vecSourceWhenInterPol = m_cvecStartingSourceForInterPol + inter*m_cvecSourceSpeedAtStartInter;
@@ -399,22 +546,24 @@ CCamera::Process(void)
 
 			if(Cams[ActiveCam].Mode == CCam::MODE_TOPDOWN || Cams[ActiveCam].Mode == CCam::MODE_TOP_DOWN_PED){
 				CamFront.Normalise();
-				CamUp = CrossProduct(CamFront, CVector(-1.0f, 0.0f, 0.0f));
+				CamRight = CVector(-1.0f, 0.0f, 0.0f);
+				CamUp = CrossProduct(CamFront, CamRight);
+				CamUp.Normalise();
 			}else{
 				CamFront.Normalise();
 				CamUp.Normalise();
-				CVector right = CrossProduct(CamFront, CamUp);
-				right.Normalise();
-				CamUp = CrossProduct(right, CamFront);
+				CamRight = CrossProduct(CamFront, CamUp);
+				CamRight.Normalise();
+				CamUp = CrossProduct(CamRight, CamFront);
+				CamUp.Normalise();
 			}
-			CamUp.Normalise();
 			FOV = m_fFOVWhenInterPol;
-		}else if(fractionInter > m_fFractionInterToStopMovingTarget && fractionInter <= 1.0f){
+		}else if(fractionInter > m_fFractionInterToStopMoving && fractionInter <= 1.0f){
 			float inter;
-			if(m_fFractionInterToStopCatchUpTarget == 0.0f)
+			if(m_fFractionInterToStopCatchUp == 0.0f)
 				inter = 0.0f;
 			else
-				inter = (fractionInter - m_fFractionInterToStopMovingTarget)/m_fFractionInterToStopCatchUpTarget;
+				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);
@@ -454,15 +603,17 @@ CCamera::Process(void)
 
 			if(Cams[ActiveCam].Mode == CCam::MODE_TOPDOWN || Cams[ActiveCam].Mode == CCam::MODE_TOP_DOWN_PED){
 				CamFront.Normalise();
-				CamUp = CrossProduct(CamFront, CVector(-1.0f, 0.0f, 0.0f));
+				CamRight = CVector(-1.0f, 0.0f, 0.0f);
+				CamUp = CrossProduct(CamFront, CamRight);
+				CamUp.Normalise();
 			}else{
 				CamFront.Normalise();
 				CamUp.Normalise();
-				CVector right = CrossProduct(CamFront, CamUp);
-				right.Normalise();
-				CamUp = CrossProduct(right, CamFront);
+				CamRight = CrossProduct(CamFront, CamUp);
+				CamRight.Normalise();
+				CamUp = CrossProduct(CamRight, CamFront);
+				CamUp.Normalise();
 			}
-			CamUp.Normalise();
 #ifndef FIX_BUGS
 			// BUG: FOV was already interpolated but m_fFOVWhenInterPol was not
 			FOV = m_fFOVWhenInterPol;
@@ -474,6 +625,7 @@ CCamera::Process(void)
 		float Alpha = CGeneral::GetATanOfXY(DistOnGround, Dist.z);
 		float Beta = CGeneral::GetATanOfXY(Dist.x, Dist.y);
 		Cams[ActiveCam].KeepTrackOfTheSpeed(CamSource, Target, CamUp, Alpha, Beta, FOV);
+#endif
 	}else{
 		// No transition, take Cam values directly
 		if(WorldViewerBeingUsed){
@@ -487,7 +639,7 @@ CCamera::Process(void)
 			CamUp = Cams[ActiveCam].Up;
 			FOV = Cams[ActiveCam].FOV;
 		}
-		WasPreviouslyInterSyhonFollowPed = false;	// unused
+		WasPreviouslyInterSyhonFollowPed = false;	// only used on PS2
 	}
 
 	if(m_uiTransitionState != 0)
@@ -567,8 +719,10 @@ CCamera::Process(void)
 		LODDistMultiplier = 70.0f/CDraw::GetFOV() * CDraw::GetAspectRatio()/(4.0f/3.0f);
 	else
 		LODDistMultiplier = 1.0f;
+	// missing on PS2
 	GenerationDistMultiplier = LODDistMultiplier;
 	LODDistMultiplier *= CRenderer::ms_lodDistScale;
+	//
 
 	// Keep track of speed
 	if(m_bJustInitalised || m_bJust_Switched){
@@ -584,7 +738,7 @@ CCamera::Process(void)
 	}
 	m_PreviousCameraPosition = GetPosition();
 
-	// PS2: something doing on with forward vector here
+	// PS2 normalizes a CVector2D GetForward() here. is it used anywhere?
 
 	if(Cams[ActiveCam].DirectionWasLooking != LOOKING_FORWARD && Cams[ActiveCam].Mode != CCam::MODE_TOP_DOWN_PED){
 		Cams[ActiveCam].Source = Cams[ActiveCam].SourceBeforeLookBehind;
@@ -630,6 +784,16 @@ CCamera::CamControl(void)
 	if(Cams[ActiveCam].CamTargetEntity == nil && pTargetEntity == nil)
 		pTargetEntity = PLAYER;
 
+#ifdef PS2_CAM_TRANSITION
+	// 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;
+		}
+#endif
+
 	m_iZoneCullFrameNumWereAt++;
 	if(m_iZoneCullFrameNumWereAt > m_iCheckCullZoneThisNumFrames)
 		m_iZoneCullFrameNumWereAt = 1;
@@ -638,7 +802,7 @@ CCamera::CamControl(void)
 		m_bFailedCullZoneTestPreviously = CCullZones::CamCloseInForPlayer();
 
 	if(m_bLookingAtPlayer){
-		CPad::GetPad(0)->DisablePlayerControls &= ~PLAYERCONTROL_DISABLED_1;
+		CPad::GetPad(0)->SetEnablePlayerControls(PLAYERCONTROL_CAMERA);
 		FindPlayerPed()->bIsVisible = true;
 	}
 
@@ -906,7 +1070,7 @@ CCamera::CamControl(void)
 				m_bFirstPersonBeingUsed = false;
 			if(m_bFirstPersonBeingUsed){
 				ReqMode = CCam::MODE_1STPERSON;
-				CPad::GetPad(0)->DisablePlayerControls |= PLAYERCONTROL_DISABLED_1;
+				CPad::GetPad(0)->SetDisablePlayerControls(PLAYERCONTROL_CAMERA);
 			}
 
 			// Zoom value
@@ -1015,7 +1179,7 @@ CCamera::CamControl(void)
 								garageCenter.y = (az->miny + az->maxy)/2.0f;
 								garageCenter.z = 0.0f;
 							}else
-								garageCenter = pTargetEntity->GetPosition();
+								garageCenter = CVector(pTargetEntity->GetPosition().x, pTargetEntity->GetPosition().y, 0.0f);
 						}
 						if(whichDoor == 1)
 							garageCenterToDoor = garageDoorPos1 - garageCenter;
@@ -1223,6 +1387,7 @@ CCamera::CamControl(void)
 
 	// Restore with a jump cut
 	if(m_bRestoreByJumpCut){
+		// PS2 just sets m_bCamDirectlyBehind here
 		if(ReqMode != CCam::MODE_FOLLOWPED &&
 		   ReqMode != CCam::MODE_M16_1STPERSON &&
 		   ReqMode != CCam::MODE_SNIPER &&
@@ -1238,6 +1403,7 @@ CCamera::CamControl(void)
 		Cams[ActiveCam].CamTargetEntity = pTargetEntity;
 		Cams[ActiveCam].m_cvecCamFixedModeSource = m_vecFixedModeSource;
 		Cams[ActiveCam].m_cvecCamFixedModeUpOffSet = m_vecFixedModeUpOffSet;
+		// PS2 sets this to m_bLookingAtVector
 		Cams[ActiveCam].m_bCamLookingAtVector = false;
 		Cams[ActiveCam].m_vecLastAboveWaterCamPosition = Cams[(ActiveCam+1)%2].m_vecLastAboveWaterCamPosition;
 		m_bRestoreByJumpCut = false;
@@ -1376,7 +1542,7 @@ CCamera::CamControl(void)
 					switchByJumpCut = true;
 					if(Cams[ActiveCam].Mode == CCam::MODE_TOP_DOWN_PED){
 						CVector front = Cams[ActiveCam].Source - FindPlayerPed()->GetPosition();
-						front.z = 0.0f;
+						front.z = 0.0f;	// missing on PS2
 						front.Normalise();
 #ifdef FIX_BUGS
 						// this is almost as bad as the bugged code
@@ -1413,6 +1579,7 @@ CCamera::CamControl(void)
 
 		if((m_uiTransitionState == 0 || switchByJumpCut) && ReqMode != Cams[ActiveCam].Mode){
 			if(switchByJumpCut){
+				// PS2 just sets m_bCamDirectlyBehind here
 				if(!m_bPlayerIsInGarage || m_bJustCameOutOfGarage){
 					if(ReqMode != CCam::MODE_FOLLOWPED &&
 					   ReqMode != CCam::MODE_M16_1STPERSON &&
@@ -1451,6 +1618,8 @@ CCamera::CamControl(void)
 			if(ReqMode == CCam::MODE_FOLLOWPED && Cams[ActiveCam].Mode == CCam::MODE_FIGHT_CAM)
 				startTransition = false;
 
+#ifndef PS2_CAM_TRANSITION
+			// done in Process on PS2
 			if(!m_bWaitForInterpolToFinish && m_bLookingAtPlayer && m_uiTransitionState != 0){
 				CVector playerDist;
 				playerDist.x = FindPlayerPed()->GetPosition().x - GetPosition().x;
@@ -1463,6 +1632,7 @@ CCamera::CamControl(void)
 						m_bWaitForInterpolToFinish = true;
 				}
 			}
+#endif
 			if(m_bWaitForInterpolToFinish)
 				startTransition = false;
 
@@ -1472,10 +1642,14 @@ CCamera::CamControl(void)
 				Cams[ActiveCam].CamTargetEntity->RegisterReference(&Cams[ActiveCam].CamTargetEntity);
 			}
 		}else if(ReqMode == CCam::MODE_FIXED && pTargetEntity != Cams[ActiveCam].CamTargetEntity && m_bPlayerIsInGarage){
+#ifdef PS2_CAM_TRANSITION
+			StartTransitionWhenNotFinishedInter(ReqMode);
+#else
 			if(m_uiTransitionState != 0)
 				StartTransitionWhenNotFinishedInter(ReqMode);
 			else
 				StartTransition(ReqMode);
+#endif
 			pTargetEntity->RegisterReference(&pTargetEntity);
 			Cams[ActiveCam].CamTargetEntity->RegisterReference(&Cams[ActiveCam].CamTargetEntity);
 		}
@@ -1599,7 +1773,7 @@ CCamera::UpdateTargetEntity(void)
 			pTargetEntity = FindPlayerPed();
 		if(PLAYER->GetPedState() == PED_DRAG_FROM_CAR)
 			pTargetEntity = FindPlayerPed();
-		if(pTargetEntity->IsVehicle() && CarZoomIndicator != CAM_ZOOM_1STPRS && FindPlayerPed()->GetPedState() == PED_ARRESTED)
+		if(pTargetEntity->IsVehicle() && CarZoomIndicator == CAM_ZOOM_1STPRS && FindPlayerPed()->GetPedState() == PED_ARRESTED)
 			pTargetEntity = FindPlayerPed();
 	}
 }
@@ -1861,26 +2035,25 @@ CCamera::SetCamPositionForFixedMode(const CVector &Source, const CVector &UpOffS
 
 
 /*
- * On PS2 the transition happens between Cams[1] and Cams[2].
+ * On PS2 the transition happens between Cams[0] and Cams[1].
  * On PC the whole system has been changed.
  */
 void
 CCamera::StartTransition(int16 newMode)
 {
-	bool foo = false;
 	bool switchSyphonMode = false;
 	bool switchPedToCar = false;
-	bool switchPedMode = false;
+	bool switchFromFight = false;
 	bool switchFromFixed = false;
 	bool switch1stPersonToVehicle = false;
 	float betaOffset, targetBeta, camBeta, deltaBeta;
 	int door;
 	bool vehicleVertical;
 
-// missing on PS2
+#ifndef PS2_CAM_TRANSITION
 	m_bItsOkToLookJustAtThePlayer = false;
-	m_fFractionInterToStopMovingTarget = 0.25f;
-	m_fFractionInterToStopCatchUpTarget = 0.75f;
+	m_fFractionInterToStopMoving = 0.25f;
+	m_fFractionInterToStopCatchUp = 0.75f;
 
 	if(Cams[ActiveCam].Mode == CCam::MODE_SYPHON_CRIM_IN_FRONT ||
 	   Cams[ActiveCam].Mode == CCam::MODE_FOLLOWPED ||
@@ -1894,14 +2067,16 @@ CCamera::StartTransition(int16 newMode)
 		if(newMode == CCam::MODE_CAM_ON_A_STRING)
 			switchPedToCar = true;
 	}
-//
+#endif
 
 	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)
-		switchPedMode = true;
+		switchFromFight = true;
+#ifndef PS2_CAM_TRANSITION
 	if(Cams[ActiveCam].Mode == CCam::MODE_FIXED)
 		switchFromFixed = true;
+#endif
 
 	m_bUseTransitionBeta = false;
 
@@ -1920,11 +2095,11 @@ CCamera::StartTransition(int16 newMode)
 		((CPed*)pTargetEntity)->m_fRotationDest = angle;
 	}
 
-/*	// PS2
+#ifdef PS2_CAM_TRANSITION
 	ActiveCam = (ActiveCam+1)%2;
 	Cams[ActiveCam].Init();
 	Cams[ActiveCam].Mode = newMode;
- */
+#endif
 
 	Cams[ActiveCam].m_cvecCamFixedModeVector = m_vecFixedModeVector;
 	Cams[ActiveCam].CamTargetEntity = pTargetEntity;
@@ -1955,12 +2130,27 @@ CCamera::StartTransition(int16 newMode)
 
 	switch(newMode){
 	case CCam::MODE_BEHINDCAR:
+#ifdef PS2_CAM_TRANSITION
+		Cams[ActiveCam].Source = Cams[(ActiveCam+1)%2].Source;
+		Cams[ActiveCam].Beta = Cams[(ActiveCam+1)%2].Beta;
+#endif
+		Cams[ActiveCam].BetaSpeed = 0.0f;
+		break;
+
+	case CCam::MODE_BEHINDBOAT:
+#ifdef PS2_CAM_TRANSITION
+		Cams[ActiveCam].Source = Cams[(ActiveCam+1)%2].Source;
+		Cams[ActiveCam].Beta = Cams[(ActiveCam+1)%2].Beta;
+#endif
 		Cams[ActiveCam].BetaSpeed = 0.0f;
 		break;
 
 	case CCam::MODE_FOLLOWPED:
 		// Getting out of vehicle normally
 		betaOffset = DEGTORAD(55.0f);
+#ifdef PS2_CAM_TRANSITION
+		Cams[ActiveCam].Source = Cams[(ActiveCam+1)%2].Source;
+#endif
 		if(m_bJustCameOutOfGarage){
 			m_bUseTransitionBeta = true;
 /*
@@ -1974,13 +2164,21 @@ CCamera::StartTransition(int16 newMode)
 */
 			// this is better:
 			if(Cams[ActiveCam].Front.x != 0.0f || Cams[ActiveCam].Front.y != 0.0f)
+#ifdef PS2_CAM_TRANSITION
+				Cams[ActiveCam].m_fTransitionBeta = CGeneral::GetATanOfXY(Cams[(ActiveCam+1)%2].Front.x, Cams[(ActiveCam+1)%2].Front.y) + PI;
+#else
 				Cams[ActiveCam].m_fTransitionBeta = CGeneral::GetATanOfXY(Cams[ActiveCam].Front.x, Cams[ActiveCam].Front.y) + PI;
+#endif
 			else
 				Cams[ActiveCam].m_fTransitionBeta = 0.0f;
 		}
 		if(m_bTargetJustCameOffTrain)
 			m_bCamDirectlyInFront = true;
+#ifdef PS2_CAM_TRANSITION
+		if(Cams[(ActiveCam+1)%2].Mode != CCam::MODE_CAM_ON_A_STRING)
+#else
 		if(Cams[ActiveCam].Mode != CCam::MODE_CAM_ON_A_STRING)
+#endif
 			break;
 		m_bUseTransitionBeta = true;
 		vehicleVertical = false;
@@ -1992,7 +2190,11 @@ CCamera::StartTransition(int16 newMode)
 			Cams[ActiveCam].m_fTransitionBeta = 0.0f;
 			break;
 		}
+#ifdef PS2_CAM_TRANSITION
+		camBeta = CGeneral::GetATanOfXY(Cams[(ActiveCam+1)%2].Front.x, Cams[(ActiveCam+1)%2].Front.y);
+#else
 		camBeta = CGeneral::GetATanOfXY(Cams[ActiveCam].Front.x, Cams[ActiveCam].Front.y);
+#endif
 		if(((CPed*)pTargetEntity)->m_carInObjective)
 			targetBeta = CGeneral::GetATanOfXY(((CPed*)pTargetEntity)->m_carInObjective->GetForward().x, ((CPed*)pTargetEntity)->m_carInObjective->GetForward().y);
 		else
@@ -2048,6 +2250,10 @@ CCamera::StartTransition(int16 newMode)
 		break;
 
 	case CCam::MODE_SYPHON:
+#ifdef PS2_CAM_TRANSITION
+		Cams[ActiveCam].Beta = Cams[(ActiveCam+1)%2].Beta;
+		Cams[ActiveCam].Source = Cams[(ActiveCam+1)%2].Source;
+#endif
 		Cams[ActiveCam].Alpha = 0.0f;
 		Cams[ActiveCam].AlphaSpeed = 0.0f;
 		break;
@@ -2055,20 +2261,29 @@ CCamera::StartTransition(int16 newMode)
 	case CCam::MODE_CAM_ON_A_STRING:
 		// Get into vehicle
 		betaOffset = DEGTORAD(57.0f);
+#ifdef PS2_CAM_TRANSITION
+		Cams[ActiveCam].Source = Cams[(ActiveCam+1)%2].Source;
+#endif
 		if(!m_bLookingAtPlayer || m_bJustCameOutOfGarage)
 			break;
 		m_bUseTransitionBeta = true;
 		targetBeta = CGeneral::GetATanOfXY(pTargetEntity->GetForward().x, pTargetEntity->GetForward().y);
+#ifdef PS2_CAM_TRANSITION
+		camBeta = CGeneral::GetATanOfXY(Cams[(ActiveCam+1)%2].Front.x, Cams[(ActiveCam+1)%2].Front.y);
+#else
 		camBeta = CGeneral::GetATanOfXY(Cams[ActiveCam].Front.x, Cams[ActiveCam].Front.y);
+#endif
 		deltaBeta = targetBeta - camBeta;
 		while(deltaBeta >= PI) deltaBeta -= 2*PI;
 		while(deltaBeta < -PI) deltaBeta += 2*PI;
 		deltaBeta = Abs(deltaBeta);
-		// switchFromFixed logic again here, skipped
+#ifndef PS2_CAM_TRANSITION
+		switchFromFixed = Cams[ActiveCam].Mode == CCam::MODE_FIXED;
 		if(switchFromFixed){
 			Cams[ActiveCam].m_fTransitionBeta = CGeneral::GetATanOfXY(Cams[ActiveCam].Front.x, Cams[ActiveCam].Front.y);
 			break;
 		}
+#endif
 
 		door = FindPlayerPed()->m_vehEnterType;
 		if(deltaBeta > HALFPI){
@@ -2096,15 +2311,23 @@ CCamera::StartTransition(int16 newMode)
 		}
 		break;
 
-	case CCam::MODE_BEHINDBOAT:
-		Cams[ActiveCam].BetaSpeed = 0.0f;
-		break;
-
 	case CCam::MODE_PED_DEAD_BABY:
+#ifdef PS2_CAM_TRANSITION
+		Cams[ActiveCam].Source = Cams[(ActiveCam+1)%2].Source;
+#endif
 		Cams[ActiveCam].Alpha = DEGTORAD(15.0f);
 		break;
 
+#ifdef PS2_CAM_TRANSITION
+	case CCam::MODE_PLAYER_FALLEN_WATER:
+		Cams[ActiveCam].m_vecLastAboveWaterCamPosition = Cams[(ActiveCam+1)%2].m_vecLastAboveWaterCamPosition;
+		break;
+#endif
+
 	case CCam::MODE_FIGHT_CAM:
+#ifdef PS2_CAM_TRANSITION
+		Cams[ActiveCam].Source = Cams[(ActiveCam+1)%2].Source;
+#endif
 		Cams[ActiveCam].Beta = 0.0f;
 		Cams[ActiveCam].BetaSpeed = 0.0f;
 		Cams[ActiveCam].Alpha = 0.0f;
@@ -2112,33 +2335,40 @@ CCamera::StartTransition(int16 newMode)
 		break;
 	}
 
+#ifndef PS2_CAM_TRANSITION
 	Cams[ActiveCam].Init();
 	Cams[ActiveCam].Mode = newMode;
 
 	m_uiTransitionDuration = 1350;
 	if(switchSyphonMode)
 		m_uiTransitionDuration = 1800;
-	else if(switchPedMode)
+	else if(switchFromFight)
 		m_uiTransitionDuration = 750;
-// not on PS2
 	else if(switchPedToCar){
-		m_fFractionInterToStopMovingTarget = 0.2f;
-		m_fFractionInterToStopCatchUpTarget = 0.8f;
+		m_fFractionInterToStopMoving = 0.2f;
+		m_fFractionInterToStopCatchUp = 0.8f;
 		m_uiTransitionDuration = 950;
 	}else if(switchFromFixed){
-		m_fFractionInterToStopMovingTarget = 0.05f;
-		m_fFractionInterToStopCatchUpTarget = 0.95f;
+		m_fFractionInterToStopMoving = 0.05f;
+		m_fFractionInterToStopCatchUp = 0.95f;
 	}else if(switch1stPersonToVehicle){
-		m_fFractionInterToStopMovingTarget = 0.0f;
-		m_fFractionInterToStopCatchUpTarget = 1.0f;
+		m_fFractionInterToStopMoving = 0.0f;
+		m_fFractionInterToStopCatchUp = 1.0f;
 		m_uiTransitionDuration = 1;
 	}else
 		m_uiTransitionDuration = 1350;	// already set above
-//
+#else
+	if(switchSyphonMode)
+		m_uiTransitionDuration = 1800;
+	else if(switchFromFight)
+		m_uiTransitionDuration = 750;
+	else
+		m_uiTransitionDuration = 1350;
+#endif
 	m_uiTransitionState = 1;
 	m_uiTimeTransitionStart = CTimer::GetTimeInMilliseconds();
 	m_uiTransitionJUSTStarted = 1;
-// PS2 returns here
+#ifndef PS2_CAM_TRANSITION
 	if(m_vecDoingSpecialInterPolation){
 		m_cvecStartingSourceForInterPol = SourceDuringInter;
 		m_cvecStartingTargetForInterPol = TargetDuringInter;
@@ -2170,19 +2400,27 @@ CCamera::StartTransition(int16 newMode)
 	m_fFOVSpeedAtStartInter = Cams[ActiveCam].m_fFovSpeedOverOneFrame;
 	Cams[ActiveCam].ResetStatics = true;
 	if(!m_bLookingAtPlayer && m_bScriptParametersSetForInterPol){
-		m_fFractionInterToStopMovingTarget = m_fScriptPercentageInterToStopMoving;
-		m_fFractionInterToStopCatchUpTarget = m_fScriptPercentageInterToCatchUp;
+		m_fFractionInterToStopMoving = m_fScriptPercentageInterToStopMoving;
+		m_fFractionInterToStopCatchUp = m_fScriptPercentageInterToCatchUp;
 		m_uiTransitionDuration = m_fScriptTimeForInterPolation;
 	}
+#endif
 }
 
 void
 CCamera::StartTransitionWhenNotFinishedInter(int16 mode)
 {
+#ifdef PS2_CAM_TRANSITION
+	m_vecOldSourceForInter = GetPosition();
+	m_vecOldFrontForInter = GetForward();
+	m_vecOldUpForInter = GetUp();
+	m_vecOldFOVForInter = CDraw::GetFOV();
+#endif
 	m_vecDoingSpecialInterPolation = true;
 	StartTransition(mode);
 }
 
+#ifndef PS2_CAM_TRANSITION
 void
 CCamera::StoreValuesDuringInterPol(CVector &source, CVector &target, CVector &up, float &FOV)
 {
@@ -2195,7 +2433,7 @@ CCamera::StoreValuesDuringInterPol(CVector &source, CVector &target, CVector &up
 	m_fBetaDuringInterPol = CGeneral::GetATanOfXY(Dist.x, Dist.y);
 	m_fAlphaDuringInterPol = CGeneral::GetATanOfXY(DistOnGround, Dist.z);
 }
-
+#endif
 
 
 void
@@ -2265,82 +2503,77 @@ CCamera::IsItTimeForNewcam(int32 obbeMode, int32 time)
 	switch(obbeMode){
 	case OBBE_WHEEL:
 		veh = FindPlayerVehicle();
-		if(veh == nil){
-			if(CTimer::GetTimeInMilliseconds() > t+5000)
+		if(veh){
+			if(veh->IsBoat() || veh->GetModelIndex() == MI_RHINO)
+				return true;
+			if(!CWorld::GetIsLineOfSightClear(pTargetEntity->GetPosition(), Cams[ActiveCam].Source, true, false, false, false, false, false, false))
 				return true;
-			SetNearClipScript(0.6f);
-			return false;
 		}
-		if(veh->IsBoat() || veh->GetModelIndex() == MI_RHINO)
+		if(CTimer::GetTimeInMilliseconds() > t+5000)
 			return true;
-		if(CWorld::GetIsLineOfSightClear(pTargetEntity->GetPosition(), Cams[ActiveCam].Source, true, false, false, false, false, false, false)){
-			if(CTimer::GetTimeInMilliseconds() > t+5000)
-				return true;
-			SetNearClipScript(0.6f);
-			return false;
-		}
-		return true;
+		SetNearClipScript(0.6f);
+		return false;
 	case OBBE_1:
 		if(FindPlayerVehicle() && FindPlayerVehicle()->IsBoat())
 			return true;
-		if(CWorld::GetIsLineOfSightClear(FindPlayerCoors(), m_vecFixedModeSource, true, false, false, false, false, false, false)){
-			fwd = FindPlayerCoors() - m_vecFixedModeSource;
-			fwd.z = 0.0f;
+		if(!CWorld::GetIsLineOfSightClear(FindPlayerCoors(), m_vecFixedModeSource, true, false, false, false, false, false, false))
+			return true;
 
-			// too far and driving away from cam
-			if(fwd.Magnitude() > 20.0f && DotProduct(FindPlayerSpeed(), fwd) > 0.0f)
-				return true;
-			// too close
-			if(fwd.Magnitude() < 1.6f)
-				return true;
-			return 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;
+		// too close
+		if(fwd.Magnitude() < 1.6f)
+			return true;
+		return false;
 	case OBBE_2:
 		if(FindPlayerVehicle() && FindPlayerVehicle()->IsBoat())
 			return true;
-		if(CWorld::GetIsLineOfSightClear(FindPlayerCoors(), m_vecFixedModeSource, true, false, false, false, false, false, false)){
-			fwd = FindPlayerCoors() - m_vecFixedModeSource;
-			fwd.z = 0.0f;
+		if(!CWorld::GetIsLineOfSightClear(FindPlayerCoors(), m_vecFixedModeSource, true, false, false, false, false, false, false))
+			return true;
 
-			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() > 19.0f && DotProduct(FindPlayerSpeed(), fwd) > 0.0f)
-				return true;
-			// too close
-			if(fwd.Magnitude() < 1.6f)
-				return true;
-			return 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() > 19.0f && DotProduct(FindPlayerSpeed(), fwd) > 0.0f)
+			return true;
+		// too close
+		if(fwd.Magnitude() < 1.6f)
+			return true;
+		return false;
 	case OBBE_3:
-		if(CWorld::GetIsLineOfSightClear(FindPlayerCoors(), m_vecFixedModeSource, true, false, false, false, false, false, false)){
-			fwd = FindPlayerCoors() - m_vecFixedModeSource;
-			fwd.z = 0.0f;
+		if(!CWorld::GetIsLineOfSightClear(FindPlayerCoors(), m_vecFixedModeSource, true, false, false, false, false, false, false))
+			return true;
 
-			// too far and driving away from cam
-			if(fwd.Magnitude() > 28.0f && DotProduct(FindPlayerSpeed(), fwd) > 0.0f)
-				return true;
-			return false;
-		}
-		return true;
+		fwd = FindPlayerCoors() - m_vecFixedModeSource;
+		fwd.z = 0.0f;
+
+		// too far and driving away from cam
+		if(fwd.Magnitude() > 28.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())
 			return true;
-		if(CWorld::GetIsLineOfSightClear(FindPlayerCoors(), m_vecFixedModeSource, true, false, false, false, false, false, false)){
-			fwd = FindPlayerCoors() - m_vecFixedModeSource;
-			fwd.z = 0.0f;
+		if(!CWorld::GetIsLineOfSightClear(FindPlayerCoors(), m_vecFixedModeSource, true, false, false, false, false, false, false))
+			return true;
 
-			// too far and driving away from cam
-			if(fwd.Magnitude() > 28.0f && DotProduct(FindPlayerSpeed(), fwd) > 0.0f)
-				return true;
-			return false;
-		}
-		return true;
+		fwd = FindPlayerCoors() - m_vecFixedModeSource;
+		fwd.z = 0.0f;
+
+		// too far and driving away from cam
+		if(fwd.Magnitude() > 28.0f && DotProduct(FindPlayerSpeed(), fwd) > 0.0f)
+			return true;
+		return false;
 	case OBBE_ONSTRING:
 		return CTimer::GetTimeInMilliseconds() > t+3000;
 	case OBBE_COPCAR:
@@ -2348,59 +2581,58 @@ CCamera::IsItTimeForNewcam(int32 obbeMode, int32 time)
 	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)){
-			if(CTimer::GetTimeInMilliseconds() > t+1000)
-				return true;
-			SetNearClipScript(0.6f);
-			return false;
-		}
-		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)){
-			fwd = FindPlayerCoors() - m_vecFixedModeSource;
-			fwd.z = 0.0f;
+		if(!CWorld::GetIsLineOfSightClear(FindPlayerCoors(), m_vecFixedModeSource, true, false, false, false, false, false, false))
+			return true;
 
-			// too far and driving away from cam
-			if(fwd.Magnitude() > 20.0f && DotProduct(FindPlayerSpeed(), fwd) > 0.0f)
-				return true;
-			return 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)){
-			fwd = FindPlayerCoors() - m_vecFixedModeSource;
-			fwd.z = 0.0f;
+		if(!CWorld::GetIsLineOfSightClear(FindPlayerCoors(), m_vecFixedModeSource, true, false, false, false, false, false, false))
+			return true;
 
-			// too far and driving away from cam
-			if(fwd.Magnitude() > 8.0f && DotProduct(FindPlayerSpeed(), fwd) > 0.0f)
-				return true;
-			return 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)){
-			fwd = FindPlayerCoors() - m_vecFixedModeSource;
-			fwd.z = 0.0f;
+		if(!CWorld::GetIsLineOfSightClear(FindPlayerCoors(), m_vecFixedModeSource, true, false, false, false, false, false, false))
+			return true;
 
-			// too far and driving away from cam
-			if(fwd.Magnitude() > 25.0f && DotProduct(FindPlayerSpeed(), fwd) > 0.0f)
-				return true;
-			return 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)){
-			fwd = FindPlayerCoors() - m_vecFixedModeSource;
-			fwd.z = 0.0f;
+		if(!CWorld::GetIsLineOfSightClear(FindPlayerCoors(), m_vecFixedModeSource, true, false, false, false, false, false, false))
+			return true;
 
-			// too far and driving away from cam
-			if(fwd.Magnitude() > 8.0f && DotProduct(FindPlayerSpeed(), fwd) > 0.0f)
-				return true;
-			return 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;
 	default:
@@ -2675,7 +2907,7 @@ CCamera::TryToStartNewCamMode(int obbeMode)
 	}
 }
 
-static int32 SequenceOfCams[16] = {
+int32 SequenceOfCams[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,
@@ -2711,7 +2943,7 @@ CCamera::ProcessObbeCinemaCameraCar(void)
 	bDidWeProcessAnyCinemaCam = true;
 }
 
-static int32 SequenceOfPedCams[5] = { OBBE_9, OBBE_10, OBBE_11, OBBE_12, OBBE_13 };
+int32 SequenceOfPedCams[5] = { OBBE_9, OBBE_10, OBBE_11, OBBE_12, OBBE_13 };
 
 void
 CCamera::ProcessObbeCinemaCameraPed(void)
@@ -2890,6 +3122,13 @@ CCamera::Process_Train_Camera_Control(void)
 		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();
@@ -3243,7 +3482,7 @@ CCamera::GetLookDirection(void)
 	   Cams[ActiveCam].Mode == CCam::MODE_BEHINDBOAT ||
 	   Cams[ActiveCam].Mode == CCam::MODE_FOLLOWPED)
 		return Cams[ActiveCam].DirectionWasLooking;
-	return LOOKING_FORWARD;;
+	return LOOKING_FORWARD;
 }
 
 bool
@@ -3301,12 +3540,13 @@ CCamera::UpdateAimingCoors(CVector const &coors)
 	m_cvecAimingTargetCoors = coors;
 }
 
-void
+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);
@@ -3315,9 +3555,9 @@ CCamera::Find3rdPersonCamTargetVector(float dist, CVector pos, CVector &source,
 		target += Cams[ActiveCam].Up * Tan(angleY);
 		target += CrossProduct(Cams[ActiveCam].Front, Cams[ActiveCam].Up) * Tan(angleX);
 		target.Normalise();
-		float dot = DotProduct(pos - source, target);
-		source += dot*target;
+		source += DotProduct(pos - source, target)*target;
 		target = dist*target + source;
+		return true;
 	}
 }
 
@@ -3346,7 +3586,7 @@ CCamera::CalculateDerivedValues(void)
 {
 	m_cameraMatrix = Invert(m_matrix);
 
-	float hfov = DEGTORAD(CDraw::GetFOV()/2.0f);
+	float hfov = DEGTORAD(CDraw::GetScaledFOV()/2.0f);
 	float c = cos(hfov);
 	float s = sin(hfov);
 

src/core/Camera.h

@@ -188,7 +188,6 @@ public:
 	CPed         *m_pLastPedLookedAt;// So interpolation works 
 	bool        m_bFirstPersonRunAboutActive;
 
-
 	CCam(void) { Init(); }
 	void Init(void);
 	void Process(void);
@@ -250,11 +249,11 @@ public:
 	// CCam::Process_Look_At_Cars
 	// CCam::Process_CheesyZoom
 	// CCam::Process_Aiming
-	// CCam::Process_Bill	// same as BehindCar due to unused variables
-	// CCam::Process_Im_The_Passenger_Woo_Woo
-	// CCam::Process_Blood_On_The_Tracks
-	// CCam::Process_Cam_Running_Side_Train
-	// CCam::Process_Cam_On_Train_Roof
+	void Process_Bill(const CVector &CameraTarget, float TargetOrientation, float SpeedVar, float TargetSpeedVar);
+	void Process_Im_The_Passenger_Woo_Woo(const CVector &CameraTarget, float TargetOrientation, float, float);
+	void Process_Blood_On_The_Tracks(const CVector &CameraTarget, float TargetOrientation, float, float);
+	void Process_Cam_Running_Side_Train(const CVector &CameraTarget, float TargetOrientation, float, float);
+	void Process_Cam_On_Train_Roof(const CVector &CameraTarget, float TargetOrientation, float, float);
 
 	// custom stuff
 	void Process_FollowPed_Rotation(const CVector &CameraTarget, float TargetOrientation, float, float);
@@ -426,9 +425,12 @@ public:
 	float CarZoomValueSmooth;
 
 	float DistanceToWater;
+#ifndef PS2_CAM_TRANSITION
 	float FOVDuringInter;
+#endif
 	float LODDistMultiplier;
 	float GenerationDistMultiplier;
+#ifndef PS2_CAM_TRANSITION
 	float m_fAlphaSpeedAtStartInter;
 	float m_fAlphaWhenInterPol;
 	float m_fAlphaDuringInterPol;
@@ -439,6 +441,7 @@ public:
 	float m_fFOVSpeedAtStartInter;
 	float m_fStartingBetaForInterPol;
 	float m_fStartingAlphaForInterPol;
+#endif
 	float m_PedOrientForBehindOrInFront;
 	float m_CameraAverageSpeed;
 	float m_CameraSpeedSoFar;
@@ -488,7 +491,7 @@ public:
 	CVector m_vecFixedModeSource;
 	CVector m_vecFixedModeUpOffSet;
 	CVector m_vecCutSceneOffset;
-
+#ifndef PS2_CAM_TRANSITION
 	CVector m_cvecStartingSourceForInterPol;
 	CVector m_cvecStartingTargetForInterPol;
 	CVector m_cvecStartingUpForInterPol;
@@ -498,11 +501,13 @@ public:
 	CVector m_vecSourceWhenInterPol;
 	CVector m_vecTargetWhenInterPol;
 	CVector m_vecUpWhenInterPol;
-
+#endif
 	CVector m_vecGameCamPos;
+#ifndef PS2_CAM_TRANSITION
 	CVector SourceDuringInter;
 	CVector TargetDuringInter;
 	CVector UpDuringInter;
+#endif
 	RwCamera *m_pRwCamera;
 	CEntity *pTargetEntity;
 	CCamPathSplines m_arrPathArray[MAX_NUM_OF_SPLINETYPES];
@@ -518,14 +523,13 @@ public:
 	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_fFractionInterToStopMovingTarget;
-	float m_fFractionInterToStopCatchUpTarget;
+	float m_fFractionInterToStopMoving;
+	float m_fFractionInterToStopCatchUp;
 	float m_fGaitSwayBuffer;
 	float m_fScriptPercentageInterToStopMoving;
 	float m_fScriptPercentageInterToCatchUp;
@@ -624,7 +628,7 @@ public:
 	void SetNewPlayerWeaponMode(int16 mode, int16 minZoom, int16 maxZoom);
 	void ClearPlayerWeaponMode(void);
 	void UpdateAimingCoors(CVector const &coors);
-	void Find3rdPersonCamTargetVector(float dist, CVector pos, CVector &source, CVector &target);
+	bool Find3rdPersonCamTargetVector(float dist, CVector pos, CVector &source, CVector &target);
 	float Find3rdPersonQuickAimPitch(void);
 
 	// Physical camera

src/core/Collision.cpp

@@ -548,18 +548,18 @@ CCollision::TestLineOfSight(const CColLine &line, const CMatrix &matrix, CColMod
 		return false;
 
 	for(i = 0; i < model.numSpheres; i++)
-		if(!ignoreSeeThrough || model.spheres[i].surface != SURFACE_GLASS && model.spheres[i].surface != SURFACE_SCAFFOLD)
+		if(!ignoreSeeThrough || model.spheres[i].surface != SURFACE_GLASS && model.spheres[i].surface != SURFACE_TRANSPARENT_CLOTH)
 			if(TestLineSphere(newline, model.spheres[i]))
 				return true;
 
 	for(i = 0; i < model.numBoxes; i++)
-		if(!ignoreSeeThrough || model.boxes[i].surface != SURFACE_GLASS && model.boxes[i].surface != SURFACE_SCAFFOLD)
+		if(!ignoreSeeThrough || model.boxes[i].surface != SURFACE_GLASS && model.boxes[i].surface != SURFACE_TRANSPARENT_CLOTH)
 			if(TestLineBox(newline, model.boxes[i]))
 				return true;
 
 	CalculateTrianglePlanes(&model);
 	for(i = 0; i < model.numTriangles; i++)
-		if(!ignoreSeeThrough || model.triangles[i].surface != SURFACE_GLASS && model.triangles[i].surface != SURFACE_SCAFFOLD)
+		if(!ignoreSeeThrough || model.triangles[i].surface != SURFACE_GLASS && model.triangles[i].surface != SURFACE_TRANSPARENT_CLOTH)
 			if(TestLineTriangle(newline, model.vertices, model.triangles[i], model.trianglePlanes[i]))
 				return true;
 
@@ -1179,16 +1179,16 @@ CCollision::ProcessLineOfSight(const CColLine &line,
 
 	float coldist = mindist;
 	for(i = 0; i < model.numSpheres; i++)
-		if(!ignoreSeeThrough || model.spheres[i].surface != SURFACE_GLASS && model.spheres[i].surface != SURFACE_SCAFFOLD)
+		if(!ignoreSeeThrough || model.spheres[i].surface != SURFACE_GLASS && model.spheres[i].surface != SURFACE_TRANSPARENT_CLOTH)
 			ProcessLineSphere(newline, model.spheres[i], point, coldist);
 
 	for(i = 0; i < model.numBoxes; i++)
-		if(!ignoreSeeThrough || model.boxes[i].surface != SURFACE_GLASS && model.boxes[i].surface != SURFACE_SCAFFOLD)
+		if(!ignoreSeeThrough || model.boxes[i].surface != SURFACE_GLASS && model.boxes[i].surface != SURFACE_TRANSPARENT_CLOTH)
 			ProcessLineBox(newline, model.boxes[i], point, coldist);
 
 	CalculateTrianglePlanes(&model);
 	for(i = 0; i < model.numTriangles; i++)
-		if(!ignoreSeeThrough || model.triangles[i].surface != SURFACE_GLASS && model.triangles[i].surface != SURFACE_SCAFFOLD)
+		if(!ignoreSeeThrough || model.triangles[i].surface != SURFACE_GLASS && model.triangles[i].surface != SURFACE_TRANSPARENT_CLOTH)
 			ProcessLineTriangle(newline, model.vertices, model.triangles[i], model.trianglePlanes[i], point, coldist);
 
 	if(coldist < mindist){
@@ -1219,17 +1219,17 @@ CCollision::ProcessVerticalLine(const CColLine &line,
 
 	float coldist = mindist;
 	for(i = 0; i < model.numSpheres; i++)
-		if(!ignoreSeeThrough || model.spheres[i].surface != SURFACE_GLASS && model.spheres[i].surface != SURFACE_SCAFFOLD)
+		if(!ignoreSeeThrough || model.spheres[i].surface != SURFACE_GLASS && model.spheres[i].surface != SURFACE_TRANSPARENT_CLOTH)
 			ProcessLineSphere(newline, model.spheres[i], point, coldist);
 
 	for(i = 0; i < model.numBoxes; i++)
-		if(!ignoreSeeThrough || model.boxes[i].surface != SURFACE_GLASS && model.boxes[i].surface != SURFACE_SCAFFOLD)
+		if(!ignoreSeeThrough || model.boxes[i].surface != SURFACE_GLASS && model.boxes[i].surface != SURFACE_TRANSPARENT_CLOTH)
 			ProcessLineBox(newline, model.boxes[i], point, coldist);
 
 	CalculateTrianglePlanes(&model);
 	TempStoredPoly.valid = false;
 	for(i = 0; i < model.numTriangles; i++)
-		if(!ignoreSeeThrough || model.triangles[i].surface != SURFACE_GLASS && model.triangles[i].surface != SURFACE_SCAFFOLD)
+		if(!ignoreSeeThrough || model.triangles[i].surface != SURFACE_GLASS && model.triangles[i].surface != SURFACE_TRANSPARENT_CLOTH)
 			ProcessVerticalLineTriangle(newline, model.vertices, model.triangles[i], model.trianglePlanes[i], point, coldist, &TempStoredPoly);
 
 	if(coldist < mindist){
@@ -1758,15 +1758,15 @@ CCollision::DrawColModel_Coloured(const CMatrix &mat, const CColModel &colModel,
 			b *= f;
 		}
 
-		if(s == SURFACE_SCAFFOLD || s == SURFACE_METAL_FENCE ||
-		   s == SURFACE_BOLLARD || s == SURFACE_METAL_POLE)
+		if(s == SURFACE_TRANSPARENT_CLOTH || s == SURFACE_METAL_CHAIN_FENCE ||
+		   s == SURFACE_TRANSPARENT_STONE || s == SURFACE_SCAFFOLD_POLE)
 			if(CTimer::GetFrameCounter() & 1){
 				r = 0;
 				g = 0;
 				b = 0;
 			}
 
-		if(s > SURFACE_GATE){
+		if(s > SURFACE_METAL_GATE){
 			r = CGeneral::GetRandomNumber();
 			g = CGeneral::GetRandomNumber();
 			b = CGeneral::GetRandomNumber();
@@ -1839,8 +1839,8 @@ CCollision::DrawColModel_Coloured(const CMatrix &mat, const CColModel &colModel,
 			b *= f;
 		}
 
-		if(s == SURFACE_SCAFFOLD || s == SURFACE_METAL_FENCE ||
-		   s == SURFACE_BOLLARD || s == SURFACE_METAL_POLE)
+		if(s == SURFACE_TRANSPARENT_CLOTH || s == SURFACE_METAL_CHAIN_FENCE ||
+		   s == SURFACE_TRANSPARENT_STONE || s == SURFACE_SCAFFOLD_POLE)
 			if(CTimer::GetFrameCounter() & 1){
 				r = 0;
 				g = 0;

src/core/FileLoader.cpp

@@ -945,7 +945,7 @@ CFileLoader::Load2dEffect(const char *line)
 			&effect->light.dist,
 			&effect->light.range,
 			&effect->light.size,
-			&effect->light.shadowRange,
+			&effect->light.shadowSize,
 			&shadowIntens, &lightType, &roadReflection, &flare, &flags);
 		effect->light.corona = RwTextureRead(corona, nil);
 		effect->light.shadow = RwTextureRead(shadow, nil);
@@ -977,7 +977,7 @@ CFileLoader::Load2dEffect(const char *line)
 			&effect->attractor.dir.y,
 			&effect->attractor.dir.z,
 			&probability);
-		effect->attractor.flags = flags;
+		effect->attractor.type = flags;
 		effect->attractor.probability = probability;
 		break;
 	}

src/core/Frontend.h

@@ -234,7 +234,7 @@ enum eMenuScreen
 	MENUPAGE_SKIN_SELECT = 54,
 	MENUPAGE_KEYBOARD_CONTROLS = 55,
 	MENUPAGE_MOUSE_CONTROLS = 56,
-	MENUPAGE_57 = 57, // mission failed, wanna restart page in mobile
+	MENUPAGE_MISSION_RETRY = 57,
 	MENUPAGE_58 = 58,
 #ifdef MENU_MAP
 	MENUPAGE_MAP = 59,
@@ -316,7 +316,7 @@ enum eMenuAction
 	MENUACTION_UNK69,
 	MENUACTION_UNK70,
 	MENUACTION_FINDMP,
-	MENUACTION_REDEFCTRL,
+	MENUACTION_KEYBOARDCTRLS,
 	MENUACTION_UNK73,
 	MENUACTION_INITMP,
 	MENUACTION_MP_PLAYERCOLOR,
@@ -355,13 +355,12 @@ enum eMenuAction
 	MENUACTION_UNK108,
 	MENUACTION_UNK109,
 	MENUACTION_UNK110,
-#ifdef MORE_LANGUAGES
-	MENUACTION_LANG_PL,
-	MENUACTION_LANG_RUS,
-	MENUACTION_LANG_JAP,
-#endif
-#ifdef IMPROVED_VIDEOMODE
-	MENUACTION_SCREENMODE
+	MENUACTION_UNK111,
+	MENUACTION_UNK112,
+	MENUACTION_REJECT_RETRY,
+	MENUACTION_UNK114,
+#ifdef CUSTOM_FRONTEND_OPTIONS
+	MENUACTION_TRIGGERFUNC
 #endif
 };
 
@@ -457,7 +456,7 @@ struct CMenuScreen
 		int32 m_Action; // eMenuAction
 		char m_EntryName[8];
 		int32 m_SaveSlot; // eSaveSlot
-		int32 m_TargetMenu; // eMenuScreen
+		int32 m_TargetMenu; // eMenuScreen // FrontendOption ID if it's a custom option
 	} m_aEntries[NUM_MENUROWS];
 };
 
@@ -649,12 +648,14 @@ public:
 	int GetNumOptionsCntrlConfigScreens();
 	int ConstructStatLine(int);
 
-	// New (not in function or inlined in the game)
-	void ThingsToDoBeforeLeavingPage();
+	// Those are either inlined in game, not in function yet, or I can't believe that they're not inlined.
+	// Names were made up by me.
+	void ThingsToDoBeforeGoingBack();
 	void ScrollUpListByOne();
 	void ScrollDownListByOne();
 	void PageUpList(bool);
 	void PageDownList(bool);
+	int8 GetPreviousPageOption();
 	
 	// uint8 GetNumberOfMenuOptions();
 };
@@ -664,4 +665,6 @@ VALIDATE_SIZE(CMenuManager, 0x564);
 #endif
 
 extern CMenuManager FrontEndMenuManager;
+extern CMenuScreen aScreens[];
+
 #endif

src/core/Game.cpp

@@ -86,8 +86,7 @@
 #include "ZoneCull.h"
 #include "Zones.h"
 #include "debugmenu.h"
-
-
+#include "frontendoption.h"
 
 eLevelName CGame::currLevel;
 bool CGame::bDemoMode = true;
@@ -272,6 +271,9 @@ bool CGame::InitialiseOnceAfterRW(void)
 	DMAudio.SetMusicFadeVol(127);
 	CWorld::Players[0].SetPlayerSkin(CMenuManager::m_PrefsSkinFile);
 
+#ifdef CUSTOM_FRONTEND_OPTIONS
+	CustomFrontendOptionsPopulate();
+#endif
 	return true;
 }
 

src/core/MenuScreens.cpp

@@ -1,17 +1,14 @@
-#pragma once
+#include "common.h"
+#include "Frontend.h"
 
-// TODO: There are some missing/wrong entries in here.
+// If you want to add new options, please don't do that here and see CustomFrontendOptionsPopulate in re3.cpp.
 
-const CMenuScreen aScreens[] = {
+CMenuScreen aScreens[] = {
 	// MENUPAGE_NONE = 0
 	{ "", 1, MENUPAGE_DISABLED, MENUPAGE_DISABLED, 0, 0, },
 
 	// MENUPAGE_STATS = 1
-#ifdef MENU_MAP
-	{ "FET_STA", 1, MENUPAGE_NONE, MENUPAGE_NONE, 5, 3,
-#else
 	{ "FET_STA", 1, MENUPAGE_NONE, MENUPAGE_NONE, 5, 2,
-#endif
 		MENUACTION_CHANGEMENU, "FEDS_TB", SAVESLOT_NONE, MENUPAGE_NONE,
 	},
 
@@ -24,11 +21,7 @@ const CMenuScreen aScreens[] = {
 	},
 
 	// MENUPAGE_BRIEFS = 3
-#ifdef MENU_MAP
-	{ "FET_BRE", 1, MENUPAGE_NONE, MENUPAGE_NONE, 6, 4,
-#else
 	{ "FET_BRE", 1, MENUPAGE_NONE, MENUPAGE_NONE, 6, 3,
-#endif
 		MENUACTION_CHANGEMENU, "FEDS_TB", SAVESLOT_NONE, MENUPAGE_NONE,
 	},
 
@@ -62,52 +55,44 @@ const CMenuScreen aScreens[] = {
 		MENUACTION_SUBTITLES,	"FED_SUB", SAVESLOT_NONE, MENUPAGE_GRAPHICS_SETTINGS,
 		MENUACTION_WIDESCREEN,	"FED_WIS", SAVESLOT_NONE, MENUPAGE_GRAPHICS_SETTINGS,
 		MENUACTION_SCREENRES,	"FED_RES", SAVESLOT_NONE, MENUPAGE_GRAPHICS_SETTINGS,
-#ifdef IMPROVED_VIDEOMODE
-		MENUACTION_SCREENMODE,	"SCRFOR", SAVESLOT_NONE, MENUPAGE_GRAPHICS_SETTINGS,
-#endif
 		MENUACTION_RESTOREDEF,	"FET_DEF", SAVESLOT_NONE, MENUPAGE_GRAPHICS_SETTINGS,
 		MENUACTION_CHANGEMENU,	"FEDS_TB", SAVESLOT_NONE, MENUPAGE_NONE,
 	},
 
 	// MENUPAGE_LANGUAGE_SETTINGS = 7
 	{ "FET_LAN", 1, MENUPAGE_OPTIONS, MENUPAGE_OPTIONS, 3, 3,
-		MENUACTION_LANG_ENG,	"FEL_ENG", SAVESLOT_NONE, MENUPAGE_NONE,
-		MENUACTION_LANG_FRE,	"FEL_FRE", SAVESLOT_NONE, MENUPAGE_NONE,
-		MENUACTION_LANG_GER,	"FEL_GER", SAVESLOT_NONE, MENUPAGE_NONE,
-		MENUACTION_LANG_ITA,	"FEL_ITA", SAVESLOT_NONE, MENUPAGE_NONE,
-		MENUACTION_LANG_SPA,    "FEL_SPA", SAVESLOT_NONE, MENUPAGE_NONE,
-#ifdef MORE_LANGUAGES
-		MENUACTION_LANG_PL,	    "FEL_POL", SAVESLOT_NONE, MENUPAGE_NONE,
-		MENUACTION_LANG_RUS,    "FEL_RUS", SAVESLOT_NONE, MENUPAGE_NONE,
-		MENUACTION_LANG_JAP,	"FEL_JAP", SAVESLOT_NONE, MENUPAGE_NONE,
-#endif
+		MENUACTION_LANG_ENG,	"FEL_ENG", SAVESLOT_NONE, MENUPAGE_LANGUAGE_SETTINGS,
+		MENUACTION_LANG_FRE,	"FEL_FRE", SAVESLOT_NONE, MENUPAGE_LANGUAGE_SETTINGS,
+		MENUACTION_LANG_GER,	"FEL_GER", SAVESLOT_NONE, MENUPAGE_LANGUAGE_SETTINGS,
+		MENUACTION_LANG_ITA,	"FEL_ITA", SAVESLOT_NONE, MENUPAGE_LANGUAGE_SETTINGS,
+		MENUACTION_LANG_SPA,    "FEL_SPA", SAVESLOT_NONE, MENUPAGE_LANGUAGE_SETTINGS,
 		MENUACTION_CHANGEMENU,	"FEDS_TB", SAVESLOT_NONE, MENUPAGE_NONE,
 	},
 
 	// MENUPAGE_CHOOSE_LOAD_SLOT = 8
 	{ "FET_LG", 1, MENUPAGE_NEW_GAME, MENUPAGE_NEW_GAME, 1, 1,
 		MENUACTION_CHANGEMENU,	"FESZ_CA", SAVESLOT_NONE,	MENUPAGE_NEW_GAME,
-		MENUACTION_CHECKSAVE,	"FEM_SL1", SAVESLOT_1,		MENUPAGE_LOAD_SLOT_CONFIRM,
-		MENUACTION_CHECKSAVE,	"FEM_SL2", SAVESLOT_2,		MENUPAGE_LOAD_SLOT_CONFIRM,
-		MENUACTION_CHECKSAVE,	"FEM_SL3", SAVESLOT_3,		MENUPAGE_LOAD_SLOT_CONFIRM,
-		MENUACTION_CHECKSAVE,	"FEM_SL4", SAVESLOT_4,		MENUPAGE_LOAD_SLOT_CONFIRM,
-		MENUACTION_CHECKSAVE,	"FEM_SL5", SAVESLOT_5,		MENUPAGE_LOAD_SLOT_CONFIRM,
-		MENUACTION_CHECKSAVE,	"FEM_SL6", SAVESLOT_6,		MENUPAGE_LOAD_SLOT_CONFIRM,
-		MENUACTION_CHECKSAVE,	"FEM_SL7", SAVESLOT_7,		MENUPAGE_LOAD_SLOT_CONFIRM,
-		MENUACTION_CHECKSAVE,	"FEM_SL8", SAVESLOT_8,		MENUPAGE_LOAD_SLOT_CONFIRM,
+		MENUACTION_CHECKSAVE,	"FEM_SL0", SAVESLOT_1,		MENUPAGE_LOAD_SLOT_CONFIRM,
+		MENUACTION_CHECKSAVE,	"FEM_SL1", SAVESLOT_2,		MENUPAGE_LOAD_SLOT_CONFIRM,
+		MENUACTION_CHECKSAVE,	"FEM_SL2", SAVESLOT_3,		MENUPAGE_LOAD_SLOT_CONFIRM,
+		MENUACTION_CHECKSAVE,	"FEM_SL3", SAVESLOT_4,		MENUPAGE_LOAD_SLOT_CONFIRM,
+		MENUACTION_CHECKSAVE,	"FEM_SL4", SAVESLOT_5,		MENUPAGE_LOAD_SLOT_CONFIRM,
+		MENUACTION_CHECKSAVE,	"FEM_SL5", SAVESLOT_6,		MENUPAGE_LOAD_SLOT_CONFIRM,
+		MENUACTION_CHECKSAVE,	"FEM_SL6", SAVESLOT_7,		MENUPAGE_LOAD_SLOT_CONFIRM,
+		MENUACTION_CHECKSAVE,	"FEM_SL7", SAVESLOT_8,		MENUPAGE_LOAD_SLOT_CONFIRM,
 	},
 
 	// MENUPAGE_CHOOSE_DELETE_SLOT = 9
 	{ "FET_DG", 1, MENUPAGE_NEW_GAME, MENUPAGE_NEW_GAME, 2, 2,
 		MENUACTION_CHANGEMENU,	"FESZ_CA",	SAVESLOT_NONE,	MENUPAGE_NEW_GAME,
-		MENUACTION_CHECKSAVE,	"FEM_SL1",	SAVESLOT_1,		MENUPAGE_DELETE_SLOT_CONFIRM,
-		MENUACTION_CHECKSAVE,	"FEM_SL2",	SAVESLOT_2,		MENUPAGE_DELETE_SLOT_CONFIRM,
-		MENUACTION_CHECKSAVE,	"FEM_SL3",	SAVESLOT_3,		MENUPAGE_DELETE_SLOT_CONFIRM,
-		MENUACTION_CHECKSAVE,	"FEM_SL4",	SAVESLOT_4,		MENUPAGE_DELETE_SLOT_CONFIRM,
-		MENUACTION_CHECKSAVE,	"FEM_SL5",	SAVESLOT_5,		MENUPAGE_DELETE_SLOT_CONFIRM,
-		MENUACTION_CHECKSAVE,	"FEM_SL6",	SAVESLOT_6,		MENUPAGE_DELETE_SLOT_CONFIRM,
-		MENUACTION_CHECKSAVE,	"FEM_SL7",	SAVESLOT_7,		MENUPAGE_DELETE_SLOT_CONFIRM,
-		MENUACTION_CHECKSAVE,	"FEM_SL8",	SAVESLOT_8,		MENUPAGE_DELETE_SLOT_CONFIRM,
+		MENUACTION_CHANGEMENU,	"FEM_SL0",	SAVESLOT_1,		MENUPAGE_DELETE_SLOT_CONFIRM,
+		MENUACTION_CHANGEMENU,	"FEM_SL1",	SAVESLOT_2,		MENUPAGE_DELETE_SLOT_CONFIRM,
+		MENUACTION_CHANGEMENU,	"FEM_SL2",	SAVESLOT_3,		MENUPAGE_DELETE_SLOT_CONFIRM,
+		MENUACTION_CHANGEMENU,	"FEM_SL3",	SAVESLOT_4,		MENUPAGE_DELETE_SLOT_CONFIRM,
+		MENUACTION_CHANGEMENU,	"FEM_SL4",	SAVESLOT_5,		MENUPAGE_DELETE_SLOT_CONFIRM,
+		MENUACTION_CHANGEMENU,	"FEM_SL5",	SAVESLOT_6,		MENUPAGE_DELETE_SLOT_CONFIRM,
+		MENUACTION_CHANGEMENU,	"FEM_SL6",	SAVESLOT_7,		MENUPAGE_DELETE_SLOT_CONFIRM,
+		MENUACTION_CHANGEMENU,	"FEM_SL7",	SAVESLOT_8,		MENUPAGE_DELETE_SLOT_CONFIRM,
 	},
 
 	// MENUPAGE_NEW_GAME_RELOAD = 10
@@ -284,7 +269,7 @@ const CMenuScreen aScreens[] = {
 	// MENUPAGE_CONTROLLER_PC = 35
 	{ "FET_CTL", 1, MENUPAGE_OPTIONS, MENUPAGE_OPTIONS, 0, 0,
 		MENUACTION_CTRLMETHOD,	"FET_CME", SAVESLOT_NONE, MENUPAGE_CONTROLLER_PC,
-		MENUACTION_CHANGEMENU,	"FET_RDK", SAVESLOT_NONE, MENUPAGE_KEYBOARD_CONTROLS,
+		MENUACTION_KEYBOARDCTRLS,"FET_RDK", SAVESLOT_NONE, MENUPAGE_KEYBOARD_CONTROLS,
 		MENUACTION_CHANGEMENU,	"FET_AMS", SAVESLOT_NONE, MENUPAGE_MOUSE_CONTROLS,
 		MENUACTION_RESTOREDEF,	"FET_DEF", SAVESLOT_NONE, MENUPAGE_CONTROLLER_PC,
 		MENUACTION_CHANGEMENU,	"FEDS_TB", SAVESLOT_NONE, MENUPAGE_NONE,
@@ -333,11 +318,7 @@ const CMenuScreen aScreens[] = {
    },
 
    // MENUPAGE_OPTIONS = 41
-#ifdef MENU_MAP
-   { "FET_OPT", 1, MENUPAGE_NONE, MENUPAGE_NONE, 1, 5,
-#else
    { "FET_OPT", 1, MENUPAGE_NONE, MENUPAGE_NONE, 1, 4,
-#endif
 		MENUACTION_CHANGEMENU,		"FET_CTL", SAVESLOT_NONE, MENUPAGE_CONTROLLER_PC,
 		MENUACTION_LOADRADIO,		"FET_AUD", SAVESLOT_NONE, MENUPAGE_SOUND_SETTINGS,
 		MENUACTION_CHANGEMENU,		"FET_DIS", SAVESLOT_NONE, MENUPAGE_GRAPHICS_SETTINGS,
@@ -347,13 +328,9 @@ const CMenuScreen aScreens[] = {
    },
 
    // MENUPAGE_EXIT = 42
-#ifdef MENU_MAP
-   { "FET_QG", 1, MENUPAGE_NONE, MENUPAGE_NONE, 2, 6,
-#else
    { "FET_QG", 1, MENUPAGE_NONE, MENUPAGE_NONE, 2, 5,
-#endif
 	   MENUACTION_LABEL,		"FEQ_SRE",	SAVESLOT_NONE, MENUPAGE_NONE,
-	   MENUACTION_CHANGEMENU,	"FEM_NO",	SAVESLOT_NONE, MENUPAGE_NONE,
+	   MENUACTION_DONTCANCEL,	"FEM_NO",	SAVESLOT_NONE, MENUPAGE_NONE,
 	   MENUACTION_CANCELGAME,	"FEM_YES",	SAVESLOT_NONE, MENUPAGE_NONE,
    },
 
@@ -412,9 +389,6 @@ const CMenuScreen aScreens[] = {
    { "FET_PAU", 1, MENUPAGE_DISABLED, MENUPAGE_DISABLED, 0, 0,
 	   MENUACTION_RESUME,		"FEM_RES",	SAVESLOT_NONE, MENUPAGE_NONE,
 	   MENUACTION_CHANGEMENU,	"FEN_STA",	SAVESLOT_NONE, MENUPAGE_NEW_GAME,
-#ifdef MENU_MAP
-	   MENUACTION_CHANGEMENU,	"FEG_MAP",	SAVESLOT_NONE, MENUPAGE_MAP,
-#endif
 	   MENUACTION_CHANGEMENU,	"FEP_STA",	SAVESLOT_NONE, MENUPAGE_STATS,
 	   MENUACTION_CHANGEMENU,	"FEP_BRI",	SAVESLOT_NONE, MENUPAGE_BRIEFS,
 	   MENUACTION_CHANGEMENU,	"FET_OPT",	SAVESLOT_NONE, MENUPAGE_OPTIONS,
@@ -445,11 +419,19 @@ const CMenuScreen aScreens[] = {
 	   MENUACTION_MOUSESTEER,	"FET_MST",	SAVESLOT_NONE, MENUPAGE_MOUSE_CONTROLS,
 	   MENUACTION_CHANGEMENU,	"FEDS_TB",	SAVESLOT_NONE, MENUPAGE_NONE,
    },
+	// MENUPAGE_MISSION_RETRY = 57
+#ifdef MISSION_REPLAY
 
-   // MENUPAGE_57 = 57
+   { "M_FAIL", 1, MENUPAGE_DISABLED, MENUPAGE_DISABLED, 0, 0,
+	   MENUACTION_LABEL,	    "FESZ_RM",  SAVESLOT_NONE, MENUPAGE_NONE,
+	   MENUACTION_CHANGEMENU,   "FEM_YES",  SAVESLOT_NONE, MENUPAGE_LOADING_IN_PROGRESS,
+	   MENUACTION_REJECT_RETRY, "FEM_NO",   SAVESLOT_NONE, MENUPAGE_NONE
+   },
+#else
    { "", 0, MENUPAGE_NONE, MENUPAGE_NONE, 0, 0,
 	   // mission failed, wanna restart page in mobile
    },
+#endif
 
    // MENUPAGE_58 = 58
    { "", 0, MENUPAGE_NONE, MENUPAGE_NONE, 0, 0,
@@ -463,4 +445,4 @@ const CMenuScreen aScreens[] = {
 		MENUACTION_CHANGEMENU,	"FEDS_TB", SAVESLOT_NONE, MENUPAGE_NONE,
    },
 #endif
-};
+};

src/core/Pad.cpp

@@ -1068,8 +1068,8 @@ void CPad::UpdatePads(void)
 
 	GetPad(0)->UpdateMouse();
 #ifdef XINPUT
-	GetPad(0)->AffectFromXinput(0);
-	GetPad(1)->AffectFromXinput(1);
+	GetPad(0)->AffectFromXinput(m_bMapPadOneToPadTwo ? 1 : 0);
+	GetPad(1)->AffectFromXinput(m_bMapPadOneToPadTwo ? 0 : 1);
 #else
 	CapturePad(0);
 #endif

src/core/Pad.h

@@ -2,14 +2,14 @@
 
 enum {
 	PLAYERCONTROL_ENABLED = 0,
-	PLAYERCONTROL_DISABLED_1 = 1,	// used by first person camera
-	PLAYERCONTROL_DISABLED_2 = 2,
+	PLAYERCONTROL_CAMERA = 1,
+	PLAYERCONTROL_UNK2 = 2,
 	PLAYERCONTROL_GARAGE = 4,
-	PLAYERCONTROL_DISABLED_8 = 8,
-	PLAYERCONTROL_DISABLED_10 = 16,
-	PLAYERCONTROL_DISABLED_20 = 32, // used on CPlayerInfo::MakePlayerSafe
-	PLAYERCONTROL_DISABLED_40 = 64, // used on phone calls
-	PLAYERCONTROL_DISABLED_80 = 128,// used on cutscenes
+	PLAYERCONTROL_UNK8 = 8,
+	PLAYERCONTROL_UNK10 = 16,
+	PLAYERCONTROL_PLAYERINFO = 32,
+	PLAYERCONTROL_PHONE = 64,
+	PLAYERCONTROL_CUTSCENE = 128,
 };
 
 class CControllerState
@@ -442,6 +442,7 @@ public:
 	bool GetLeftShoulder2(void)  { return !!NewState.LeftShoulder2; }
 	bool GetRightShoulder1(void) { return !!NewState.RightShoulder1; }
 	bool GetRightShoulder2(void) { return !!NewState.RightShoulder2; }
+	bool GetStart()              { return !!NewState.Start; }
 	int16 GetLeftStickX(void)    { return NewState.LeftStickX; }
 	int16 GetLeftStickY(void)    { return NewState.LeftStickY; }
 	int16 GetRightStickX(void)    { return NewState.RightStickX; }

src/core/PlayerInfo.cpp

@@ -174,7 +174,7 @@ CPlayerInfo::MakePlayerSafe(bool toggle)
 		CTheScripts::ResetCountdownToMakePlayerUnsafe();
 		m_pPed->m_pWanted->m_bIgnoredByEveryone = true;
 		CWorld::StopAllLawEnforcersInTheirTracks();
-		CPad::GetPad(0)->DisablePlayerControls |= PLAYERCONTROL_DISABLED_20;
+		CPad::GetPad(0)->SetDisablePlayerControls(PLAYERCONTROL_PLAYERINFO);
 		CPad::StopPadsShaking();
 		m_pPed->bBulletProof = true;
 		m_pPed->bFireProof = true;
@@ -194,7 +194,7 @@ CPlayerInfo::MakePlayerSafe(bool toggle)
 
 	} else if (!CGame::playingIntro && !CTheScripts::IsCountdownToMakePlayerUnsafeOn()) {
 		m_pPed->m_pWanted->m_bIgnoredByEveryone = false;
-		CPad::GetPad(0)->DisablePlayerControls &= ~PLAYERCONTROL_DISABLED_20;
+		CPad::GetPad(0)->SetEnablePlayerControls(PLAYERCONTROL_PLAYERINFO);
 		m_pPed->bBulletProof = false;
 		m_pPed->bFireProof = false;
 		m_pPed->bCollisionProof = false;
@@ -397,7 +397,7 @@ CPlayerInfo::Process(void)
 	else
 		enterOrExitVeh = CPad::GetPad(0)->GetExitVehicle();
 
-	if (enterOrExitVeh && m_pPed->m_nPedState != PED_SNIPER_MODE && m_pPed->m_nPedState != PED_ROCKET_ODE) {
+	if (enterOrExitVeh && 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;

src/core/Pools.cpp

@@ -4,6 +4,9 @@
 
 #include "Boat.h"
 #include "CarCtrl.h"
+#ifdef MISSION_REPLAY
+#include "GenericGameStorage.h"
+#endif
 #include "Population.h"
 #include "ProjectileInfo.h"
 #include "Streaming.h"
@@ -206,11 +209,24 @@ INITSAVEBUF
 			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;
+#else
 		if (!pVehicle->pDriver && !bHasPassenger) {
 			if (pVehicle->IsCar() && pVehicle->VehicleCreatedBy == MISSION_VEHICLE)
 				++nNumCars;
 			if (pVehicle->IsBoat() && pVehicle->VehicleCreatedBy == MISSION_VEHICLE)
 				++nNumBoats;
+#endif
 		}
 	}
 	*size = nNumCars * (sizeof(uint32) + sizeof(int16) + sizeof(int32) + CAutomobile::nSaveStructSize) + sizeof(int) +
@@ -226,23 +242,42 @@ INITSAVEBUF
 			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->VehicleCreatedBy == MISSION_VEHICLE || bForceSaving)) {
+#else
 			if ((pVehicle->IsCar() || pVehicle->IsBoat()) && 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));
@@ -400,7 +435,11 @@ INITSAVEBUF
 		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 +
@@ -410,7 +449,11 @@ INITSAVEBUF
 		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);

src/core/Radar.h

@@ -26,27 +26,27 @@ enum eRadarSprite
 	RADAR_SPRITE_COORD_BLIP = -1,
 #endif
 	RADAR_SPRITE_NONE = 0,
-	RADAR_SPRITE_ASUKA = 1,
-	RADAR_SPRITE_BOMB = 2,
-	RADAR_SPRITE_CAT = 3,
-	RADAR_SPRITE_CENTRE = 4,
-	RADAR_SPRITE_COPCAR = 5,
-	RADAR_SPRITE_DON = 6,
-	RADAR_SPRITE_EIGHT = 7,
-	RADAR_SPRITE_EL = 8,
-	RADAR_SPRITE_ICE = 9,
-	RADAR_SPRITE_JOEY = 10,
-	RADAR_SPRITE_KENJI = 11,
-	RADAR_SPRITE_LIZ = 12,
-	RADAR_SPRITE_LUIGI = 13,
-	RADAR_SPRITE_NORTH = 14,
-	RADAR_SPRITE_RAY = 15,
-	RADAR_SPRITE_SAL = 16,
-	RADAR_SPRITE_SAVE = 17,
-	RADAR_SPRITE_SPRAY = 18,
-	RADAR_SPRITE_TONY = 19,
-	RADAR_SPRITE_WEAPON = 20,
-	RADAR_SPRITE_COUNT = 21,
+	RADAR_SPRITE_ASUKA,
+	RADAR_SPRITE_BOMB,
+	RADAR_SPRITE_CAT,
+	RADAR_SPRITE_CENTRE,
+	RADAR_SPRITE_COPCAR,
+	RADAR_SPRITE_DON,
+	RADAR_SPRITE_EIGHT,
+	RADAR_SPRITE_EL,
+	RADAR_SPRITE_ICE,
+	RADAR_SPRITE_JOEY,
+	RADAR_SPRITE_KENJI,
+	RADAR_SPRITE_LIZ,
+	RADAR_SPRITE_LUIGI,
+	RADAR_SPRITE_NORTH,
+	RADAR_SPRITE_RAY,
+	RADAR_SPRITE_SAL,
+	RADAR_SPRITE_SAVE,
+	RADAR_SPRITE_SPRAY,
+	RADAR_SPRITE_TONY,
+	RADAR_SPRITE_WEAPON,
+	RADAR_SPRITE_COUNT
 };
 
 enum
@@ -104,7 +104,7 @@ public:
 	static CSprite2d SpraySprite;
 	static CSprite2d TonySprite;
 	static CSprite2d WeaponSprite;
-	static CSprite2d *RadarSprites[21];
+	static CSprite2d *RadarSprites[RADAR_SPRITE_COUNT];
 	static float cachedCos;
 	static float cachedSin;
 #ifdef MENU_MAP

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);
+}

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();
+};

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);
+}

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();
+};

src/core/Stats.h

@@ -10,7 +10,7 @@ public:
 		TOTAL_HIGHEST_SCORES = 16
 	};
 	static int32 DaysPassed;
-    static int32 HeadsPopped;
+	static int32 HeadsPopped;
 	static int32 CommercialPassed;
 	static int32 IndustrialPassed;
 	static int32 SuburbanPassed;
@@ -52,14 +52,14 @@ public:
 	static int32 LongestFlightInDodo;
 	static int32 TimeTakenDefuseMission;
 	static int32 TotalNumberKillFrenzies;
-    static int32 TotalNumberMissions;
-    static int32 RoundsFiredByPlayer;
-    static int32 KgsOfExplosivesUsed;
-    static int32 InstantHitsFiredByPlayer;
-    static int32 InstantHitsHitByPlayer;
-    static int32 BestTimeBombDefusal;
-    static int32 mmRain;
-    static int32 CarsCrushed;
+	static int32 TotalNumberMissions;
+	static int32 RoundsFiredByPlayer;
+	static int32 KgsOfExplosivesUsed;
+	static int32 InstantHitsFiredByPlayer;
+	static int32 InstantHitsHitByPlayer;
+	static int32 BestTimeBombDefusal;
+	static int32 mmRain;
+	static int32 CarsCrushed;
 	static int32 FastestTimes[TOTAL_FASTEST_TIMES];
 	static int32 HighestScores[TOTAL_HIGHEST_SCORES];
 

src/core/SurfaceTable.cpp

@@ -56,40 +56,40 @@ int
 CSurfaceTable::GetAdhesionGroup(uint8 surfaceType)
 {
 	switch(surfaceType){
-	case SURFACE_0:		return ADHESIVE_ROAD;
-	case SURFACE_1:		return ADHESIVE_ROAD;
-	case SURFACE_2:		return ADHESIVE_LOOSE;
-	case SURFACE_3:		return ADHESIVE_LOOSE;
-	case SURFACE_4:		return ADHESIVE_HARD;
-	case SURFACE_5:		return ADHESIVE_ROAD;
-	case SURFACE_6:		return ADHESIVE_HARD;
-	case SURFACE_7:		return ADHESIVE_HARD;
-	case SURFACE_8:		return ADHESIVE_HARD;
-	case SURFACE_9:		return ADHESIVE_HARD;
-	case SURFACE_10:	return ADHESIVE_HARD;
-	case SURFACE_11:	return ADHESIVE_HARD;
-	case SURFACE_12:	return ADHESIVE_HARD;
-	case SURFACE_13:	return ADHESIVE_HARD;
-	case SURFACE_14:	return ADHESIVE_HARD;
-	case SURFACE_15:	return ADHESIVE_HARD;
-	case SURFACE_16:	return ADHESIVE_HARD;
-	case SURFACE_17:	return ADHESIVE_RUBBER;
-	case SURFACE_18:	return ADHESIVE_LOOSE;
-	case SURFACE_19:	return ADHESIVE_WET;
-	case SURFACE_20:	return ADHESIVE_ROAD;
-	case SURFACE_21:	return ADHESIVE_ROAD;
-	case SURFACE_22:	return ADHESIVE_ROAD;
-	case SURFACE_23:	return ADHESIVE_RUBBER;
-	case SURFACE_24:	return ADHESIVE_HARD;
-	case SURFACE_25:	return ADHESIVE_LOOSE;
-	case SURFACE_26:	return ADHESIVE_LOOSE;
-	case SURFACE_27:	return ADHESIVE_HARD;
-	case SURFACE_28:	return ADHESIVE_HARD;
-	case SURFACE_29:	return ADHESIVE_RUBBER;
-	case SURFACE_30:	return ADHESIVE_LOOSE;
-	case SURFACE_31:	return ADHESIVE_HARD;
-	case SURFACE_32:	return ADHESIVE_HARD;
-	default:		return ADHESIVE_ROAD;
+	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_LOOSE;
+	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;
+	default:			return ADHESIVE_ROAD;
 	}
 }
 
@@ -97,38 +97,38 @@ float
 CSurfaceTable::GetWetMultiplier(uint8 surfaceType)
 {
 	switch(surfaceType){
-	case SURFACE_0:
-	case SURFACE_1:
-	case SURFACE_4:
-	case SURFACE_5:
-	case SURFACE_8:
-	case SURFACE_20:
-	case SURFACE_21:
-	case SURFACE_22:
-	case SURFACE_25:
-	case SURFACE_30:
-	case SURFACE_31:
+	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:
 		return 1.0f - CWeather::WetRoads*0.25f;
 
-	case SURFACE_2:
-	case SURFACE_6:
-	case SURFACE_7:
-	case SURFACE_9:
-	case SURFACE_10:
-	case SURFACE_11:
-	case SURFACE_12:
-	case SURFACE_13:
-	case SURFACE_14:
-	case SURFACE_15:
-	case SURFACE_16:
-	case SURFACE_17:
-	case SURFACE_23:
-	case SURFACE_24:
-	case SURFACE_26:
-	case SURFACE_27:
-	case SURFACE_28:
-	case SURFACE_29:
-	case SURFACE_32:
+	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;
 
 	default:

src/core/SurfaceTable.h

@@ -1,86 +1,44 @@
 #pragma once
 
-
-enum
-{
-	SURFACE_0,
-	SURFACE_1,
-	SURFACE_2,
-	SURFACE_3,
-	SURFACE_4,
-	SURFACE_5,
-	SURFACE_6,
-	SURFACE_7,
-	SURFACE_8,
-	SURFACE_9,
-	SURFACE_10,
-	SURFACE_11,
-	SURFACE_12,
-	SURFACE_13,
-	SURFACE_14,
-	SURFACE_15,
-	SURFACE_16,
-	SURFACE_17,
-	SURFACE_18,
-	SURFACE_19,
-	SURFACE_20,
-	SURFACE_21,
-	SURFACE_22,
-	SURFACE_23,
-	SURFACE_24,
-	SURFACE_25,
-	SURFACE_26,
-	SURFACE_27,
-	SURFACE_28,
-	SURFACE_29,
-	SURFACE_30,
-	SURFACE_31,
-	SURFACE_32,
-
-	NUMSURFACETYPES
-};
-
-// From nick
-// TODO: check and use this
 enum eSurfaceType
 {
 	SURFACE_DEFAULT,
 	SURFACE_TARMAC,
 	SURFACE_GRASS,
-	SURFACE_DIRT,
-	SURFACE_DIRTTRACK,
+	SURFACE_GRAVEL,
+	SURFACE_MUD_DRY,
 	SURFACE_PAVEMENT,
-	SURFACE_METAL6,
+	SURFACE_CAR,
 	SURFACE_GLASS,
-	SURFACE_SCAFFOLD,
-	SURFACE_METAL_DOOR,	// garage door
-	SURFACE_BILLBOARD,
-	SURFACE_STEEL,		//?
-	SURFACE_METAL_POLE,	// ?
-	SURFACE_STREET_LIGHT,
-	SURFACE_METAL14,
-	SURFACE_METAL15,
-	SURFACE_METAL_FENCE,
-	SURFACE_FLESH,
+	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_PUDDLE,
-	SURFACE_WOOD,
-	SURFACE_WOOD_BOX,
-	SURFACE_WOOD_PLANK,
-	SURFACE_TIRE,
-	SURFACE_HARD24,
+	SURFACE_WATER,
+	SURFACE_WOOD_CRATES,
+	SURFACE_WOOD_BENCH,
+	SURFACE_WOOD_SOLID,
+	SURFACE_RUBBER,
+	SURFACE_PLASTIC,
 	SURFACE_HEDGE,
-	SURFACE_STONE,
-	SURFACE_METAL27,
-	SURFACE_METAL28,
-	SURFACE_RUBBER29,
-	SURFACE_LOOSE30,
-	SURFACE_BOLLARD,
-	SURFACE_GATE,
+	SURFACE_STEEP_CLIFF,
+	SURFACE_CONTAINER,
+	SURFACE_NEWS_VENDOR,
+	SURFACE_WHEELBASE,
+	SURFACE_CARDBOARDBOX,
+	SURFACE_TRANSPARENT_STONE,
+	SURFACE_METAL_GATE,
 
 	// These are illegal
-	SURFACE_SAND33,
-	SURFACE_ROAD34,
+	SURFACE_SAND_BEACH,
+	SURFACE_CONCRETE_BEACH,
 };
 
 enum

src/core/TempColModels.cpp

@@ -65,7 +65,7 @@ CTempColModels::Initialise(void)
 #else
 	for (i = 0; i < ARRAY_SIZE(s_aPedGSpheres); i++) {
 #endif
-		s_aPedSpheres[i].surface = SURFACE_FLESH;
+		s_aPedSpheres[i].surface = SURFACE_PED;
 		s_aPedSpheres[i].piece = 0;
 	}
 
@@ -84,7 +84,7 @@ CTempColModels::Initialise(void)
 	s_aPed2Spheres[2].center = CVector(0.0f, -0.35f, -0.9f);
 
 	for (i = 0; i < ARRAY_SIZE(s_aPed2Spheres); i++) {
-		s_aPed2Spheres[i].surface = SURFACE_FLESH;
+		s_aPed2Spheres[i].surface = SURFACE_PED;
 		s_aPed2Spheres[i].piece = 0;
 	}
 
@@ -105,10 +105,10 @@ CTempColModels::Initialise(void)
 	s_aPedGSpheres[2].center = CVector(0.0f, 0.25f, -0.9f);
 	s_aPedGSpheres[3].center = CVector(0.0f, 0.65f, -0.9f);
 
-	s_aPedGSpheres[0].surface = SURFACE_FLESH;
-	s_aPedGSpheres[1].surface = SURFACE_FLESH;
-	s_aPedGSpheres[2].surface = SURFACE_FLESH;
-	s_aPedGSpheres[3].surface = SURFACE_FLESH;
+	s_aPedGSpheres[0].surface = SURFACE_PED;
+	s_aPedGSpheres[1].surface = SURFACE_PED;
+	s_aPedGSpheres[2].surface = SURFACE_PED;
+	s_aPedGSpheres[3].surface = SURFACE_PED;
 	s_aPedGSpheres[0].piece = 4;
 	s_aPedGSpheres[1].piece = 1;
 	s_aPedGSpheres[2].piece = 0;
@@ -130,7 +130,7 @@ CTempColModels::Initialise(void)
 	s_aDoorSpheres[2].center = CVector(0.0f, -0.6f, 0.25f);
 
 	for (i = 0; i < ARRAY_SIZE(s_aDoorSpheres); i++) {
-		s_aDoorSpheres[i].surface = SURFACE_BILLBOARD;
+		s_aDoorSpheres[i].surface = SURFACE_CAR_PANEL;
 		s_aDoorSpheres[i].piece = 0;
 	}
 
@@ -150,12 +150,12 @@ CTempColModels::Initialise(void)
 	s_aBumperSpheres[3].center = CVector(-0.85f, -0.05f, 0.0f);
 
 	for (i = 0; i < ARRAY_SIZE(s_aBumperSpheres); i++) {
-		s_aBumperSpheres[i].surface = SURFACE_BILLBOARD;
+		s_aBumperSpheres[i].surface = SURFACE_CAR_PANEL;
 		s_aBumperSpheres[i].piece = 0;
 	}
 
 	ms_colModelBumper1.boundingSphere.Set(2.2f, CVector(0.0f, -0.6f, 0.0f), SURFACE_DEFAULT, 0);
-	ms_colModelBumper1.boundingBox.Set(CVector(-1.2f, -0.3f, -0.2f), CVector(1.2f, 0.3f, -0.2f), SURFACE_DEFAULT, 0);
+	ms_colModelBumper1.boundingBox.Set(CVector(-1.2f, -0.3f, -0.2f), CVector(1.2f, 0.3f, 0.2f), SURFACE_DEFAULT, 0);
 
 	SET_COLMODEL_SPHERES(ms_colModelBumper1, s_aBumperSpheres);
 
@@ -170,7 +170,7 @@ CTempColModels::Initialise(void)
 	s_aPanelSpheres[3].center = CVector(-0.15f, 0.45f, 0.0f);
 
 	for (i = 0; i < ARRAY_SIZE(s_aPanelSpheres); i++) {
-		s_aPanelSpheres[i].surface = SURFACE_BILLBOARD;
+		s_aPanelSpheres[i].surface = SURFACE_CAR_PANEL;
 		s_aPanelSpheres[i].piece = 0;
 	}
 
@@ -190,7 +190,7 @@ CTempColModels::Initialise(void)
 	s_aBonnetSpheres[3].center = CVector(0.4f, 0.9f, 0.0f);
 
 	for (i = 0; i < ARRAY_SIZE(s_aBonnetSpheres); i++) {
-		s_aBonnetSpheres[i].surface = SURFACE_BILLBOARD;
+		s_aBonnetSpheres[i].surface = SURFACE_CAR_PANEL;
 		s_aBonnetSpheres[i].piece = 0;
 	}
 
@@ -210,7 +210,7 @@ CTempColModels::Initialise(void)
 	s_aBootSpheres[3].center = CVector(0.4f, -0.6f, 0.0f);
 
 	for (i = 0; i < ARRAY_SIZE(s_aBootSpheres); i++) {
-		s_aBootSpheres[i].surface = SURFACE_BILLBOARD;
+		s_aBootSpheres[i].surface = SURFACE_CAR_PANEL;
 		s_aBootSpheres[i].piece = 0;
 	}
 
@@ -232,7 +232,7 @@ CTempColModels::Initialise(void)
 #else
 	for (i = 0; i < ARRAY_SIZE(s_aBootSpheres); i++) {
 #endif
-		s_aWheelSpheres[i].surface = SURFACE_RUBBER29;
+		s_aWheelSpheres[i].surface = SURFACE_WHEELBASE;
 		s_aWheelSpheres[i].piece = 0;
 	}
 
@@ -254,7 +254,7 @@ CTempColModels::Initialise(void)
 #else
 	for (i = 0; i < ARRAY_SIZE(s_aBootSpheres); i++) {
 #endif
-		s_aBodyPartSpheres1[i].surface = SURFACE_FLESH;
+		s_aBodyPartSpheres1[i].surface = SURFACE_PED;
 		s_aBodyPartSpheres1[i].piece = 0;
 	}
 
@@ -276,7 +276,7 @@ CTempColModels::Initialise(void)
 #else
 	for (i = 0; i < ARRAY_SIZE(s_aBootSpheres); i++) {
 #endif
-		s_aBodyPartSpheres2[i].surface = SURFACE_FLESH;
+		s_aBodyPartSpheres2[i].surface = SURFACE_PED;
 		s_aBodyPartSpheres2[i].piece = 0;
 	}
 

src/core/Timer.h

@@ -18,7 +18,7 @@ public:
 	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 float GetTimeStepInMilliseconds() { return ms_fTimeStep / 50.0f * 1000.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; }
@@ -59,7 +59,7 @@ public:
 	friend class CMemoryCard;
 
 #ifdef FIX_BUGS
-	static float GetDefaultTimeStep(void) { return 5.0f / 3.0f; }
+	static float GetDefaultTimeStep(void) { return 50.0f / 30.0f; }
 	static float GetTimeStepFix(void) { return GetTimeStep() / GetDefaultTimeStep(); }
 #endif
 };

src/core/World.cpp

@@ -33,22 +33,22 @@
 
 CColPoint gaTempSphereColPoints[MAX_COLLISION_POINTS];
 
-CPtrList CWorld::ms_bigBuildingsList[4];// = (CPtrList*)0x6FAB60;
-CPtrList CWorld::ms_listMovingEntityPtrs;// = *(CPtrList*)0x8F433C;
-CSector CWorld::ms_aSectors[NUMSECTORS_Y][NUMSECTORS_X];// = (CSector (*)[NUMSECTORS_Y])0x665608;
-uint16 CWorld::ms_nCurrentScanCode;// = *(uint16*)0x95CC64;
+CPtrList CWorld::ms_bigBuildingsList[4];
+CPtrList CWorld::ms_listMovingEntityPtrs;
+CSector CWorld::ms_aSectors[NUMSECTORS_Y][NUMSECTORS_X];
+uint16 CWorld::ms_nCurrentScanCode;
 
-uint8 CWorld::PlayerInFocus;// = *(uint8 *)0x95CD61;
+uint8 CWorld::PlayerInFocus;
 CPlayerInfo CWorld::Players[NUMPLAYERS];
-bool CWorld::bNoMoreCollisionTorque;// = *(bool*)0x95CDCC;
-CEntity *CWorld::pIgnoreEntity;//	= *(CEntity**)0x8F6494;
-bool CWorld::bIncludeDeadPeds;// = *(bool*)0x95CD8F;
-bool CWorld::bSecondShift;// = *(bool*)0x95CD54;
-bool CWorld::bForceProcessControl;// = *(bool*)0x95CD6C;
-bool CWorld::bProcessCutsceneOnly;// = *(bool*)0x95CD8B;
+bool CWorld::bNoMoreCollisionTorque;
+CEntity *CWorld::pIgnoreEntity;
+bool CWorld::bIncludeDeadPeds;
+bool CWorld::bSecondShift;
+bool CWorld::bForceProcessControl;
+bool CWorld::bProcessCutsceneOnly;
 
-bool CWorld::bDoingCarCollisions;// = *(bool*)0x95CD8C;
-bool CWorld::bIncludeCarTyres;// = *(bool*)0x95CDAA;
+bool CWorld::bDoingCarCollisions;
+bool CWorld::bIncludeCarTyres;
 
 void
 CWorld::Initialise()
@@ -120,14 +120,14 @@ CWorld::ClearExcitingStuffFromArea(const CVector &pos, float radius, bool bRemov
 	for(int32 i = 0; i < pedPool->GetSize(); i++) {
 		CPed *pPed = pedPool->GetSlot(i);
 		if(pPed && !pPed->IsPlayer() && pPed->CanBeDeleted() &&
-		   CVector2D(pPed->GetPosition() - pos).MagnitudeSqr() < radius) {
+		   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() < radius &&
+		if(pVehicle && CVector2D(pVehicle->GetPosition() - pos).MagnitudeSqr() < SQR(radius) &&
 		   !pVehicle->bIsLocked && pVehicle->CanBeDeleted()) {
 			if(pVehicle->pDriver) {
 				CPopulation::RemovePed(pVehicle->pDriver);
@@ -659,8 +659,8 @@ CWorld::GetIsLineOfSightSectorListClear(CPtrList &list, const CColLine &line, bo
 }
 
 void
-CWorld::FindObjectsInRangeSectorList(CPtrList &list, Const CVector &centre, float radius, bool ignoreZ, short *nextObject,
-                                     short lastObject, CEntity **objects)
+CWorld::FindObjectsInRangeSectorList(CPtrList &list, Const CVector &centre, float radius, bool ignoreZ, int16 *numObjects,
+                                     int16 lastObject, CEntity **objects)
 {
 	float radiusSqr = radius * radius;
 	float objDistSqr;
@@ -676,16 +676,16 @@ CWorld::FindObjectsInRangeSectorList(CPtrList &list, Const CVector &centre, floa
 			else
 				objDistSqr = diff.MagnitudeSqr();
 
-			if(objDistSqr < radiusSqr && *nextObject < lastObject) {
-				if(objects) { objects[*nextObject] = object; }
-				(*nextObject)++;
+			if(objDistSqr < radiusSqr && *numObjects < lastObject) {
+				if(objects) { objects[*numObjects] = object; }
+				(*numObjects)++;
 			}
 		}
 	}
 }
 
 void
-CWorld::FindObjectsInRange(Const CVector &centre, float radius, bool ignoreZ, short *nextObject, short lastObject,
+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)
 {
@@ -711,39 +711,39 @@ CWorld::FindObjectsInRange(Const CVector &centre, float radius, bool ignoreZ, sh
 
 	AdvanceCurrentScanCode();
 
-	*nextObject = 0;
+	*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, nextObject, lastObject, objects);
+				                             ignoreZ, numObjects, lastObject, objects);
 				FindObjectsInRangeSectorList(sector->m_lists[ENTITYLIST_BUILDINGS_OVERLAP], centre,
-				                             radius, ignoreZ, nextObject, lastObject, objects);
+				                             radius, ignoreZ, numObjects, lastObject, objects);
 			}
 			if(checkVehicles) {
 				FindObjectsInRangeSectorList(sector->m_lists[ENTITYLIST_VEHICLES], centre, radius,
-				                             ignoreZ, nextObject, lastObject, objects);
+				                             ignoreZ, numObjects, lastObject, objects);
 				FindObjectsInRangeSectorList(sector->m_lists[ENTITYLIST_VEHICLES_OVERLAP], centre,
-				                             radius, ignoreZ, nextObject, lastObject, objects);
+				                             radius, ignoreZ, numObjects, lastObject, objects);
 			}
 			if(checkPeds) {
 				FindObjectsInRangeSectorList(sector->m_lists[ENTITYLIST_PEDS], centre, radius, ignoreZ,
-				                             nextObject, lastObject, objects);
+				                             numObjects, lastObject, objects);
 				FindObjectsInRangeSectorList(sector->m_lists[ENTITYLIST_PEDS_OVERLAP], centre, radius,
-				                             ignoreZ, nextObject, lastObject, objects);
+				                             ignoreZ, numObjects, lastObject, objects);
 			}
 			if(checkObjects) {
 				FindObjectsInRangeSectorList(sector->m_lists[ENTITYLIST_OBJECTS], centre, radius,
-				                             ignoreZ, nextObject, lastObject, objects);
+				                             ignoreZ, numObjects, lastObject, objects);
 				FindObjectsInRangeSectorList(sector->m_lists[ENTITYLIST_OBJECTS_OVERLAP], centre,
-				                             radius, ignoreZ, nextObject, lastObject, objects);
+				                             radius, ignoreZ, numObjects, lastObject, objects);
 			}
 			if(checkDummies) {
 				FindObjectsInRangeSectorList(sector->m_lists[ENTITYLIST_DUMMIES], centre, radius,
-				                             ignoreZ, nextObject, lastObject, objects);
+				                             ignoreZ, numObjects, lastObject, objects);
 				FindObjectsInRangeSectorList(sector->m_lists[ENTITYLIST_DUMMIES_OVERLAP], centre,
-				                             radius, ignoreZ, nextObject, lastObject, objects);
+				                             radius, ignoreZ, numObjects, lastObject, objects);
 			}
 		}
 	}
@@ -949,7 +949,11 @@ CWorld::TestSphereAgainstSectorList(CPtrList &list, CVector spherePos, float rad
 
 			if(e != entityToIgnore && e->bUsesCollision &&
 			   !(ignoreSomeObjects && CameraToIgnoreThisObject(e))) {
+#ifdef FIX_BUGS
+				CVector diff = spherePos - e->GetBoundCentre();
+#else
 				CVector diff = spherePos - e->GetPosition();
+#endif
 				float distance = diff.Magnitude();
 
 				if(e->GetBoundRadius() + radius > distance) {
@@ -1823,7 +1827,7 @@ void
 CWorld::RepositionOneObject(CEntity *pEntity)
 {
 	int16 modelId = pEntity->GetModelIndex();
-	if (IsTrafficLight(modelId) || IsTreeModel(modelId) || modelId == MI_PARKINGMETER ||
+	if (IsStreetLight(modelId) || IsTreeModel(modelId) || 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 ||

src/core/World.h

@@ -102,8 +102,8 @@ public:
 	
 	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&, Const CVector&, float, bool, short*, short, CEntity**);
-	static void FindObjectsInRange(Const CVector&, float, bool, short*, short, CEntity**, bool, bool, bool, bool, 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);

src/core/common.h

@@ -29,14 +29,14 @@
 #define STREAMFILE(str) (((rw::StreamFile*)(str))->file)
 #define HIERNODEINFO(hier) ((hier)->nodeInfo)
 #define HIERNODEID(hier, i) ((hier)->nodeInfo[i].id)
-#define HANIMFRAMES(anim) ((anim)->keyframes)
+#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 HANIMFRAMES(anim) ((anim)->pFrames)
+#define HANIMFRAME(anim, i) ((RwUInt8*)(anim)->pFrames + (i)*(anim)->interpInfo->keyFrameSize)
 #endif
 
 #ifdef RWHALFPIXEL
@@ -113,7 +113,7 @@ inline uint32 ldb(uint32 p, uint32 s, uint32 w)
 #define SCREEN_WIDTH ((float)RsGlobal.width)
 #define SCREEN_HEIGHT ((float)RsGlobal.height)
 #define SCREEN_ASPECT_RATIO (CDraw::GetAspectRatio())
-#define SCREEN_VIEWWINDOW (Tan(DEGTORAD(CDraw::GetFOV() * 0.5f)))
+#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)
@@ -416,7 +416,7 @@ inline T *WriteSaveBuf(uint8 *&buf, const T &value)
 	WriteSaveBuf(buf, b);\
 	WriteSaveBuf(buf, c);\
 	WriteSaveBuf(buf, d);\
-	WriteSaveBuf(buf, size);
+	WriteSaveBuf<uint32>(buf, size);
 
 #define CheckSaveHeader(buf,a,b,c,d,size)\
 	assert(ReadSaveBuf<char>(buf) == a);\

src/core/config.h

@@ -65,8 +65,6 @@ enum Config {
 	NUMATTRIBZONES = 288,
 	NUMZONEINDICES = 55000,
 
-	NUMHANDLINGS = 57,
-
 	PATHNODESIZE = 4500,
 
 	NUMWEATHERS = 4,
@@ -188,21 +186,20 @@ enum Config {
 #	define NO_CDCHECK
 #	define CHATTYSPLASH	// print what the game is loading
 #	define DEBUGMENU
-//#	define TIMEBARS		// print debug timers
+#	define TIMEBARS		// print debug timers
 #endif
 
 #define FIX_BUGS		// fixes bugs that we've came across during reversing, TODO: use this more
 #define TOGGLEABLE_BETA_FEATURES // toggleable from debug menu. not too many things
 #define MORE_LANGUAGES		// Add more translations to the game
+#define COMPATIBLE_SAVES // this allows changing structs while keeping saves compatible
+
+// Rendering/display
+#define ASPECT_RATIO_SCALE	// Not just makes everything scale with aspect ratio, also adds support for all aspect ratios
 #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 IMPROVED_VIDEOMODE	// save and load videomode parameters instead of a magic number
 //#define USE_TEXTURE_POOL
-#ifdef _WIN32
-#define AUDIO_MSS
-#else
-#define AUDIO_OAL
-#endif
 
 // Particle
 //#define PC_PARTICLE
@@ -219,7 +216,6 @@ enum Config {
 #define REGISTER_START_BUTTON
 
 // Hud, frontend and radar
-#define ASPECT_RATIO_SCALE	// Not just makes everything scale with aspect ratio, also adds support for all aspect ratios
 #define TRIANGULAR_BLIPS	// height indicating triangular radar blips, as in VC
 #define PS2_SAVE_DIALOG		// PS2 style save dialog with transparent black box
 // #define PS2_LIKE_MENU	// An effort to recreate PS2 menu, cycling through tabs, different bg etc.
@@ -229,13 +225,20 @@ enum Config {
 // #define CIRCLE_BACK_BUTTON
 #define HUD_ENHANCEMENTS	// Adjusts some aspects to make the HUD look/behave a little bit better.
 #define BETA_SLIDING_TEXT
+#define CUSTOM_FRONTEND_OPTIONS
 
 // Script
-#define USE_DEBUG_SCRIPT_LOADER	// makes game load main_freeroam.scm by default
+#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 MISSION_REPLAY // mobile feature
+//#define SIMPLIER_MISSIONS // apply simplifications from mobile
+#define USE_ADVANCED_SCRIPT_DEBUG_OUTPUT
+#define SCRIPT_LOG_FILE_LEVEL 1 // 0 == no log, 1 == overwrite every frame, 2 == full log
 
-#define COMPATIBLE_SAVES // this allows changing structs while keeping saves compatible
+#ifndef USE_ADVANCED_SCRIPT_DEBUG_OUTPUT
+#define USE_BASIC_SCRIPT_DEBUG_OUTPUT
+#endif
 
 // Replay
 //#define DONT_FIX_REPLAY_BUGS // keeps various bugs in CReplay, some of which are fairly cool!
@@ -257,5 +260,6 @@ enum Config {
 #define CANCELLABLE_CAR_ENTER
 
 // Camera
+//#define PS2_CAM_TRANSITION	// old way of transitioning between cam modes
 #define IMPROVED_CAMERA		// Better Debug cam, and maybe more in the future
 #define FREE_CAM		// Rotating cam

src/core/main.cpp

@@ -74,6 +74,9 @@ float FramesPerSecond = 30.0f;
 
 bool gbPrintShite = false;
 bool gbModelViewer;
+#ifdef TIMEBARS
+bool gbShowTimebars;
+#endif
 
 int32 frameCount;
 
@@ -96,7 +99,6 @@ void TheGame(void);
 void DebugMenuPopulate(void);
 #endif
 
-
 void
 ValidateVersion()
 {
@@ -138,9 +140,13 @@ DoRWStuffStartOfFrame(int16 TopRed, int16 TopGreen, int16 TopBlue, int16 BottomR
 	CRGBA TopColor(TopRed, TopGreen, TopBlue, Alpha);
 	CRGBA BottomColor(BottomRed, BottomGreen, BottomBlue, Alpha);
 
+#ifndef ASPECT_RATIO_SCALE
+	CameraSize(Scene.camera, nil, SCREEN_VIEWWINDOW, (CMenuManager::m_PrefsUseWideScreen ? 16.f / 9.f : 4.f / 3.f));
+#else
 	CameraSize(Scene.camera, nil, SCREEN_VIEWWINDOW, SCREEN_ASPECT_RATIO);
+#endif
 	CVisibilityPlugins::SetRenderWareCamera(Scene.camera);
-	RwCameraClear(Scene.camera, &gColourTop, rwCAMERACLEARZ);
+	RwCameraClear(Scene.camera, &TopColor.rwRGBA, rwCAMERACLEARZ);
 
 	if(!RsCameraBeginUpdate(Scene.camera))
 		return false;
@@ -156,7 +162,11 @@ DoRWStuffStartOfFrame(int16 TopRed, int16 TopGreen, int16 TopBlue, int16 BottomR
 bool
 DoRWStuffStartOfFrame_Horizon(int16 TopRed, int16 TopGreen, int16 TopBlue, int16 BottomRed, int16 BottomGreen, int16 BottomBlue, int16 Alpha)
 {
+#ifndef ASPECT_RATIO_SCALE
+	CameraSize(Scene.camera, nil, SCREEN_VIEWWINDOW, (CMenuManager::m_PrefsUseWideScreen ? 16.f/9.f : 4.f/3.f));
+#else
 	CameraSize(Scene.camera, nil, SCREEN_VIEWWINDOW, SCREEN_ASPECT_RATIO);
+#endif
 	CVisibilityPlugins::SetRenderWareCamera(Scene.camera);
 	RwCameraClear(Scene.camera, &gColourTop, rwCAMERACLEARZ);
 
@@ -342,7 +352,7 @@ PluginAttach(void)
 static RwBool 
 Initialise3D(void *param)
 {
-	if (RsRwInitialise(param))
+	if (RsRwInitialize(param))
 	{
 #ifdef DEBUGMENU
 		DebugMenuInit();
@@ -1118,8 +1128,10 @@ Idle(void *arg)
 #endif
 	CCredits::Render();
 
+
 #ifdef TIMEBARS
-	tbDisplay();
+	if (gbShowTimebars)
+		tbDisplay();
 #endif
 
 	DoRWStuffEndOfFrame();
@@ -1175,10 +1187,10 @@ AppEventHandler(RsEvent event, void *param)
 {
 	switch( event )
 	{
-		case rsINITIALISE:
+		case rsINITIALIZE:
 		{
 			CGame::InitialiseOnceBeforeRW();
-			return RsInitialise() ? rsEVENTPROCESSED : rsEVENTERROR;
+			return RsInitialize() ? rsEVENTPROCESSED : rsEVENTERROR;
 		}
 
 		case rsCAMERASIZE:
@@ -1190,7 +1202,7 @@ AppEventHandler(RsEvent event, void *param)
 			return rsEVENTPROCESSED;
 		}
 
-		case rsRWINITIALISE:
+		case rsRWINITIALIZE:
 		{
 			return Initialise3D(param) ? rsEVENTPROCESSED : rsEVENTERROR;
 		}

src/core/main.h

@@ -14,6 +14,9 @@ extern wchar gUString[256];
 extern wchar gUString2[256];
 extern bool gbPrintShite;
 extern bool gbModelViewer;
+#ifdef TIMEBARS
+extern bool gbShowTimebars;
+#endif
 
 class CSprite2d;
 

src/core/re3.cpp

@@ -27,6 +27,9 @@
 #include "Radar.h"
 #include "debugmenu.h"
 #include "Frontend.h"
+#include "Text.h"
+#include "WaterLevel.h"
+#include "main.h"
 
 #ifndef _WIN32
 #include "assert.h"
@@ -66,6 +69,100 @@ mysrand(unsigned int seed)
 	myrand_seed = seed;
 }
 
+#ifdef CUSTOM_FRONTEND_OPTIONS
+#include "frontendoption.h"
+#include "platform.h"
+
+void ReloadFrontendOptions(void)
+{
+	RemoveCustomFrontendOptions();
+	CustomFrontendOptionsPopulate();
+}
+
+#ifdef MORE_LANGUAGES
+void LangPolSelect(int8 action)
+{
+	if (action == FEOPTION_ACTION_SELECT) {
+		FrontEndMenuManager.m_PrefsLanguage = LANGUAGE_POLISH;
+		FrontEndMenuManager.m_bFrontEnd_ReloadObrTxtGxt = true;
+		FrontEndMenuManager.InitialiseChangedLanguageSettings();
+		FrontEndMenuManager.SaveSettings();
+	}
+}
+
+void LangRusSelect(int8 action)
+{
+	if (action == FEOPTION_ACTION_SELECT) {
+		FrontEndMenuManager.m_PrefsLanguage = LANGUAGE_RUSSIAN;
+		FrontEndMenuManager.m_bFrontEnd_ReloadObrTxtGxt = true;
+		FrontEndMenuManager.InitialiseChangedLanguageSettings();
+		FrontEndMenuManager.SaveSettings();
+	}
+}
+
+void LangJapSelect(int8 action)
+{
+	if (action == FEOPTION_ACTION_SELECT) {
+		FrontEndMenuManager.m_PrefsLanguage = LANGUAGE_JAPANESE;
+		FrontEndMenuManager.m_bFrontEnd_ReloadObrTxtGxt = true;
+		FrontEndMenuManager.InitialiseChangedLanguageSettings();
+		FrontEndMenuManager.SaveSettings();
+	}
+}
+#endif
+
+#ifdef IMPROVED_VIDEOMODE
+void ScreenModeChange(int8 displayedValue)
+{
+	if (displayedValue != FrontEndMenuManager.m_nPrefsWindowed) {
+		FrontEndMenuManager.m_nPrefsWindowed = displayedValue;
+		_psSelectScreenVM(FrontEndMenuManager.m_nPrefsVideoMode); // apply same resolution
+		FrontEndMenuManager.SetHelperText(0);
+		FrontEndMenuManager.SaveSettings();
+	}
+}
+#endif
+
+#ifdef FREE_CAM
+void ToggleFreeCam(int8 action)
+{
+	if (action == FEOPTION_ACTION_SELECT) {
+		TheCamera.bFreeCam = !TheCamera.bFreeCam;
+		FrontEndMenuManager.SaveSettings();
+	}
+}
+#endif
+
+// Reloaded on language change, so you can use hardcoded wchar* and TheText.Get with peace of mind
+void
+CustomFrontendOptionsPopulate(void)
+{
+#ifdef MORE_LANGUAGES
+	FrontendOptionSetPosition(MENUPAGE_LANGUAGE_SETTINGS);
+	FrontendOptionAddDynamic(TheText.Get("FEL_POL"), nil, LangPolSelect, nil);
+	FrontendOptionAddDynamic(TheText.Get("FEL_RUS"), nil, LangRusSelect, nil);
+	FrontendOptionAddDynamic(TheText.Get("FEL_JAP"), nil, LangJapSelect, nil);
+#endif
+
+#ifdef IMPROVED_VIDEOMODE
+	static const wchar *screenModes[] = { (wchar*)L"FULLSCREEN", (wchar*)L"WINDOWED" };
+	FrontendOptionSetPosition(MENUPAGE_GRAPHICS_SETTINGS, 8);
+	FrontendOptionAddSelect(TheText.Get("SCRFOR"), screenModes, 2, (int8*)&FrontEndMenuManager.m_nPrefsWindowed, true, ScreenModeChange, nil);
+#endif
+
+#ifdef MENU_MAP
+	FrontendOptionSetPosition(MENUPAGE_PAUSE_MENU, 2);
+	FrontendOptionAddRedirect(TheText.Get("FEG_MAP"), MENUPAGE_MAP);
+#endif
+
+#ifdef FREE_CAM
+	static const wchar *text = (wchar*)L"TOGGLE FREE CAM";
+	FrontendOptionSetPosition(MENUPAGE_CONTROLLER_PC, 1);
+	FrontendOptionAddDynamic(text, nil, ToggleFreeCam, nil);
+#endif
+}
+#endif
+
 #ifdef DEBUGMENU
 void WeaponCheat();
 void HealthCheat();
@@ -160,6 +257,13 @@ TeleportToWaypoint(void)
 }
 #endif
 
+static void
+SwitchCarCollision(void)
+{
+	if (FindPlayerVehicle() && FindPlayerVehicle()->IsCar())
+		FindPlayerVehicle()->bUsesCollision = !FindPlayerVehicle()->bUsesCollision;
+}
+
 static int engineStatus;
 static void
 SetEngineStatus(void)
@@ -357,11 +461,14 @@ DebugMenuPopulate(void)
 		DebugMenuAddVarBool8("Render", "Don't render Peds", &gbDontRenderPeds, nil);
 		DebugMenuAddVarBool8("Render", "Don't render Vehicles", &gbDontRenderVehicles, nil);
 		DebugMenuAddVarBool8("Render", "Don't render Objects", &gbDontRenderObjects, nil);
+		DebugMenuAddVarBool8("Render", "Don't Render Water", &gbDontRenderWater, nil);
 
+		DebugMenuAddVarBool8("Debug", "pad 1 -> pad 2", &CPad::m_bMapPadOneToPadTwo, nil);
 		DebugMenuAddVarBool8("Debug", "Edit on", &CSceneEdit::m_bEditOn, nil);
 #ifdef MENU_MAP
 		DebugMenuAddCmd("Debug", "Teleport to map waypoint", TeleportToWaypoint);
 #endif
+		DebugMenuAddCmd("Debug", "Switch car collision", SwitchCarCollision);
 		DebugMenuAddVar("Debug", "Engine Status", &engineStatus, nil, 1, 0, 226, nil);
 		DebugMenuAddCmd("Debug", "Set Engine Status", SetEngineStatus);
 		DebugMenuAddCmd("Debug", "Fix Car", FixCar);
@@ -374,6 +481,9 @@ DebugMenuPopulate(void)
 		DebugMenuAddCmd("Debug", "Catalina Fly Away", CHeli::MakeCatalinaHeliFlyAway);
 		DebugMenuAddVarBool8("Debug", "Script Heli On", &CHeli::ScriptHeliOn, nil);
 
+#ifdef CUSTOM_FRONTEND_OPTIONS
+		DebugMenuAddCmd("Debug", "Reload custom frontend options", ReloadFrontendOptions);
+#endif
 #ifdef TOGGLEABLE_BETA_FEATURES
 		DebugMenuAddVarBool8("Debug", "Toggle popping heads on headshot", &CPed::bPopHeadsOnHeadshot, nil);
 		DebugMenuAddVarBool8("Debug", "Toggle peds running to phones to report crimes", &CPed::bMakePedsRunToPhonesToReportCrimes, nil);
@@ -382,6 +492,11 @@ DebugMenuPopulate(void)
 		DebugMenuAddCmd("Debug", "Start Credits", CCredits::Start);
 		DebugMenuAddCmd("Debug", "Stop Credits", CCredits::Stop);
 
+		DebugMenuAddVarBool8("Debug", "Show DebugStuffInRelease", &gbDebugStuffInRelease, nil);
+#ifdef TIMEBARS
+		DebugMenuAddVarBool8("Debug", "Show Timebars", &gbShowTimebars, nil);
+#endif
+
 		extern bool PrintDebugCode;
 		extern int16 DebugCamMode;
 		DebugMenuAddVarBool8("Cam", "Use mouse Cam", &CCamera::m_bUseMouse3rdPerson, nil);