summaryrefslogtreecommitdiffstats
path: root/src/weapons
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2021-08-08 14:46:47 +0200
committerNikolay Korolev <nickvnuk@gmail.com>2021-08-08 14:46:47 +0200
commit74f00c3c6362f1fe7ee9d25a99ee8db5ce4e88dd (patch)
treeebe621b0d748a1a8854760cdfbd227ce7d93d164 /src/weapons
parentmerge (diff)
parentMerge branch 'master' into miami (diff)
downloadre3-74f00c3c6362f1fe7ee9d25a99ee8db5ce4e88dd.tar
re3-74f00c3c6362f1fe7ee9d25a99ee8db5ce4e88dd.tar.gz
re3-74f00c3c6362f1fe7ee9d25a99ee8db5ce4e88dd.tar.bz2
re3-74f00c3c6362f1fe7ee9d25a99ee8db5ce4e88dd.tar.lz
re3-74f00c3c6362f1fe7ee9d25a99ee8db5ce4e88dd.tar.xz
re3-74f00c3c6362f1fe7ee9d25a99ee8db5ce4e88dd.tar.zst
re3-74f00c3c6362f1fe7ee9d25a99ee8db5ce4e88dd.zip
Diffstat (limited to '')
-rw-r--r--src/weapons/Weapon.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/weapons/Weapon.cpp b/src/weapons/Weapon.cpp
index f31e0c60..39f2265f 100644
--- a/src/weapons/Weapon.cpp
+++ b/src/weapons/Weapon.cpp
@@ -3163,7 +3163,11 @@ CWeapon::HitsGround(CEntity *holder, CVector *fireSource, CEntity *aimingTo)
void
CWeapon::BlowUpExplosiveThings(CEntity *thing)
{
+#ifdef FIX_BUGS
+ if ( thing && thing->IsObject() )
+#else
if ( thing )
+#endif
{
CObject *object = (CObject*)thing;
int32 mi = object->GetModelIndex();