diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2020-12-28 12:59:03 +0100 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2020-12-28 13:00:44 +0100 |
| commit | 9c2f1b0833ec28ea52162d55560fca8f89341335 (patch) | |
| tree | 60e6697b55db342c156dedc26ef918249b65bdcb | |
| parent | Add bike leftovers (diff) | |
| download | re3-9c2f1b0833ec28ea52162d55560fca8f89341335.tar re3-9c2f1b0833ec28ea52162d55560fca8f89341335.tar.gz re3-9c2f1b0833ec28ea52162d55560fca8f89341335.tar.bz2 re3-9c2f1b0833ec28ea52162d55560fca8f89341335.tar.lz re3-9c2f1b0833ec28ea52162d55560fca8f89341335.tar.xz re3-9c2f1b0833ec28ea52162d55560fca8f89341335.tar.zst re3-9c2f1b0833ec28ea52162d55560fca8f89341335.zip | |
| -rw-r--r-- | src/control/Script6.cpp | 4 | ||||
| -rw-r--r-- | src/vehicles/Bike.h | 20 |
2 files changed, 22 insertions, 2 deletions
diff --git a/src/control/Script6.cpp b/src/control/Script6.cpp index c2937e1d..77dae53a 100644 --- a/src/control/Script6.cpp +++ b/src/control/Script6.cpp @@ -3,6 +3,7 @@ #include "Script.h" #include "ScriptCommands.h" +#include "Bike.h" #include "CarCtrl.h" #include "Cranes.h" #include "Credits.h" @@ -415,8 +416,7 @@ int8 CRunningScript::ProcessCommands1000To1099(int32 command) ((CAutomobile*)pVehicle)->m_fTraction = fTraction; else // this is certainly not a boat, trane, heli or plane field - //((CBike*)pVehicle)->m_fTraction = fTraction; - *(float*)(((char*)pVehicle) + 1088) = fTraction; + ((CBike*)pVehicle)->m_fTraction = fTraction; return 0; } case COMMAND_ARE_MEASUREMENTS_IN_METRES: diff --git a/src/vehicles/Bike.h b/src/vehicles/Bike.h index 38477e80..85ff211b 100644 --- a/src/vehicles/Bike.h +++ b/src/vehicles/Bike.h @@ -1,5 +1,7 @@ #pragma once +#include "Vehicle.h" + // some miami bike leftovers enum eBikeNodes { @@ -22,4 +24,22 @@ public: AnimationId m_bikeSitAnimation; uint8 unk2[180]; float m_aSuspensionSpringRatio[4]; + + /* copied from VC, one of the floats here is gone, assuming m_bike_unused1 */ + float m_aSuspensionSpringRatioPrev[4]; + float m_aWheelTimer[4]; + //float m_bike_unused1; + int m_aWheelSkidmarkType[2]; + bool m_aWheelSkidmarkBloody[2]; + bool m_aWheelSkidmarkUnk[2]; + float m_aWheelRotation[2]; + float m_aWheelSpeed[2]; + float m_aWheelPosition[2]; + float m_aWheelBasePosition[2]; + float m_aSuspensionSpringLength[4]; + float m_aSuspensionLineLength[4]; + float m_fHeightAboveRoad; + /**/ + + float m_fTraction; };
\ No newline at end of file |