8 files changed, 23 insertions, 7 deletions
diff --git a/src/core/Cam.cpp b/src/core/Cam.cpp
index 1c74598c..fe2c250f 100644
--- a/src/core/Cam.cpp
+++ b/src/core/Cam.cpp
@@ -3778,7 +3778,7 @@ CCam::Process_Debug(const CVector&, float, float, float)
 		if(FindPlayerVehicle())
 			FindPlayerVehicle()->Teleport(Source);
 		else
-			CWorld::Players[CWorld::PlayerInFocus].m_pPed->SetPosition(Source);	
+			CWorld::Players[CWorld::PlayerInFocus].m_pPed->SetPosition(Source);
 	}
 
 	// stay inside sectors
@@ -3845,8 +3845,7 @@ CCam::Process_Debug(const CVector&, float, float, float)
 		if(FindPlayerVehicle())
 			FindPlayerVehicle()->Teleport(Source);
 		else
-			CWorld::Players[CWorld::PlayerInFocus].m_pPed->GetPosition() = Source;
-			
+			CWorld::Players[CWorld::PlayerInFocus].m_pPed->SetPosition(Source);
 	}
 
 	// stay inside sectors
diff --git a/src/core/Camera.h b/src/core/Camera.h
index 18144ef5..669ac740 100644
--- a/src/core/Camera.h
+++ b/src/core/Camera.h
@@ -382,6 +382,7 @@ public:
 	bool m_WideScreenOn;
 	bool m_1rstPersonRunCloseToAWall;
 	bool m_bHeadBob;
+	bool m_bVehicleSuspenHigh;
 	bool m_bFailedCullZoneTestPreviously;
 
 	bool m_FadeTargetIsSplashScreen;
diff --git a/src/core/Pad.cpp b/src/core/Pad.cpp
index 89b3f053..d309d469 100644
--- a/src/core/Pad.cpp
+++ b/src/core/Pad.cpp
@@ -321,6 +321,12 @@ void RenderWaterLayersCheat(void)
 			CWaterLevel::m_nRenderWaterLayers = 0;
 }
 
+void BackToTheFuture(void)
+{
+	CHud::SetHelpMessage(TheText.Get("CHEAT1"), true);
+	CVehicle::bHoverCheat = !CVehicle::bHoverCheat;
+}
+
 
 //////////////////////////////////////////////////////////////////////////
 
@@ -1080,7 +1086,11 @@ void CPad::AddToPCCheatString(char c)
 	if (!_CHEATCMP("TAEHCSREYALRETAW"))
 		RenderWaterLayersCheat();
 #endif
-	
+
+	// SEAWAYS
+	if (!_CHEATCMP("SYAWAES"))
+		BackToTheFuture();
+
 	#undef _CHEATCMP
 }
 
diff --git a/src/core/PlayerInfo.h b/src/core/PlayerInfo.h
index dfe6a53e..11f51ac0 100644
--- a/src/core/PlayerInfo.h
+++ b/src/core/PlayerInfo.h
@@ -49,6 +49,7 @@ public:
 	uint32 m_nTimeLastHealthLoss;
 	uint32 m_nTimeLastArmourLoss;
 	uint32 m_nTimeTankShotGun;
+	int32 m_nTimeNotFullyOnGround;
 	int32 m_nUpsideDownCounter;
 	int32 field_248;
 	int16 m_nTrafficMultiplier;
diff --git a/src/core/Stats.cpp b/src/core/Stats.cpp
index 34fc41d1..91f583bd 100644
--- a/src/core/Stats.cpp
+++ b/src/core/Stats.cpp
@@ -67,6 +67,7 @@ float CStats::AutoPaintingBudget;
 int32 CStats::NoMoreHurricanes;
 float CStats::FashionBudget;
 int32 CStats::SafeHouseVisits;
