the great reorganization

150 files changed, 44 insertions, 36 deletions

diff --git a/premake5.lua b/premake5.lua
index cbd4c7f9..6966ec16 100644
--- a/premake5.lua
+++ b/premake5.lua
@@ -3,30 +3,39 @@ workspace "re3"
 	location "build"
 
 	files { "src/*.*" }
-	files { "src/skel/*.*" }
-	files { "src/skel/win/*.*" }
+	files { "src/animation/*.*" }
+	files { "src/audio/*.*" }
+	files { "src/control/*.*" }
+	files { "src/core/*.*" }
+	files { "src/entities/*.*" }
 	files { "src/math/*.*" }
 	files { "src/modelinfo/*.*" }
-	files { "src/entities/*.*" }
-	files { "src/weapons/*.*" }
+	files { "src/objects/*.*" }
+	files { "src/peds/*.*" }
 	files { "src/render/*.*" }
-	files { "src/control/*.*" }
-	files { "src/animation/*.*" }
-	files { "src/audio/*.*" }
+	files { "src/skel/*.*" }
+	files { "src/skel/win/*.*" }
+	files { "src/vehicles/*.*" }
+	files { "src/weapons/*.*" }
 
 	includedirs { "src" }
+	includedirs { "src/animation" }
+	includedirs { "src/audio" }
+	includedirs { "src/control" }
+	includedirs { "src/core" }
+	includedirs { "src/entities" }
+	includedirs { "src/modelinfo" }
+	includedirs { "src/objects" }
+	includedirs { "src/peds" }
+	includedirs { "src/render" }
 	includedirs { "src/skel/" }
 	includedirs { "src/skel/win" }
-	includedirs { "src/modelinfo" }
-	includedirs { "src/entities" }
+	includedirs { "src/vehicles" }
 	includedirs { "src/weapons" }
-	includedirs { "src/render" }
-	includedirs { "src/control" }
-	includedirs { "src/audio" }
-	includedirs { "src/animation" }
+
 	includedirs { "dxsdk/include" }
 	includedirs { "rwsdk/include/d3d8" }
-	
+
 	libdirs { "dxsdk/lib" }
 
 project "re3"
diff --git a/src/control/PhoneInfo.cpp b/src/control/Phones.cpp
index dbb7acc5..fa4f83e5 100644
--- a/src/control/PhoneInfo.cpp
+++ b/src/control/Phones.cpp
@@ -1,6 +1,6 @@
 #include "common.h"
 #include "patcher.h"
-#include "PhoneInfo.h"
+#include "Phones.h"
 
 WRAPPER void PhonePutDownCB(CAnimBlendAssociation *assoc, void *arg) { EAXJMP(0x42F570); }
-WRAPPER void PhonePickUpCB(CAnimBlendAssociation *assoc, void *arg) { EAXJMP(0x42F470); }
\ No newline at end of file
+WRAPPER void PhonePickUpCB(CAnimBlendAssociation *assoc, void *arg) { EAXJMP(0x42F470); }
diff --git a/src/control/PhoneInfo.h b/src/control/Phones.h
index a29043ed..a29043ed 100644
--- a/src/control/PhoneInfo.h
+++ b/src/control/Phones.h
diff --git a/src/control/Replay.cpp b/src/control/Replay.cpp
index e166e6b5..06995663 100644
--- a/src/control/Replay.cpp
+++ b/src/control/Replay.cpp
@@ -16,7 +16,7 @@
 #include "ModelInfo.h"
 #include "Object.h"
 #include "Pad.h"
-#include "PhoneInfo.h"
+#include "Phones.h"
 #include "Pickups.h"
 #include "Plane.h"
 #include "Pools.h"
