diff options
author | aap <aap@papnet.eu> | 2019-07-09 09:57:44 +0200 |
---|---|---|
committer | aap <aap@papnet.eu> | 2019-07-09 09:57:44 +0200 |
commit | 74fcbc8c0a6bbac8e8057655c5f1133e15c63656 (patch) | |
tree | 75dabaa5dc285f1541c6ee058028c7f57095eecf /src/entities/Physical.h | |
parent | Merge branch 'master' of github.com:GTAmodding/re3 (diff) | |
download | re3-74fcbc8c0a6bbac8e8057655c5f1133e15c63656.tar re3-74fcbc8c0a6bbac8e8057655c5f1133e15c63656.tar.gz re3-74fcbc8c0a6bbac8e8057655c5f1133e15c63656.tar.bz2 re3-74fcbc8c0a6bbac8e8057655c5f1133e15c63656.tar.lz re3-74fcbc8c0a6bbac8e8057655c5f1133e15c63656.tar.xz re3-74fcbc8c0a6bbac8e8057655c5f1133e15c63656.tar.zst re3-74fcbc8c0a6bbac8e8057655c5f1133e15c63656.zip |
Diffstat (limited to '')
-rw-r--r-- | src/entities/Physical.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/entities/Physical.h b/src/entities/Physical.h index c2fce334..5bd98815 100644 --- a/src/entities/Physical.h +++ b/src/entities/Physical.h @@ -61,7 +61,7 @@ public: uint8 bHitByTrain : 1; // from nick uint8 m_phy_flagA80 : 1; - uint8 m_nLastCollType; + uint8 m_nSurfaceTouched; uint8 m_nZoneLevel; CPhysical(void); @@ -75,7 +75,7 @@ public: void ProcessShift(void); void ProcessCollision(void); - virtual int32 ProcessEntityCollision(CEntity *ent, CColPoint *point); + virtual int32 ProcessEntityCollision(CEntity *ent, CColPoint *colpoints); void RemoveAndAdd(void); void AddToMovingList(void); |