diff options
| author | aap <aap@papnet.eu> | 2020-05-03 15:57:57 +0200 |
|---|---|---|
| committer | aap <aap@papnet.eu> | 2020-05-03 16:09:37 +0200 |
| commit | 702da55ec9d0e8e02df25a26390a113e452676e3 (patch) | |
| tree | 9c86a1700aa54b929cd1015c9b9aa975a2d75336 /src/entities | |
| parent | Fix pad Y axis (diff) | |
| download | re3-702da55ec9d0e8e02df25a26390a113e452676e3.tar re3-702da55ec9d0e8e02df25a26390a113e452676e3.tar.gz re3-702da55ec9d0e8e02df25a26390a113e452676e3.tar.bz2 re3-702da55ec9d0e8e02df25a26390a113e452676e3.tar.lz re3-702da55ec9d0e8e02df25a26390a113e452676e3.tar.xz re3-702da55ec9d0e8e02df25a26390a113e452676e3.tar.zst re3-702da55ec9d0e8e02df25a26390a113e452676e3.zip | |
Diffstat (limited to 'src/entities')
| -rw-r--r-- | src/entities/Physical.cpp | 2 | ||||
| -rw-r--r-- | src/entities/Treadable.h | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/entities/Physical.cpp b/src/entities/Physical.cpp index 842104a4..af08ced6 100644 --- a/src/entities/Physical.cpp +++ b/src/entities/Physical.cpp @@ -267,6 +267,7 @@ void CPhysical::AddCollisionRecord_Treadable(CEntity *ent) { if(ent->IsBuilding() && ((CBuilding*)ent)->GetIsATreadable()){ +#ifndef MIAMI CTreadable *t = (CTreadable*)ent; if(t->m_nodeIndices[PATH_PED][0] >= 0 || t->m_nodeIndices[PATH_PED][1] >= 0 || @@ -278,6 +279,7 @@ CPhysical::AddCollisionRecord_Treadable(CEntity *ent) t->m_nodeIndices[PATH_CAR][2] >= 0 || t->m_nodeIndices[PATH_CAR][3] >= 0) m_treadable[PATH_CAR] = t; +#endif } } diff --git a/src/entities/Treadable.h b/src/entities/Treadable.h index 9e4de59a..78f69c8a 100644 --- a/src/entities/Treadable.h +++ b/src/entities/Treadable.h @@ -8,8 +8,12 @@ public: static void *operator new(size_t); static void operator delete(void*, size_t); +#ifndef MIAMI int16 m_nodeIndices[2][12]; // first car, then ped +#endif bool GetIsATreadable(void) { return true; } }; +#ifndef MIAMI static_assert(sizeof(CTreadable) == 0x94, "CTreadable: error"); +#endif |