diff options
author | aap <aap@papnet.eu> | 2019-07-07 13:09:11 +0200 |
---|---|---|
committer | aap <aap@papnet.eu> | 2019-07-07 13:09:11 +0200 |
commit | 53023eb65bdcde43e341c1ecb7cf0c7f8ee524fb (patch) | |
tree | fc65a6c40fa719f9d43be9e0e15be79c490135e0 /src/control | |
parent | finished CPhysical (diff) | |
download | re3-53023eb65bdcde43e341c1ecb7cf0c7f8ee524fb.tar re3-53023eb65bdcde43e341c1ecb7cf0c7f8ee524fb.tar.gz re3-53023eb65bdcde43e341c1ecb7cf0c7f8ee524fb.tar.bz2 re3-53023eb65bdcde43e341c1ecb7cf0c7f8ee524fb.tar.lz re3-53023eb65bdcde43e341c1ecb7cf0c7f8ee524fb.tar.xz re3-53023eb65bdcde43e341c1ecb7cf0c7f8ee524fb.tar.zst re3-53023eb65bdcde43e341c1ecb7cf0c7f8ee524fb.zip |
Diffstat (limited to '')
-rw-r--r-- | src/control/Phones.cpp (renamed from src/control/PhoneInfo.cpp) | 4 | ||||
-rw-r--r-- | src/control/Phones.h (renamed from src/control/PhoneInfo.h) | 0 | ||||
-rw-r--r-- | src/control/Replay.cpp | 6 | ||||
-rw-r--r-- | src/objects/ObjectData.cpp (renamed from src/control/ObjectData.cpp) | 0 | ||||
-rw-r--r-- | src/objects/ObjectData.h (renamed from src/control/ObjectData.h) | 0 | ||||
-rw-r--r-- | src/peds/PedPlacement.cpp (renamed from src/control/PedPlacement.cpp) | 0 | ||||
-rw-r--r-- | src/peds/PedPlacement.h (renamed from src/control/PedPlacement.h) | 0 | ||||
-rw-r--r-- | src/peds/PedStats.cpp (renamed from src/control/PedStats.cpp) | 0 | ||||
-rw-r--r-- | src/peds/PedStats.h (renamed from src/control/PedStats.h) | 0 | ||||
-rw-r--r-- | src/peds/PedType.cpp (renamed from src/control/PedType.cpp) | 0 | ||||
-rw-r--r-- | src/peds/PedType.h (renamed from src/control/PedType.h) | 0 | ||||
-rw-r--r-- | src/vehicles/HandlingMgr.cpp (renamed from src/control/HandlingMgr.cpp) | 0 | ||||
-rw-r--r-- | src/vehicles/HandlingMgr.h (renamed from src/control/HandlingMgr.h) | 0 | ||||
-rw-r--r-- | src/vehicles/Transmission.cpp (renamed from src/control/Transmission.cpp) | 0 | ||||
-rw-r--r-- | src/vehicles/Transmission.h (renamed from src/control/Transmission.h) | 0 |
15 files changed, 5 insertions, 5 deletions
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/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/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/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/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 |