summaryrefslogtreecommitdiffstats
path: root/src/vehicles/Vehicle.cpp
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2020-10-11 00:18:08 +0200
committerSergeanur <s.anureev@yandex.ua>2020-10-11 00:18:08 +0200
commitf1bb09826d0d1e6a1f5ac92ad97c25ecf2843f98 (patch)
treebe72177b9fd7d8837042b4397a79ffc83fb89bdd /src/vehicles/Vehicle.cpp
parentbug fix (diff)
parentMerge pull request #745 from Tatsh/vscode (diff)
downloadre3-f1bb09826d0d1e6a1f5ac92ad97c25ecf2843f98.tar
re3-f1bb09826d0d1e6a1f5ac92ad97c25ecf2843f98.tar.gz
re3-f1bb09826d0d1e6a1f5ac92ad97c25ecf2843f98.tar.bz2
re3-f1bb09826d0d1e6a1f5ac92ad97c25ecf2843f98.tar.lz
re3-f1bb09826d0d1e6a1f5ac92ad97c25ecf2843f98.tar.xz
re3-f1bb09826d0d1e6a1f5ac92ad97c25ecf2843f98.tar.zst
re3-f1bb09826d0d1e6a1f5ac92ad97c25ecf2843f98.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