diff options
author | Nikolay Korolev <nickvnuk@gmail.com> | 2019-07-14 13:49:27 +0200 |
---|---|---|
committer | Nikolay Korolev <nickvnuk@gmail.com> | 2019-07-14 13:49:27 +0200 |
commit | b77a9ce9550d0326c8bd69fdc1474af4f3a1d268 (patch) | |
tree | be1eba74734de4b37a0795627e3129fd1ed93f92 /src/vehicles | |
parent | Merge remote-tracking branch 'upstream/master' (diff) | |
download | re3-b77a9ce9550d0326c8bd69fdc1474af4f3a1d268.tar re3-b77a9ce9550d0326c8bd69fdc1474af4f3a1d268.tar.gz re3-b77a9ce9550d0326c8bd69fdc1474af4f3a1d268.tar.bz2 re3-b77a9ce9550d0326c8bd69fdc1474af4f3a1d268.tar.lz re3-b77a9ce9550d0326c8bd69fdc1474af4f3a1d268.tar.xz re3-b77a9ce9550d0326c8bd69fdc1474af4f3a1d268.tar.zst re3-b77a9ce9550d0326c8bd69fdc1474af4f3a1d268.zip |
Diffstat (limited to 'src/vehicles')
-rw-r--r-- | src/vehicles/Vehicle.cpp | 4 | ||||
-rw-r--r-- | src/vehicles/Vehicle.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/vehicles/Vehicle.cpp b/src/vehicles/Vehicle.cpp index b21c859a..0abdffd2 100644 --- a/src/vehicles/Vehicle.cpp +++ b/src/vehicles/Vehicle.cpp @@ -65,7 +65,7 @@ CVehicle::CVehicle(uint8 CreatedBy) bIsDamaged = false; m_veh_flagC8 = false; m_veh_flagC10 = false; - m_veh_flagC4 = false; + bHasBeenOwnedByPlayer = false; m_veh_flagC20 = false; bCanBeDamaged = true; m_veh_flagC80 = false; @@ -519,7 +519,7 @@ bool CVehicle::CanPedOpenLocks(CPed *ped) { if(m_nDoorLock == CARLOCK_LOCKED || - m_nDoorLock == CARLOCK_COP_CAR || + m_nDoorLock == CARLOCK_LOCKED_INITIALLY || m_nDoorLock == CARLOCK_LOCKED_PLAYER_INSIDE) return false; if(ped->IsPlayer() && m_nDoorLock == CARLOCK_LOCKOUT_PLAYER_ONLY) diff --git a/src/vehicles/Vehicle.h b/src/vehicles/Vehicle.h index 3d751bfe..03bdad69 100644 --- a/src/vehicles/Vehicle.h +++ b/src/vehicles/Vehicle.h @@ -168,7 +168,7 @@ public: uint8 m_veh_flagC1 : 1; uint8 bIsDamaged : 1; // This vehicle has been damaged and is displaying all its components - uint8 m_veh_flagC4 : 1; + uint8 bHasBeenOwnedByPlayer : 1; uint8 m_veh_flagC8 : 1; uint8 m_veh_flagC10 : 1; uint8 m_veh_flagC20 : 1; |