summaryrefslogtreecommitdiffstats
path: root/src/vehicles/Vehicle.cpp
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2020-10-11 09:33:56 +0200
committerSergeanur <s.anureev@yandex.ua>2020-10-11 09:33:56 +0200
commit43af5d9c1f94c9674593e5ddda18d3f0f34700ae (patch)
tree3b0c9210add1242d452c5b525b3c0baf9561f21a /src/vehicles/Vehicle.cpp
parentFinish Text stuff (diff)
parentMerge remote-tracking branch 'origin/master' into miami (diff)
downloadre3-43af5d9c1f94c9674593e5ddda18d3f0f34700ae.tar
re3-43af5d9c1f94c9674593e5ddda18d3f0f34700ae.tar.gz
re3-43af5d9c1f94c9674593e5ddda18d3f0f34700ae.tar.bz2
re3-43af5d9c1f94c9674593e5ddda18d3f0f34700ae.tar.lz
re3-43af5d9c1f94c9674593e5ddda18d3f0f34700ae.tar.xz
re3-43af5d9c1f94c9674593e5ddda18d3f0f34700ae.tar.zst
re3-43af5d9c1f94c9674593e5ddda18d3f0f34700ae.zip
Diffstat (limited to 'src/vehicles/Vehicle.cpp')
-rw-r--r--src/vehicles/Vehicle.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/vehicles/Vehicle.cpp b/src/vehicles/Vehicle.cpp
index 6e86dbe4..994f3c99 100644
--- a/src/vehicles/Vehicle.cpp
+++ b/src/vehicles/Vehicle.cpp
@@ -1303,7 +1303,7 @@ CVehicle::InflictDamage(CEntity *damagedBy, eWeaponType weaponType, float damage
}
}
#ifdef FIX_BUGS // removing dumb case when shooting police car in player's own garage gives wanted level
- if (GetModelIndex() == MI_POLICE && damagedBy == FindPlayerPed() && !bHasBeenOwnedByPlayer)
+ if (GetModelIndex() == MI_POLICE && damagedBy == FindPlayerPed() && damagedBy != nil && !bHasBeenOwnedByPlayer)
#else
if (GetModelIndex() == MI_POLICE && damagedBy == FindPlayerPed())
#endif