diff options
author | Nikolay <nickvnuk@gmail.com> | 2020-12-19 17:15:52 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-12-19 17:15:52 +0100 |
commit | 867133e93d57dba5319bb13abeeb3f73bbaf6ae1 (patch) | |
tree | e16891b3bd62f38bc959c295ebeca1aa6b9952d7 /src/vehicles | |
parent | silly mistake (diff) | |
parent | fixed cmakelists (diff) | |
download | re3-867133e93d57dba5319bb13abeeb3f73bbaf6ae1.tar re3-867133e93d57dba5319bb13abeeb3f73bbaf6ae1.tar.gz re3-867133e93d57dba5319bb13abeeb3f73bbaf6ae1.tar.bz2 re3-867133e93d57dba5319bb13abeeb3f73bbaf6ae1.tar.lz re3-867133e93d57dba5319bb13abeeb3f73bbaf6ae1.tar.xz re3-867133e93d57dba5319bb13abeeb3f73bbaf6ae1.tar.zst re3-867133e93d57dba5319bb13abeeb3f73bbaf6ae1.zip |
Diffstat (limited to 'src/vehicles')
-rw-r--r-- | src/vehicles/Automobile.cpp | 1 | ||||
-rw-r--r-- | src/vehicles/HandlingMgr.h | 8 | ||||
-rw-r--r-- | src/vehicles/Plane.cpp | 3 |
3 files changed, 11 insertions, 1 deletions
diff --git a/src/vehicles/Automobile.cpp b/src/vehicles/Automobile.cpp index cdb78fe5..d20f1177 100644 --- a/src/vehicles/Automobile.cpp +++ b/src/vehicles/Automobile.cpp @@ -5249,7 +5249,6 @@ CPed::MakeTyresMuddySectorList(CPtrList &list) } } - void CAutomobile::SetBusDoorTimer(uint32 timer, uint8 type) { diff --git a/src/vehicles/HandlingMgr.h b/src/vehicles/HandlingMgr.h index 52e69441..038ff80c 100644 --- a/src/vehicles/HandlingMgr.h +++ b/src/vehicles/HandlingMgr.h @@ -120,6 +120,11 @@ enum tVehicleType NUMBOATHANDLINGS = HANDLING_SEAPLANE+1 - HANDLING_PREDATOR, }; +enum tField // most likely a handling field enum, never used so :shrug: +{ + +}; + enum { HANDLING_1G_BOOST = 1, @@ -239,6 +244,8 @@ struct tFlyingHandlingData CVector vecSpeedRes; }; +class CVehicle; + class cHandlingDataMgr { float field_0; // unused it seems @@ -258,6 +265,7 @@ public: void Initialise(void); void LoadHandlingData(void); int FindExactWord(const char *word, const char *words, int wordLen, int numWords); + void ConvertDataToWorldUnits(tHandlingData *handling); void ConvertDataToGameUnits(tHandlingData *handling); void ConvertBikeDataToGameUnits(tBikeHandlingData *handling); int32 GetHandlingId(const char *name); diff --git a/src/vehicles/Plane.cpp b/src/vehicles/Plane.cpp index 620a04fb..5b5536fd 100644 --- a/src/vehicles/Plane.cpp +++ b/src/vehicles/Plane.cpp @@ -18,6 +18,7 @@ #include "HandlingMgr.h" #include "Heli.h" #include "Plane.h" +#include "MemoryHeap.h" //--MIAMI: file done @@ -564,7 +565,9 @@ CPlane::ProcessControl(void) if(m_rwObject && RwObjectGetType(m_rwObject) == rpCLUMP){ DeleteRwObject(); if(mi->m_planeLodId != -1){ + PUSH_MEMID(MEMID_WORLD); m_rwObject = CModelInfo::GetModelInfo(mi->m_planeLodId)->CreateInstance(); + POP_MEMID(); if(m_rwObject) m_matrix.AttachRW(RwFrameGetMatrix(RpAtomicGetFrame((RpAtomic*)m_rwObject))); } |