summaryrefslogtreecommitdiffstats
path: root/src/entities/Physical.cpp
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2020-04-15 22:28:09 +0200
committerGitHub <noreply@github.com>2020-04-15 22:28:09 +0200
commit5cb7e2e42a17104a80053f1219ebbb022ff1dea1 (patch)
treec59643f93c566c0813551f0b59596d44573c7c5b /src/entities/Physical.cpp
parentMerge pull request #429 from Nick007J/master (diff)
parentfixed crash (diff)
downloadre3-5cb7e2e42a17104a80053f1219ebbb022ff1dea1.tar
re3-5cb7e2e42a17104a80053f1219ebbb022ff1dea1.tar.gz
re3-5cb7e2e42a17104a80053f1219ebbb022ff1dea1.tar.bz2
re3-5cb7e2e42a17104a80053f1219ebbb022ff1dea1.tar.lz
re3-5cb7e2e42a17104a80053f1219ebbb022ff1dea1.tar.xz
re3-5cb7e2e42a17104a80053f1219ebbb022ff1dea1.tar.zst
re3-5cb7e2e42a17104a80053f1219ebbb022ff1dea1.zip
Diffstat (limited to 'src/entities/Physical.cpp')
-rw-r--r--src/entities/Physical.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/entities/Physical.cpp b/src/entities/Physical.cpp
index 72d6844d..bbdf68f5 100644
--- a/src/entities/Physical.cpp
+++ b/src/entities/Physical.cpp
@@ -612,7 +612,7 @@ CPhysical::ApplyCollision(CPhysical *B, CColPoint &colpoint, float &impulseA, fl
if(model == MI_FIRE_HYDRANT && !Bobj->bHasBeenDamaged){
CParticleObject::AddObject(POBJECT_FIRE_HYDRANT, B->GetPosition() - CVector(0.0f, 0.0f, 0.5f), true);
Bobj->bHasBeenDamaged = true;
- }else if(B->IsObject() && model != MI_EXPLODINGBARREL && model != MI_PETROLPUMP)
+ }else if(B->IsObject() && !IsExplosiveThingModel(model))
Bobj->bHasBeenDamaged = true;
}else{
if(IsGlass(B->GetModelIndex()))