From d8282da5452b9bb8487d9bce611b922244a74a08 Mon Sep 17 00:00:00 2001 From: Mitchell Stokes Date: Mon, 28 Apr 2014 16:33:26 -0700 Subject: Correction to last commit --- source/gameengine/Converter/BL_ActionActuator.cpp | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'source/gameengine') diff --git a/source/gameengine/Converter/BL_ActionActuator.cpp b/source/gameengine/Converter/BL_ActionActuator.cpp index b606cd1c574..f8c5ffbecfd 100644 --- a/source/gameengine/Converter/BL_ActionActuator.cpp +++ b/source/gameengine/Converter/BL_ActionActuator.cpp @@ -254,17 +254,13 @@ bool BL_ActionActuator::Update(double curtime, bool frame) // Handle a finished animation if ((m_flag & ACT_FLAG_PLAY_END) && (m_flag & ACT_FLAG_ACTIVE) && obj->IsActionDone(m_layer)) { + m_flag &= ~ACT_FLAG_ACTIVE; + m_flag &= ~ACT_FLAG_ATTEMPT_PLAY; + if (m_playtype == ACT_ACTION_PINGPONG) - { m_flag ^= ACT_FLAG_REVERSE; - } else - { - m_flag &= ~ACT_FLAG_ACTIVE; - m_flag &= ~ACT_FLAG_ATTEMPT_PLAY; - return false; - } } // If a different action is playing, we've been overruled and are no longer active -- cgit v1.2.3