summaryrefslogtreecommitdiffstats
path: root/src/entities
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2019-08-09 19:42:18 +0200
committeraap <aap@papnet.eu>2019-08-09 19:42:18 +0200
commit0bd681abc514d5a3627edea40b24347696ac8908 (patch)
treecbfcb61874c34a4e44ad1151cf44fc13650f1197 /src/entities
parentMerge pull request #184 from erorcun/erorcun (diff)
downloadre3-0bd681abc514d5a3627edea40b24347696ac8908.tar
re3-0bd681abc514d5a3627edea40b24347696ac8908.tar.gz
re3-0bd681abc514d5a3627edea40b24347696ac8908.tar.bz2
re3-0bd681abc514d5a3627edea40b24347696ac8908.tar.lz
re3-0bd681abc514d5a3627edea40b24347696ac8908.tar.xz
re3-0bd681abc514d5a3627edea40b24347696ac8908.tar.zst
re3-0bd681abc514d5a3627edea40b24347696ac8908.zip
Diffstat (limited to 'src/entities')
-rw-r--r--src/entities/Physical.cpp25
-rw-r--r--src/entities/Physical.h3
-rw-r--r--src/entities/Treadable.h3
3 files changed, 15 insertions, 16 deletions
diff --git a/src/entities/Physical.cpp b/src/entities/Physical.cpp
index 391f1e33..fbd1322d 100644
--- a/src/entities/Physical.cpp
+++ b/src/entities/Physical.cpp
@@ -11,6 +11,7 @@
#include "ParticleObject.h"
#include "Particle.h"
#include "SurfaceTable.h"
+#include "PathFind.h"
#include "CarCtrl.h"
#include "DMAudio.h"
#include "Automobile.h"
@@ -56,8 +57,8 @@ CPhysical::CPhysical(void)
m_phy_flagA80 = false;
m_fDistanceTravelled = 0.0f;
- m_pedTreadable = nil;
- m_carTreadable = nil;
+ m_treadable[PATH_CAR] = nil;
+ m_treadable[PATH_PED] = nil;
m_phy_flagA10 = false;
m_phy_flagA20 = false;
@@ -267,16 +268,16 @@ CPhysical::AddCollisionRecord_Treadable(CEntity *ent)
{
if(ent->IsBuilding() && ((CBuilding*)ent)->GetIsATreadable()){
CTreadable *t = (CTreadable*)ent;
- if(t->m_nodeIndicesPeds[0] >= 0 ||
- t->m_nodeIndicesPeds[1] >= 0 ||
- t->m_nodeIndicesPeds[2] >= 0 ||
- t->m_nodeIndicesPeds[3] >= 0)
- m_pedTreadable = t;
- if(t->m_nodeIndicesCars[0] >= 0 ||
- t->m_nodeIndicesCars[1] >= 0 ||
- t->m_nodeIndicesCars[2] >= 0 ||
- t->m_nodeIndicesCars[3] >= 0)
- m_carTreadable = t;
+ if(t->m_nodeIndices[PATH_PED][0] >= 0 ||
+ t->m_nodeIndices[PATH_PED][1] >= 0 ||
+ t->m_nodeIndices[PATH_PED][2] >= 0 ||
+ t->m_nodeIndices[PATH_PED][3] >= 0)
+ m_treadable[PATH_PED] = t;
+ if(t->m_nodeIndices[PATH_CAR][0] >= 0 ||
+ t->m_nodeIndices[PATH_CAR][1] >= 0 ||
+ t->m_nodeIndices[PATH_CAR][2] >= 0 ||
+ t->m_nodeIndices[PATH_CAR][3] >= 0)
+ m_treadable[PATH_CAR] = t;
}
}
diff --git a/src/entities/Physical.h b/src/entities/Physical.h
index ee75d059..2786a7de 100644
--- a/src/entities/Physical.h
+++ b/src/entities/Physical.h
@@ -19,8 +19,7 @@ public:
int32 m_audioEntityId;
float unk1;
- CTreadable *m_carTreadable;
- CTreadable *m_pedTreadable;
+ CTreadable *m_treadable[2]; // car and ped
uint32 m_nLastTimeCollided;
CVector m_vecMoveSpeed; // velocity
CVector m_vecTurnSpeed; // angular velocity
diff --git a/src/entities/Treadable.h b/src/entities/Treadable.h
index d82ff52b..9e4de59a 100644
--- a/src/entities/Treadable.h
+++ b/src/entities/Treadable.h
@@ -8,8 +8,7 @@ public:
static void *operator new(size_t);
static void operator delete(void*, size_t);
- int16 m_nodeIndicesCars[12];
- int16 m_nodeIndicesPeds[12];
+ int16 m_nodeIndices[2][12]; // first car, then ped
bool GetIsATreadable(void) { return true; }
};