diff options
| author | aap <aap@papnet.eu> | 2019-07-29 19:18:03 +0200 |
|---|---|---|
| committer | aap <aap@papnet.eu> | 2019-07-31 14:33:27 +0200 |
| commit | 5f6b235301f734b73f8307cf3e29997e7f76eac8 (patch) | |
| tree | 73037842a302ae6e888e365b32e8ce74287e3f8d /src/peds | |
| parent | Merge pull request #175 from erorcun/erorcun (diff) | |
| parent | restore original shadows fading (diff) | |
| download | re3-5f6b235301f734b73f8307cf3e29997e7f76eac8.tar re3-5f6b235301f734b73f8307cf3e29997e7f76eac8.tar.gz re3-5f6b235301f734b73f8307cf3e29997e7f76eac8.tar.bz2 re3-5f6b235301f734b73f8307cf3e29997e7f76eac8.tar.lz re3-5f6b235301f734b73f8307cf3e29997e7f76eac8.tar.xz re3-5f6b235301f734b73f8307cf3e29997e7f76eac8.tar.zst re3-5f6b235301f734b73f8307cf3e29997e7f76eac8.zip | |
Diffstat (limited to 'src/peds')
| -rw-r--r-- | src/peds/Ped.cpp | 6 | ||||
| -rw-r--r-- | src/peds/Ped.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/peds/Ped.cpp b/src/peds/Ped.cpp index f8b44301..fc01a36d 100644 --- a/src/peds/Ped.cpp +++ b/src/peds/Ped.cpp @@ -79,7 +79,7 @@ CPed::~CPed(void) CWorld::Remove(this); CRadar::ClearBlipForEntity(BLIP_CHAR, CPools::GetPedPool()->GetIndex(this)); if (bInVehicle && m_pMyVehicle){ - uint8 door_flag = GetVehDoorFlag(m_vehEnterType); + uint8 door_flag = GetCarDoorFlag(m_vehEnterType); if (m_pMyVehicle->pDriver == this) m_pMyVehicle->pDriver = nil; else { @@ -1415,7 +1415,7 @@ CPed::PedSetDraggedOutCarCB(CAnimBlendAssociation *dragAssoc, void *arg) ped->m_pSeekTarget = nil; vehicle = ped->m_pMyVehicle; - vehicle->m_nGettingOutFlags &= ~GetVehDoorFlag(ped->m_vehEnterType); + vehicle->m_nGettingOutFlags &= ~GetCarDoorFlag(ped->m_vehEnterType); if (vehicle->pDriver == ped) { vehicle->RemoveDriver(); @@ -2725,7 +2725,7 @@ CPed::QuitEnteringCar(void) if (veh->m_nNumGettingIn != 0) veh->m_nNumGettingIn--; - veh->m_nGettingInFlags &= ~GetVehDoorFlag(m_vehEnterType); + veh->m_nGettingInFlags &= ~GetCarDoorFlag(m_vehEnterType); } bUsesCollision = true; diff --git a/src/peds/Ped.h b/src/peds/Ped.h index dcbe247a..4269136a 100644 --- a/src/peds/Ped.h +++ b/src/peds/Ped.h @@ -394,7 +394,7 @@ public: float m_fRotationCur; float m_fRotationDest; float m_headingRate; - uint16 m_vehEnterType; + uint16 m_vehEnterType; // TODO: this is more like a door, not a type uint16 m_walkAroundType; CEntity *m_pCurrentPhysSurface; CVector m_vecOffsetFromPhysSurface; |