summaryrefslogtreecommitdiffstats
path: root/src/vehicles
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2019-07-16 18:31:18 +0200
committerGitHub <noreply@github.com>2019-07-16 18:31:18 +0200
commit9477aca836efd0bcf5017ff6a6c81f2326fd97c1 (patch)
treeb80e8bc8569fbdda5929123a8f47d0c62aea0ab0 /src/vehicles
parentPhone, World, Ped (diff)
parentMerge pull request #136 from Nick007J/master (diff)
downloadre3-9477aca836efd0bcf5017ff6a6c81f2326fd97c1.tar
re3-9477aca836efd0bcf5017ff6a6c81f2326fd97c1.tar.gz
re3-9477aca836efd0bcf5017ff6a6c81f2326fd97c1.tar.bz2
re3-9477aca836efd0bcf5017ff6a6c81f2326fd97c1.tar.lz
re3-9477aca836efd0bcf5017ff6a6c81f2326fd97c1.tar.xz
re3-9477aca836efd0bcf5017ff6a6c81f2326fd97c1.tar.zst
re3-9477aca836efd0bcf5017ff6a6c81f2326fd97c1.zip
Diffstat (limited to 'src/vehicles')
-rw-r--r--src/vehicles/Vehicle.cpp4
-rw-r--r--src/vehicles/Vehicle.h4
2 files changed, 4 insertions, 4 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 55805e9d..03bdad69 100644
--- a/src/vehicles/Vehicle.h
+++ b/src/vehicles/Vehicle.h
@@ -20,7 +20,7 @@ enum eCarLock {
CARLOCK_LOCKED,
CARLOCK_LOCKOUT_PLAYER_ONLY,
CARLOCK_LOCKED_PLAYER_INSIDE,
- CARLOCK_COP_CAR,
+ CARLOCK_LOCKED_INITIALLY,
CARLOCK_FORCE_SHUT_DOORS,
CARLOCK_SKIP_SHUT_DOORS
};
@@ -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;