summaryrefslogtreecommitdiffstats
path: root/src/vehicles
diff options
context:
space:
mode:
authoreray orçunus <erayorcunus@gmail.com>2020-10-05 21:18:51 +0200
committereray orçunus <erayorcunus@gmail.com>2020-10-05 21:18:51 +0200
commit556dbdcdd6c1f1d8181cde221b3481698ea689cc (patch)
tree46af267a8db9d27b3544e9ce8959c0da08f2afa4 /src/vehicles
parentMerge branch 'master' of https://github.com/GTAmodding/re3 (diff)
parentMerge remote-tracking branch 'upstream/master' (diff)
downloadre3-556dbdcdd6c1f1d8181cde221b3481698ea689cc.tar
re3-556dbdcdd6c1f1d8181cde221b3481698ea689cc.tar.gz
re3-556dbdcdd6c1f1d8181cde221b3481698ea689cc.tar.bz2
re3-556dbdcdd6c1f1d8181cde221b3481698ea689cc.tar.lz
re3-556dbdcdd6c1f1d8181cde221b3481698ea689cc.tar.xz
re3-556dbdcdd6c1f1d8181cde221b3481698ea689cc.tar.zst
re3-556dbdcdd6c1f1d8181cde221b3481698ea689cc.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 9aa90845..82754fe9 100644
--- a/src/vehicles/Vehicle.cpp
+++ b/src/vehicles/Vehicle.cpp
@@ -706,7 +706,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