Pause the bomb during animations, fixes #2846

2017-05-06 18:46:25 -04:00 · 2017-05-06 18:46:25 -04:00 · 242c8be90c
commit 242c8be90c
parent 58a170b4b7
1 changed files with 6 additions and 0 deletions
--- a/src/items/attachment.cpp
+++ b/src/items/attachment.cpp
@ -486,6 +486,12 @@ void Attachment::handleCollisionWithKart(AbstractKart *other)
 void Attachment::update(float dt)
 {
    if(m_type==ATTACH_NOTHING) return;
+
+    // suspend the bomb during animations to avoid having 2 animations at the
+    // same time should the bomb explode before the previous animation is done
+    if (m_type == ATTACH_BOMB && m_kart->getKartAnimation() != NULL)
+        return;
+
    m_time_left -=dt;