@@ -638,7 +638,7 @@ void CReplay::StoreCarUpdate(CVehicle *vehicle, int id)
 	if (vehicle->IsCar()){
 		CAutomobile* car = (CAutomobile*)vehicle;
 		for (int i = 0; i < 4; i++){
-			vp->wheel_susp_dist[i] = 50.0f * car->m_aWheelDist[i];
+			vp->wheel_susp_dist[i] = 50.0f * car->m_aSuspensionSpringRatio[i];
 			vp->wheel_rotation[i] = 128.0f / M_PI * car->m_aWheelRotation[i];
 		}
 		vp->door_angles[0] = 127.0f / M_PI * car->Doors[2].m_fAngle;
@@ -683,7 +683,7 @@ void CReplay::ProcessCarUpdate(CVehicle *vehicle, float interpolation, CAddressI
 	if (vehicle->IsCar()) {
 		CAutomobile* car = (CAutomobile*)vehicle;
 		for (int i = 0; i < 4; i++) {
-			car->m_aWheelDist[i] = vp->wheel_susp_dist[i] / 50.0f;
+			car->m_aSuspensionSpringRatio[i] = vp->wheel_susp_dist[i] / 50.0f;
 			car->m_aWheelRotation[i] = vp->wheel_rotation[i] * M_PI / 128.0f;
 		}
 		car->Doors[2].m_fAngle = car->Doors[2].m_fPreviousAngle = vp->door_angles[0] * M_PI / 127.0f;
diff --git a/src/Camera.cpp b/src/core/Camera.cpp
index d7ee398b..660be333 100644
--- a/src/Camera.cpp
+++ b/src/core/Camera.cpp
@@ -8,7 +8,7 @@
 #include "PlayerPed.h"
 #include "Pad.h"
 #include "General.h"
-#include "CullZones.h"
+#include "ZoneCull.h"
 #include "SurfaceTable.h"
 #include "MBlur.h"
 #include "Camera.h"
diff --git a/src/Camera.h b/src/core/Camera.h
index 84c3060b..84c3060b 100644
--- a/src/Camera.h
+++ b/src/core/Camera.h
diff --git a/src/CdStream.cpp b/src/core/CdStream.cpp
index 255e46bb..255e46bb 100644
--- a/src/CdStream.cpp
+++ b/src/core/CdStream.cpp
diff --git a/src/CdStream.h b/src/core/CdStream.h
index 55507aa8..55507aa8 100644
--- a/src/CdStream.h
+++ b/src/core/CdStream.h
diff --git a/src/Clock.cpp b/src/core/Clock.cpp
index 707b0e57..707b0e57 100644
--- a/src/Clock.cpp
+++ b/src/core/Clock.cpp
diff --git a/src/Clock.h b/src/core/Clock.h
index e11b2293..e11b2293 100644
--- a/src/Clock.h
+++ b/src/core/Clock.h
diff --git a/src/Collision.cpp b/src/core/Collision.cpp
index 62b27eff..d15ccca5 100644
--- a/src/Collision.cpp
+++ b/src/core/Collision.cpp
@@ -5,7 +5,7 @@
 #include "Game.h"
 #include "Zones.h"
 #include "General.h"
-#include "CullZones.h"
+#include "ZoneCull.h"
 #include "World.h"
 #include "Entity.h"
 #include "Train.h"
diff --git a/src/Collision.h b/src/core/Collision.h
index 5a9058d3..5a9058d3 100644
--- a/src/Collision.h
+++ b/src/core/Collision.h
diff --git a/src/ControllerConfig.cpp b/src/core/ControllerConfig.cpp
index d7567ac4..d7567ac4 100644
--- a/src/ControllerConfig.cpp
+++ b/src/core/ControllerConfig.cpp
diff --git a/src/ControllerConfig.h b/src/core/ControllerConfig.h
index 581efe05..581efe05 100644
--- a/src/ControllerConfig.h
+++ b/src/core/ControllerConfig.h
diff --git a/src/CutsceneMgr.cpp b/src/core/CutsceneMgr.cpp
index 744ef53d..744ef53d 100644
--- a/src/CutsceneMgr.cpp
+++ b/src/core/CutsceneMgr.cpp
diff --git a/src/CutsceneMgr.h b/src/core/CutsceneMgr.h
index 89f6ab8d..89f6ab8d 100644
--- a/src/CutsceneMgr.h
+++ b/src/core/CutsceneMgr.h
diff --git a/src/Directory.cpp b/src/core/Directory.cpp
index 3e0d5382..3e0d5382 100644
--- a/src/Directory.cpp
+++ b/src/core/Directory.cpp
diff --git a/src/Directory.h b/src/core/Directory.h
index 06e6bba4..06e6bba4 100644
--- a/src/Directory.h
+++ b/src/core/Directory.h
diff --git a/src/FileLoader.cpp b/src/core/FileLoader.cpp
index d87964ac..fdc3b9d7 100644
--- a/src/FileLoader.cpp
+++ b/src/core/FileLoader.cpp
@@ -21,7 +21,7 @@
 #include "DummyObject.h"
 #include "World.h"
 #include "Zones.h"
-#include "CullZones.h"
+#include "ZoneCull.h"
 #include "CdStream.h"
 #include "FileLoader.h"
 
diff --git a/src/FileLoader.h b/src/core/FileLoader.h
index f9121ace..f9121ace 100644
--- a/src/FileLoader.h
+++ b/src/core/FileLoader.h
diff --git a/src/FileMgr.cpp b/src/core/FileMgr.cpp
index 954fcdef..954fcdef 100644
--- a/src/FileMgr.cpp
+++ b/src/core/FileMgr.cpp
diff --git a/src/FileMgr.h b/src/core/FileMgr.h
index bab86e38..bab86e38 100644
--- a/src/FileMgr.h
+++ b/src/core/FileMgr.h
diff --git a/src/Fire.cpp b/src/core/Fire.cpp
index 05d72199..05d72199 100644
--- a/src/Fire.cpp
+++ b/src/core/Fire.cpp
diff --git a/src/Fire.h b/src/core/Fire.h
index c7f83fd8..c7f83fd8 100644
--- a/src/Fire.h
+++ b/src/core/Fire.h
diff --git a/src/Frontend.cpp b/src/core/Frontend.cpp
index fdb2420b..fdb2420b 100644
--- a/src/Frontend.cpp
+++ b/src/core/Frontend.cpp
diff --git a/src/Frontend.h b/src/core/Frontend.h
index 9b9377da..9b9377da 100644
--- a/src/Frontend.h
+++ b/src/core/Frontend.h
diff --git a/src/Game.cpp b/src/core/Game.cpp
index cbd55c48..cbd55c48 100644
--- a/src/Game.cpp
+++ b/src/core/Game.cpp
diff --git a/src/Game.h b/src/core/Game.h
index 3bc3e633..3bc3e633 100644
--- a/src/Game.h
+++ b/src/core/Game.h
diff --git a/src/General.h b/src/core/General.h
index cae1caa0..cae1caa0 100644
--- a/src/General.h
+++ b/src/core/General.h
diff --git a/src/Lists.cpp b/src/core/Lists.cpp
index 448a0ff1..448a0ff1 100644
--- a/src/Lists.cpp
+++ b/src/core/Lists.cpp
diff --git a/src/Lists.h b/src/core/Lists.h
index 7572e882..7572e882 100644
--- a/src/Lists.h
+++ b/src/core/Lists.h
diff --git a/src/MenuScreens.h b/src/core/MenuScreens.h
index 2da81f1d..2da81f1d 100644
--- a/src/MenuScreens.h
+++ b/src/core/MenuScreens.h
diff --git a/src/Messages.cpp b/src/core/Messages.cpp
index 7fc23593..7fc23593 100644
--- a/src/Messages.cpp
+++ b/src/core/Messages.cpp
diff --git a/src/Messages.h b/src/core/Messages.h
index 69cf117c..69cf117c 100644
--- a/src/Messages.h
+++ b/src/core/Messages.h
diff --git a/src/NodeName.cpp b/src/core/NodeName.cpp
index 2aea3c83..2aea3c83 100644
--- a/src/NodeName.cpp
+++ b/src/core/NodeName.cpp
diff --git a/src/NodeName.h b/src/core/NodeName.h
index 1a3e057b..1a3e057b 100644
--- a/src/NodeName.h
+++ b/src/core/NodeName.h
diff --git a/src/PCSave.cpp b/src/core/PCSave.cpp
index 628e1218..628e1218 100644
--- a/src/PCSave.cpp
+++ b/src/core/PCSave.cpp
diff --git a/src/PCSave.h b/src/core/PCSave.h
index 696e158a..696e158a 100644
--- a/src/PCSave.h
+++ b/src/core/PCSave.h
diff --git a/src/Pad.cpp b/src/core/Pad.cpp
index 002e7180..002e7180 100644
--- a/src/Pad.cpp
+++ b/src/core/Pad.cpp
diff --git a/src/Pad.h b/src/core/Pad.h
index 30cdb8df..30cdb8df 100644
--- a/src/Pad.h
+++ b/src/core/Pad.h
diff --git a/src/Placeable.cpp b/src/core/Placeable.cpp
index b4b2a37b..b4b2a37b 100644
--- a/src/Placeable.cpp
+++ b/src/core/Placeable.cpp
diff --git a/src/Placeable.h b/src/core/Placeable.h
index 868ca9e7..868ca9e7 100644
--- a/src/Placeable.h
+++ b/src/core/Placeable.h
diff --git a/src/entities/PlayerInfo.cpp b/src/core/PlayerInfo.cpp
index 59efe2ae..59efe2ae 100644
--- a/src/entities/PlayerInfo.cpp
+++ b/src/core/PlayerInfo.cpp
diff --git a/src/entities/PlayerInfo.h b/src/core/PlayerInfo.h
index e2b42fe7..e2b42fe7 100644
--- a/src/entities/PlayerInfo.h
+++ b/src/core/PlayerInfo.h
diff --git a/src/entities/PlayerSkin.cpp b/src/core/PlayerSkin.cpp
index 1c9ca2c6..1c9ca2c6 100644
--- a/src/entities/PlayerSkin.cpp
+++ b/src/core/PlayerSkin.cpp
diff --git a/src/entities/PlayerSkin.h b/src/core/PlayerSkin.h
index 61e09cdf..61e09cdf 100644
--- a/src/entities/PlayerSkin.h
+++ b/src/core/PlayerSkin.h
diff --git a/src/Pools.cpp b/src/core/Pools.cpp
index f7f93292..f7f93292 100644
--- a/src/Pools.cpp
+++ b/src/core/Pools.cpp
diff --git a/src/Pools.h b/src/core/Pools.h
index 3496064c..3496064c 100644
--- a/src/Pools.h
+++ b/src/core/Pools.h
diff --git a/src/Radar.cpp b/src/core/Radar.cpp
index a071b96b..a071b96b 100644
--- a/src/Radar.cpp
+++ b/src/core/Radar.cpp
diff --git a/src/Radar.h b/src/core/Radar.h
index e5396a50..e5396a50 100644
--- a/src/Radar.h
+++ b/src/core/Radar.h
diff --git a/src/References.cpp b/src/core/References.cpp
index e87f0fd5..e87f0fd5 100644
--- a/src/References.cpp
+++ b/src/core/References.cpp
diff --git a/src/References.h b/src/core/References.h
index 6476e243..6476e243 100644
--- a/src/References.h
+++ b/src/core/References.h
diff --git a/src/RwClumpRead.cpp b/src/core/RwClumpRead.cpp
index c9f027e7..c9f027e7 100644
--- a/src/RwClumpRead.cpp
+++ b/src/core/RwClumpRead.cpp
diff --git a/src/RwHelper.cpp b/src/core/RwHelper.cpp
index 8dade266..8dade266 100644
--- a/src/RwHelper.cpp
+++ b/src/core/RwHelper.cpp
diff --git a/src/RwHelper.h b/src/core/RwHelper.h
index ef20467d..ef20467d 100644
--- a/src/RwHelper.h
+++ b/src/core/RwHelper.h
diff --git a/src/RwMatFX.cpp b/src/core/RwMatFX.cpp
index 5fd00c54..5fd00c54 100644
--- a/src/RwMatFX.cpp
+++ b/src/core/RwMatFX.cpp
diff --git a/src/RwTexRead.cpp b/src/core/RwTexRead.cpp
index a1a7050a..a1a7050a 100644
--- a/src/RwTexRead.cpp
+++ b/src/core/RwTexRead.cpp
diff --git a/src/Stats.cpp b/src/core/Stats.cpp
index 3c5b55e4..3c5b55e4 100644
--- a/src/Stats.cpp
+++ b/src/core/Stats.cpp
diff --git a/src/Stats.h b/src/core/Stats.h
index 39b0e184..39b0e184 100644
--- a/src/Stats.h
+++ b/src/core/Stats.h
diff --git a/src/Streaming.cpp b/src/core/Streaming.cpp
index 08fd80f0..f8ab19d4 100644
--- a/src/Streaming.cpp
+++ b/src/core/Streaming.cpp
@@ -16,7 +16,7 @@
 #include "FileMgr.h"
 #include "FileLoader.h"
 #include "Zones.h"
-#include "CullZones.h"
+#include "ZoneCull.h"
 #include "Radar.h"
 #include "Camera.h"
 #include "Record.h"
diff --git a/src/Streaming.h b/src/core/Streaming.h
index 212a6d71..212a6d71 100644
--- a/src/Streaming.h
+++ b/src/core/Streaming.h
diff --git a/src/SurfaceTable.cpp b/src/core/SurfaceTable.cpp
index 2ba884b1..2ba884b1 100644
--- a/src/SurfaceTable.cpp
+++ b/src/core/SurfaceTable.cpp
diff --git a/src/SurfaceTable.h b/src/core/SurfaceTable.h
index e1882e69..e1882e69 100644
--- a/src/SurfaceTable.h
+++ b/src/core/SurfaceTable.h
diff --git a/src/TempColModels.cpp b/src/core/TempColModels.cpp
index a323d7c9..a323d7c9 100644
--- a/src/TempColModels.cpp
+++ b/src/core/TempColModels.cpp
diff --git a/src/TempColModels.h b/src/core/TempColModels.h
index 8ac74428..8ac74428 100644
--- a/src/TempColModels.h
+++ b/src/core/TempColModels.h
diff --git a/src/Text.cpp b/src/core/Text.cpp
index d7d63467..d7d63467 100644
--- a/src/Text.cpp
+++ b/src/core/Text.cpp
diff --git a/src/Text.h b/src/core/Text.h
index 2592e6b8..2592e6b8 100644
--- a/src/Text.h
+++ b/src/core/Text.h
diff --git a/src/Timer.cpp b/src/core/Timer.cpp
index 543f582b..543f582b 100644
--- a/src/Timer.cpp
+++ b/src/core/Timer.cpp
diff --git a/src/Timer.h b/src/core/Timer.h
index 9e6d447e..9e6d447e 100644
--- a/src/Timer.h
+++ b/src/core/Timer.h
diff --git a/src/TxdStore.cpp b/src/core/TxdStore.cpp
index 5085c7e4..5085c7e4 100644
--- a/src/TxdStore.cpp
+++ b/src/core/TxdStore.cpp
diff --git a/src/TxdStore.h b/src/core/TxdStore.h
index a9e57d31..a9e57d31 100644
--- a/src/TxdStore.h
+++ b/src/core/TxdStore.h
diff --git a/src/User.cpp b/src/core/User.cpp
index c9cb97cc..c9cb97cc 100644
--- a/src/User.cpp
+++ b/src/core/User.cpp
diff --git a/src/User.h b/src/core/User.h
index 8b744c7e..8b744c7e 100644
--- a/src/User.h
+++ b/src/core/User.h
diff --git a/src/Wanted.cpp b/src/core/Wanted.cpp
index ece68e64..ece68e64 100644
--- a/src/Wanted.cpp
+++ b/src/core/Wanted.cpp
diff --git a/src/Wanted.h b/src/core/Wanted.h
index aafa9ac0..aafa9ac0 100644
--- a/src/Wanted.h
+++ b/src/core/Wanted.h
diff --git a/src/World.cpp b/src/core/World.cpp
index 538e15c5..538e15c5 100644
--- a/src/World.cpp
+++ b/src/core/World.cpp
diff --git a/src/World.h b/src/core/World.h
index 3b7090da..3b7090da 100644
--- a/src/World.h
+++ b/src/core/World.h
diff --git a/src/CullZones.cpp b/src/core/ZoneCull.cpp
index 6155ae57..90155bcf 100644
--- a/src/CullZones.cpp
+++ b/src/core/ZoneCull.cpp
@@ -8,7 +8,7 @@
 #include "Camera.h"
 #include "World.h"
 #include "FileMgr.h"
-#include "CullZones.h"
+#include "ZoneCull.h"
 
 int32     &CCullZones::NumCullZones = *(int*)0x8F2564;
 CCullZone *CCullZones::aZones = (CCullZone*)0x864750;	// [NUMCULLZONES];
diff --git a/src/CullZones.h b/src/core/ZoneCull.h
index 5b04b4f9..5b04b4f9 100644
--- a/src/CullZones.h
+++ b/src/core/ZoneCull.h
diff --git a/src/Zones.cpp b/src/core/Zones.cpp
index 363fc3d9..363fc3d9 100644
--- a/src/Zones.cpp
+++ b/src/core/Zones.cpp
diff --git a/src/Zones.h b/src/core/Zones.h
index bf3957de..bf3957de 100644
--- a/src/Zones.h
+++ b/src/core/Zones.h
diff --git a/src/common.h b/src/core/common.h
index 79626acb..79626acb 100644
--- a/src/common.h
+++ b/src/core/common.h
diff --git a/src/config.h b/src/core/config.h
index 8cb02190..8cb02190 100644
--- a/src/config.h
+++ b/src/core/config.h
diff --git a/src/debugmenu_public.h b/src/core/debugmenu_public.h
index 778e7afe..778e7afe 100644
--- a/src/debugmenu_public.h
+++ b/src/core/debugmenu_public.h
diff --git a/src/main.cpp b/src/core/main.cpp
index 2835f396..e7f42780 100644
--- a/src/main.cpp
+++ b/src/core/main.cpp
@@ -40,7 +40,7 @@
 #include "CutsceneMgr.h"
 #include "Lights.h"
 #include "Credits.h"
-#include "CullZones.h"
+#include "ZoneCull.h"
 #include "Timecycle.h"
 #include "TxdStore.h"
 #include "FileMgr.h"
diff --git a/src/main.h b/src/core/main.h
index bdb0e008..bdb0e008 100644
--- a/src/main.h
+++ b/src/core/main.h
diff --git a/src/patcher.cpp b/src/core/patcher.cpp
index 5fdbdf8b..5fdbdf8b 100644
--- a/src/patcher.cpp
+++ b/src/core/patcher.cpp
diff --git a/src/patcher.h b/src/core/patcher.h
index 87a6bea4..87a6bea4 100644
--- a/src/patcher.h
+++ b/src/core/patcher.h
diff --git a/src/re3.cpp b/src/core/re3.cpp
index 9dc39d46..9dc39d46 100644
--- a/src/re3.cpp
+++ b/src/core/re3.cpp
diff --git a/src/rw.cpp b/src/core/rw.cpp
index 52bcf5bb..52bcf5bb 100644
--- a/src/rw.cpp
+++ b/src/core/rw.cpp
diff --git a/src/templates.h b/src/core/templates.h
index ef2db33a..ef2db33a 100644
--- a/src/templates.h
+++ b/src/core/templates.h
diff --git a/src/entities/Physical.cpp b/src/entities/Physical.cpp
index 600e5dca..d6a82658 100644
--- a/src/entities/Physical.cpp
+++ b/src/entities/Physical.cpp
@@ -1897,10 +1897,10 @@ CPhysical::ProcessCollision(void)
 			CVehicle *veh = (CVehicle*)this;
 			if(veh->m_vehType == VEHICLE_TYPE_CAR){
 				CAutomobile *car = (CAutomobile*)this;
-				car->m_aWheelDist[0] = 1.0f;
-				car->m_aWheelDist[1] = 1.0f;
-				car->m_aWheelDist[2] = 1.0f;
-				car->m_aWheelDist[3] = 1.0f;
+				car->m_aSuspensionSpringRatio[0] = 1.0f;
+				car->m_aSuspensionSpringRatio[1] = 1.0f;
+				car->m_aSuspensionSpringRatio[2] = 1.0f;
+				car->m_aSuspensionSpringRatio[3] = 1.0f;
 			}else if(veh->m_vehType == VEHICLE_TYPE_BIKE){
 				assert(0 && "TODO - but unused");
 			}
diff --git a/src/MloInstance.cpp b/src/modelinfo/MloInstance.cpp
index dbd83727..dbd83727 100644
--- a/src/MloInstance.cpp
+++ b/src/modelinfo/MloInstance.cpp
diff --git a/src/MloInstance.h b/src/modelinfo/MloInstance.h
index 00afc379..00afc379 100644
--- a/src/MloInstance.h
+++ b/src/modelinfo/MloInstance.h
diff --git a/src/entities/CutsceneHead.cpp b/src/objects/CutsceneHead.cpp
index a9c47777..a9c47777 100644
--- a/src/entities/CutsceneHead.cpp
+++ b/src/objects/CutsceneHead.cpp
diff --git a/src/entities/CutsceneHead.h b/src/objects/CutsceneHead.h
index de4f011f..de4f011f 100644
--- a/src/entities/CutsceneHead.h
+++ b/src/objects/CutsceneHead.h
diff --git a/src/entities/CutsceneObject.cpp b/src/objects/CutsceneObject.cpp
index ede5be5b..ede5be5b 100644
--- a/src/entities/CutsceneObject.cpp
+++ b/src/objects/CutsceneObject.cpp
diff --git a/src/entities/CutsceneObject.h b/src/objects/CutsceneObject.h
index 9360651e..9360651e 100644
--- a/src/entities/CutsceneObject.h
+++ b/src/objects/CutsceneObject.h
diff --git a/src/entities/DummyObject.cpp b/src/objects/DummyObject.cpp
index 1e4b2ae0..1e4b2ae0 100644
--- a/src/entities/DummyObject.cpp
+++ b/src/objects/DummyObject.cpp
diff --git a/src/entities/DummyObject.h b/src/objects/DummyObject.h
index 10554bdd..10554bdd 100644
--- a/src/entities/DummyObject.h
+++ b/src/objects/DummyObject.h
diff --git a/src/entities/Object.cpp b/src/objects/Object.cpp
index 6712d77b..6712d77b 100644
--- a/src/entities/Object.cpp
+++ b/src/objects/Object.cpp
diff --git a/src/entities/Object.h b/src/objects/Object.h
index de4c8e05..de4c8e05 100644
--- a/src/entities/Object.h
+++ b/src/objects/Object.h
diff --git a/src/control/ObjectData.cpp b/src/objects/ObjectData.cpp
index ef5bcc5e..ef5bcc5e 100644
--- a/src/control/ObjectData.cpp
+++ b/src/objects/ObjectData.cpp
diff --git a/src/control/ObjectData.h b/src/objects/ObjectData.h
index e3a5c1bd..e3a5c1bd 100644
--- a/src/control/ObjectData.h
+++ b/src/objects/ObjectData.h
diff --git a/src/ParticleObject.cpp b/src/objects/ParticleObject.cpp
index cf6e84bf..cf6e84bf 100644
--- a/src/ParticleObject.cpp
+++ b/src/objects/ParticleObject.cpp
diff --git a/src/ParticleObject.h b/src/objects/ParticleObject.h
index def7b7de..def7b7de 100644
--- a/src/ParticleObject.h
+++ b/src/objects/ParticleObject.h
diff --git a/src/entities/Projectile.cpp b/src/objects/Projectile.cpp
index e21323de..e21323de 100644
--- a/src/entities/Projectile.cpp
+++ b/src/objects/Projectile.cpp
diff --git a/src/entities/Projectile.h b/src/objects/Projectile.h
index a8e826b6..a8e826b6 100644
--- a/src/entities/Projectile.h
+++ b/src/objects/Projectile.h
diff --git a/src/entities/CivilianPed.cpp b/src/peds/CivilianPed.cpp
index a4881e71..a4881e71 100644
--- a/src/entities/CivilianPed.cpp
+++ b/src/peds/CivilianPed.cpp
diff --git a/src/entities/CivilianPed.h b/src/peds/CivilianPed.h
index 8d004ad7..8d004ad7 100644
--- a/src/entities/CivilianPed.h
+++ b/src/peds/CivilianPed.h
diff --git a/src/entities/CopPed.cpp b/src/peds/CopPed.cpp
index 041185ee..041185ee 100644
--- a/src/entities/CopPed.cpp
+++ b/src/peds/CopPed.cpp
diff --git a/src/entities/CopPed.h b/src/peds/CopPed.h
index b938dfc2..b938dfc2 100644
--- a/src/entities/CopPed.h
+++ b/src/peds/CopPed.h
diff --git a/src/entities/DummyPed.h b/src/peds/DummyPed.h
index af633dc4..af633dc4 100644
--- a/src/entities/DummyPed.h
+++ b/src/peds/DummyPed.h
diff --git a/src/entities/EmergencyPed.cpp b/src/peds/EmergencyPed.cpp
index 7b847896..7b847896 100644
--- a/src/entities/EmergencyPed.cpp
+++ b/src/peds/EmergencyPed.cpp
diff --git a/src/entities/EmergencyPed.h b/src/peds/EmergencyPed.h
index fa07f3ee..fa07f3ee 100644
--- a/src/entities/EmergencyPed.h
+++ b/src/peds/EmergencyPed.h
diff --git a/src/entities/Ped.cpp b/src/peds/Ped.cpp
index 055ea3fb..80ef53ee 100644
--- a/src/entities/Ped.cpp
+++ b/src/peds/Ped.cpp
@@ -17,7 +17,7 @@
 #include "PedPlacement.h"
 #include "Shadows.h"
 #include "Weather.h"
-#include "CullZones.h"
+#include "ZoneCull.h"
 #include "Population.h"
 #include "Renderer.h"
 #include "Lights.h"
diff --git a/src/entities/Ped.h b/src/peds/Ped.h
index 95731e15..95731e15 100644
--- a/src/entities/Ped.h
+++ b/src/peds/Ped.h
diff --git a/src/entities/PedIK.cpp b/src/peds/PedIK.cpp
index b9baf49c..b9baf49c 100644
--- a/src/entities/PedIK.cpp
+++ b/src/peds/PedIK.cpp
diff --git a/src/entities/PedIK.h b/src/peds/PedIK.h
index e17d52eb..e17d52eb 100644
--- a/src/entities/PedIK.h
+++ b/src/peds/PedIK.h
diff --git a/src/control/PedPlacement.cpp b/src/peds/PedPlacement.cpp
index e9a3f7d9..e9a3f7d9 100644
--- a/src/control/PedPlacement.cpp
+++ b/src/peds/PedPlacement.cpp
diff --git a/src/control/PedPlacement.h b/src/peds/PedPlacement.h
index 4bd48b62..4bd48b62 100644
--- a/src/control/PedPlacement.h
+++ b/src/peds/PedPlacement.h
diff --git a/src/control/PedStats.cpp b/src/peds/PedStats.cpp
index f6508580..f6508580 100644
--- a/src/control/PedStats.cpp
+++ b/src/peds/PedStats.cpp
diff --git a/src/control/PedStats.h b/src/peds/PedStats.h
index ce92d4da..ce92d4da 100644
--- a/src/control/PedStats.h
+++ b/src/peds/PedStats.h
diff --git a/src/control/PedType.cpp b/src/peds/PedType.cpp
index 66eb49a1..66eb49a1 100644
--- a/src/control/PedType.cpp
+++ b/src/peds/PedType.cpp
diff --git a/src/control/PedType.h b/src/peds/PedType.h
index 455d8d8d..455d8d8d 100644
--- a/src/control/PedType.h
+++ b/src/peds/PedType.h
diff --git a/src/entities/PlayerPed.cpp b/src/peds/PlayerPed.cpp
index 2d67d5b2..2d67d5b2 100644
--- a/src/entities/PlayerPed.cpp
+++ b/src/peds/PlayerPed.cpp
diff --git a/src/entities/PlayerPed.h b/src/peds/PlayerPed.h
index 15ad74a6..15ad74a6 100644
--- a/src/entities/PlayerPed.h
+++ b/src/peds/PlayerPed.h
diff --git a/src/render/Lights.cpp b/src/render/Lights.cpp
index 1e27ec48..cd83a898 100644
--- a/src/render/Lights.cpp
+++ b/src/render/Lights.cpp
@@ -6,7 +6,7 @@
 #include "Timecycle.h"
 #include "Coronas.h"
 #include "Weather.h"
-#include "CullZones.h"
+#include "ZoneCull.h"
 #include "Frontend.h"
 
 RpLight *&pAmbient = *(RpLight**)0x885B6C;
diff --git a/src/Timecycle.cpp b/src/render/Timecycle.cpp
index c04295dd..af154716 100644
--- a/src/Timecycle.cpp
+++ b/src/render/Timecycle.cpp
@@ -5,7 +5,7 @@
 #include "Weather.h"
 #include "Camera.h"
 #include "Shadows.h"
-#include "CullZones.h"
+#include "ZoneCull.h"
 #include "CutsceneMgr.h"
 #include "FileMgr.h"
 #include "Timecycle.h"
diff --git a/src/Timecycle.h b/src/render/Timecycle.h
index 71ddedb7..71ddedb7 100644
--- a/src/Timecycle.h
+++ b/src/render/Timecycle.h
diff --git a/src/Weather.cpp b/src/render/Weather.cpp
index 460deeac..460deeac 100644
--- a/src/Weather.cpp
+++ b/src/render/Weather.cpp
diff --git a/src/Weather.h b/src/render/Weather.h
index a9c15fd9..a9c15fd9 100644
--- a/src/Weather.h
+++ b/src/render/Weather.h
diff --git a/src/entities/Automobile.cpp b/src/vehicles/Automobile.cpp
index 54eed17a..54eed17a 100644
--- a/src/entities/Automobile.cpp
+++ b/src/vehicles/Automobile.cpp
diff --git a/src/entities/Automobile.h b/src/vehicles/Automobile.h
index b1463936..630635c7 100644
--- a/src/entities/Automobile.h
+++ b/src/vehicles/Automobile.h
@@ -25,8 +25,8 @@ public:
 	CDoor Doors[6];
 	RwFrame *m_aCarNodes[NUM_CAR_NODES];
 	CColPoint m_aWheelColPoints[4];
-	float m_aWheelDist[4];
-	float m_aWheelDistPrev[4];
+	float m_aSuspensionSpringRatio[4];
+	float m_aSuspensionSpringRatioPrev[4];
 	float m_aWheelSkidThing[4];
 	int field_49C;
 	bool m_aWheelSkidmarkMuddy[4];
@@ -37,7 +37,7 @@ public:
 	uint8 stuff3[12];
 	uint32 m_nBusDoorTimerEnd;
 	uint32 m_nBusDoorTimerStart;
-	float m_aSuspensionRange[4];
+	float m_aSuspensionSpringLength[4];
 	float m_aSuspensionLineLength[4];
 	float m_fHeightAboveRoad;
 	float m_fImprovedHandling;
@@ -65,4 +65,3 @@ public:
 	void dtor() { this->CAutomobile::~CAutomobile(); }
 };
 static_assert(sizeof(CAutomobile) == 0x5A8, "CAutomobile: error");
-static_assert(offsetof(CAutomobile, m_aWheelDist) == 0x46C, "CAutomobile: error");
diff --git a/src/entities/Boat.cpp b/src/vehicles/Boat.cpp
index 076a910e..076a910e 100644
--- a/src/entities/Boat.cpp
+++ b/src/vehicles/Boat.cpp
diff --git a/src/entities/Boat.h b/src/vehicles/Boat.h
index 6d6482a4..6d6482a4 100644
--- a/src/entities/Boat.h
+++ b/src/vehicles/Boat.h
diff --git a/src/DamageManager.cpp b/src/vehicles/DamageManager.cpp
index 1a7f25ed..1a7f25ed 100644
--- a/src/DamageManager.cpp
+++ b/src/vehicles/DamageManager.cpp
diff --git a/src/DamageManager.h b/src/vehicles/DamageManager.h
index 1fdbc6b1..1fdbc6b1 100644
--- a/src/DamageManager.h
+++ b/src/vehicles/DamageManager.h
diff --git a/src/control/HandlingMgr.cpp b/src/vehicles/HandlingMgr.cpp
index 47d0564c..47d0564c 100644
--- a/src/control/HandlingMgr.cpp
+++ b/src/vehicles/HandlingMgr.cpp
diff --git a/src/control/HandlingMgr.h b/src/vehicles/HandlingMgr.h
index 958e2351..958e2351 100644
--- a/src/control/HandlingMgr.h
+++ b/src/vehicles/HandlingMgr.h
diff --git a/src/entities/Heli.cpp b/src/vehicles/Heli.cpp
index 01ee5375..01ee5375 100644
--- a/src/entities/Heli.cpp
+++ b/src/vehicles/Heli.cpp
diff --git a/src/entities/Heli.h b/src/vehicles/Heli.h
index da7bb171..da7bb171 100644
--- a/src/entities/Heli.h
+++ b/src/vehicles/Heli.h
diff --git a/src/entities/Plane.cpp b/src/vehicles/Plane.cpp
index 6e30bced..6e30bced 100644
--- a/src/entities/Plane.cpp
+++ b/src/vehicles/Plane.cpp
diff --git a/src/entities/Plane.h b/src/vehicles/Plane.h
index e26008f6..e26008f6 100644
--- a/src/entities/Plane.h
+++ b/src/vehicles/Plane.h
diff --git a/src/entities/Train.cpp b/src/vehicles/Train.cpp
index 62fd53ec..62fd53ec 100644
--- a/src/entities/Train.cpp
+++ b/src/vehicles/Train.cpp
diff --git a/src/entities/Train.h b/src/vehicles/Train.h
index 84b6faf5..84b6faf5 100644
--- a/src/entities/Train.h
+++ b/src/vehicles/Train.h
diff --git a/src/control/Transmission.cpp b/src/vehicles/Transmission.cpp
index 2be25cbb..2be25cbb 100644
--- a/src/control/Transmission.cpp
+++ b/src/vehicles/Transmission.cpp
diff --git a/src/control/Transmission.h b/src/vehicles/Transmission.h
index 686e0aca..686e0aca 100644
--- a/src/control/Transmission.h
+++ b/src/vehicles/Transmission.h
diff --git a/src/entities/Vehicle.cpp b/src/vehicles/Vehicle.cpp
index dccd9195..dccd9195 100644
--- a/src/entities/Vehicle.cpp
+++ b/src/vehicles/Vehicle.cpp
diff --git a/src/entities/Vehicle.h b/src/vehicles/Vehicle.h
index 39a56fe0..39a56fe0 100644
--- a/src/entities/Vehicle.h
+++ b/src/vehicles/Vehicle.h