+int32 CStats::TyresPopped;
 
 void CStats::Init()
 {
diff --git a/src/core/Stats.h b/src/core/Stats.h
index 485bdccf..33d4ef72 100644
--- a/src/core/Stats.h
+++ b/src/core/Stats.h
@@ -71,6 +71,7 @@ public:
 	static int32 NoMoreHurricanes;
 	static float FashionBudget;
 	static int32 SafeHouseVisits;
+	static int32 TyresPopped;
 
 public:
 	static void Init(void);
diff --git a/src/core/config.h b/src/core/config.h
index 6744e888..dd68f296 100644
--- a/src/core/config.h
+++ b/src/core/config.h
@@ -41,7 +41,7 @@ enum Config {
 	NUMANIMBLOCKS = 35,
 	NUMANIMATIONS = 450,
 
-	NUMTEMPOBJECTS = 30,
+	NUMTEMPOBJECTS = 40,
 
 	// Path data
 	NUM_PATHNODES = 9650,
@@ -208,7 +208,7 @@ enum Config {
 #define RELOADABLES			// some debug menu options to reload TXD files
 #endif
 
-#define PC_WATER
+//#define PC_WATER
 #define WATER_CHEATS
 
 // Particle
diff --git a/src/core/re3.cpp b/src/core/re3.cpp
index 54077e6f..d02bd9b0 100644
--- a/src/core/re3.cpp
+++ b/src/core/re3.cpp
@@ -335,15 +335,18 @@ DebugMenuPopulate(void)
 		DebugMenuAddCmd("Spawn", "Spawn Stinger", [](){ SpawnCar(MI_STINGER); });
 		DebugMenuAddCmd("Spawn", "Spawn Infernus", [](){ SpawnCar(MI_INFERNUS); });
 		DebugMenuAddCmd("Spawn", "Spawn Cheetah", [](){ SpawnCar(MI_CHEETAH); });
+		DebugMenuAddCmd("Spawn", "Spawn Phoenix", [](){ SpawnCar(MI_PHEONIX); });
+		DebugMenuAddCmd("Spawn", "Spawn Banshee", [](){ SpawnCar(MI_BANSHEE); });
 		DebugMenuAddCmd("Spawn", "Spawn Esperanto", [](){ SpawnCar(MI_ESPERANT); });
 		DebugMenuAddCmd("Spawn", "Spawn Stallion", [](){ SpawnCar(MI_STALLION); });
+		DebugMenuAddCmd("Spawn", "Spawn Admiral", [](){ SpawnCar(MI_ADMIRAL); });
 		DebugMenuAddCmd("Spawn", "Spawn Washington", [](){ SpawnCar(MI_WASHING); });
 		DebugMenuAddCmd("Spawn", "Spawn Taxi", [](){ SpawnCar(MI_TAXI); });
 		DebugMenuAddCmd("Spawn", "Spawn Police", [](){ SpawnCar(MI_POLICE); });
 		DebugMenuAddCmd("Spawn", "Spawn Enforcer", [](){ SpawnCar(MI_ENFORCER); });
-		DebugMenuAddCmd("Spawn", "Spawn Banshee", [](){ SpawnCar(MI_BANSHEE); });
 		DebugMenuAddCmd("Spawn", "Spawn Cuban", [](){ SpawnCar(MI_CUBAN); });
 		DebugMenuAddCmd("Spawn", "Spawn Voodoo", [](){ SpawnCar(MI_VOODOO); });
+		DebugMenuAddCmd("Spawn", "Spawn BF injection", [](){ SpawnCar(MI_BFINJECT); });
 		DebugMenuAddCmd("Spawn", "Spawn Maverick", [](){ SpawnCar(MI_MAVERICK); });
 		DebugMenuAddCmd("Spawn", "Spawn VCN Maverick", [](){ SpawnCar(MI_VCNMAV); });
 		DebugMenuAddCmd("Spawn", "Spawn Sparrow", [](){ SpawnCar(MI_SPARROW); });