Fix assertion when hitting vault

hexagonrecursion · Aug 23, 2024 · 7cc2b54 · 7cc2b54
1 parent aad5918
commit 7cc2b54
Showing 1 changed file with 7 additions and 9 deletions.
diff --git a/colobot-base/src/physics/physics.cpp b/colobot-base/src/physics/physics.cpp
@@ -2725,10 +2725,8 @@ bool CPhysics::ExploOther(ObjectType iType,
             // TODO: implement "killer"?
             dynamic_cast<CDamageableObject&>(*pObj).DamageObject(damageType);
         }
-    }
 
-    if ( force > 25.0f )
-    {
+        float damage = -1.0f;
         // TODO: Some function in CShieldedObject. GetCollisionResistance()?
         if (oType == OBJECT_DERRICK  ||
             oType == OBJECT_FACTORY  ||
@@ -2747,11 +2745,8 @@ bool CPhysics::ExploOther(ObjectType iType,
             oType == OBJECT_SAFE     ||
             oType == OBJECT_HUSTON    )  // building?
         {
-            assert(pObj->Implements(ObjectInterfaceType::Damageable));
-            // TODO: implement "killer"?
-            dynamic_cast<CDamageableObject&>(*pObj).DamageObject(DamageType::Collision, force/400.0f);
+            damage = force/400.0f;
         }
-
         if (oType == OBJECT_MOBILEwa ||
             oType == OBJECT_MOBILEta ||
             oType == OBJECT_MOBILEfa ||
@@ -2784,9 +2779,12 @@ bool CPhysics::ExploOther(ObjectType iType,
             oType == OBJECT_MOBILErp ||
             oType == OBJECT_MOBILEst  )  // vehicle?
         {
-            assert(pObj->Implements(ObjectInterfaceType::Damageable));
+            damage = force/200.0f;
+        }
+        if ( force > 25.0f && damage > 0.0f )
+        {
             // TODO: implement "killer"?
-            dynamic_cast<CDamageableObject&>(*pObj).DamageObject(DamageType::Collision, force/200.0f);
+            dynamic_cast<CDamageableObject&>(*pObj).DamageObject(DamageType::Collision, damage);
         }
     }