the great reorganization

premake5.lua

@@ -3,30 +3,39 @@ workspace "re3"
 	location "build"
 
 	files { "src/*.*" }
-	files { "src/skel/*.*" }
-	files { "src/skel/win/*.*" }
-	files { "src/math/*.*" }
-	files { "src/modelinfo/*.*" }
-	files { "src/entities/*.*" }
-	files { "src/weapons/*.*" }
-	files { "src/render/*.*" }
-	files { "src/control/*.*" }
 	files { "src/animation/*.*" }
 	files { "src/audio/*.*" }
+	files { "src/control/*.*" }
+	files { "src/core/*.*" }
+	files { "src/entities/*.*" }
+	files { "src/math/*.*" }
+	files { "src/modelinfo/*.*" }
+	files { "src/objects/*.*" }
+	files { "src/peds/*.*" }
+	files { "src/render/*.*" }
+	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/vehicles" }
-	includedirs { "src/entities" }
 	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"

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); }
+WRAPPER void PhonePickUpCB(CAnimBlendAssociation *assoc, void *arg) { EAXJMP(0x42F470); }

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;

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"

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"

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"
 

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"

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];

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"

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_aSuspensionSpringRatio[0] = 1.0f;
-				car->m_aWheelDist[1] = 1.0f;
+				car->m_aSuspensionSpringRatio[1] = 1.0f;
-				car->m_aWheelDist[2] = 1.0f;
+				car->m_aSuspensionSpringRatio[2] = 1.0f;
-				car->m_aWheelDist[3] = 1.0f;
+				car->m_aSuspensionSpringRatio[3] = 1.0f;
 			}else if(veh->m_vehType == VEHICLE_TYPE_BIKE){
 				assert(0 && "TODO - but unused");
 			}