summaryrefslogtreecommitdiffstats
path: root/src/vehicles
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2020-10-11 11:58:11 +0200
committerNikolay Korolev <nickvnuk@gmail.com>2020-10-11 11:58:11 +0200
commit552f308e9e0a745852ca11064b6b31e16b115917 (patch)
treea88d109962a7de5594f3781fe1e388879936218c /src/vehicles
parentControl updates (diff)
parentMerge pull request #760 from Sergeanur/VC/TextFinish (diff)
downloadre3-552f308e9e0a745852ca11064b6b31e16b115917.tar
re3-552f308e9e0a745852ca11064b6b31e16b115917.tar.gz
re3-552f308e9e0a745852ca11064b6b31e16b115917.tar.bz2
re3-552f308e9e0a745852ca11064b6b31e16b115917.tar.lz
re3-552f308e9e0a745852ca11064b6b31e16b115917.tar.xz
re3-552f308e9e0a745852ca11064b6b31e16b115917.tar.zst
re3-552f308e9e0a745852ca11064b6b31e16b115917.zip
Diffstat (limited to 'src/vehicles')
-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