summaryrefslogtreecommitdiffstats
path: root/src/entities
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/core/PlayerInfo.cpp (renamed from src/entities/PlayerInfo.cpp)0
-rw-r--r--src/core/PlayerInfo.h (renamed from src/entities/PlayerInfo.h)0
-rw-r--r--src/core/PlayerSkin.cpp (renamed from src/entities/PlayerSkin.cpp)0
-rw-r--r--src/core/PlayerSkin.h (renamed from src/entities/PlayerSkin.h)0
-rw-r--r--src/entities/Physical.cpp8
-rw-r--r--src/objects/CutsceneHead.cpp (renamed from src/entities/CutsceneHead.cpp)0
-rw-r--r--src/objects/CutsceneHead.h (renamed from src/entities/CutsceneHead.h)0
-rw-r--r--src/objects/CutsceneObject.cpp (renamed from src/entities/CutsceneObject.cpp)0
-rw-r--r--src/objects/CutsceneObject.h (renamed from src/entities/CutsceneObject.h)0
-rw-r--r--src/objects/DummyObject.cpp (renamed from src/entities/DummyObject.cpp)0
-rw-r--r--src/objects/DummyObject.h (renamed from src/entities/DummyObject.h)0
-rw-r--r--src/objects/Object.cpp (renamed from src/entities/Object.cpp)0
-rw-r--r--src/objects/Object.h (renamed from src/entities/Object.h)0
-rw-r--r--src/objects/Projectile.cpp (renamed from src/entities/Projectile.cpp)0
-rw-r--r--src/objects/Projectile.h (renamed from src/entities/Projectile.h)0
-rw-r--r--src/peds/CivilianPed.cpp (renamed from src/entities/CivilianPed.cpp)0
-rw-r--r--src/peds/CivilianPed.h (renamed from src/entities/CivilianPed.h)0
-rw-r--r--src/peds/CopPed.cpp (renamed from src/entities/CopPed.cpp)0
-rw-r--r--src/peds/CopPed.h (renamed from src/entities/CopPed.h)0
-rw-r--r--src/peds/DummyPed.h (renamed from src/entities/DummyPed.h)0
-rw-r--r--src/peds/EmergencyPed.cpp (renamed from src/entities/EmergencyPed.cpp)0
-rw-r--r--src/peds/EmergencyPed.h (renamed from src/entities/EmergencyPed.h)0
-rw-r--r--src/peds/Ped.cpp (renamed from src/entities/Ped.cpp)2
-rw-r--r--src/peds/Ped.h (renamed from src/entities/Ped.h)0
-rw-r--r--src/peds/PedIK.cpp (renamed from src/entities/PedIK.cpp)0
-rw-r--r--src/peds/PedIK.h (renamed from src/entities/PedIK.h)0
-rw-r--r--src/peds/PlayerPed.cpp (renamed from src/entities/PlayerPed.cpp)0
-rw-r--r--src/peds/PlayerPed.h (renamed from src/entities/PlayerPed.h)0
-rw-r--r--src/vehicles/Automobile.cpp (renamed from src/entities/Automobile.cpp)0
-rw-r--r--src/vehicles/Automobile.h (renamed from src/entities/Automobile.h)7
-rw-r--r--src/vehicles/Boat.cpp (renamed from src/entities/Boat.cpp)0
-rw-r--r--src/vehicles/Boat.h (renamed from src/entities/Boat.h)0
-rw-r--r--src/vehicles/Heli.cpp (renamed from src/entities/Heli.cpp)0
-rw-r--r--src/vehicles/Heli.h (renamed from src/entities/Heli.h)0
-rw-r--r--src/vehicles/Plane.cpp (renamed from src/entities/Plane.cpp)0
-rw-r--r--src/vehicles/Plane.h (renamed from src/entities/Plane.h)0
-rw-r--r--src/vehicles/Train.cpp (renamed from src/entities/Train.cpp)0
-rw-r--r--src/vehicles/Train.h (renamed from src/entities/Train.h)0
-rw-r--r--src/vehicles/Vehicle.cpp (renamed from src/entities/Vehicle.cpp)0
-rw-r--r--src/vehicles/Vehicle.h (renamed from src/entities/Vehicle.h)0
40 files changed, 8 insertions, 9 deletions
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/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/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/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/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/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/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/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