From 0d12dedd90ab3826220f80c6408dd75f5f9f4381 Mon Sep 17 00:00:00 2001 From: krzys-h Date: Thu, 7 Apr 2016 20:21:35 +0200 Subject: [PATCH] Fixed failed assertion when non-damageable objects get fall damage (closes #764) --- src/physics/physics.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/physics/physics.cpp b/src/physics/physics.cpp index e4013bb9..8fcc08c3 100644 --- a/src/physics/physics.cpp +++ b/src/physics/physics.cpp @@ -1577,10 +1577,13 @@ bool CPhysics::EventFrame(const Event &event) if ( m_bLand && m_fallingHeight != 0.0f ) // if fell { - float force = (m_fallingHeight - m_object->GetPosition().y) * m_fallDamageFraction; - if (m_object->DamageObject(DamageType::Fall, force)) + if (m_object->Implements(ObjectInterfaceType::Damageable)) { - return false; // ugly hack, but works for 0.1.6 release :/ + float force = (m_fallingHeight - m_object->GetPosition().y) * m_fallDamageFraction; + if (m_object->DamageObject(DamageType::Fall, force)) + { + return false; // ugly hack, but works for 0.1.6 release :/ + } } m_fallingHeight = 0.0f; }