diff options
| author | Mitchell Stokes <mogurijin@gmail.com> | 2014-04-29 03:33:26 +0400 |
|---|---|---|
| committer | Mitchell Stokes <mogurijin@gmail.com> | 2014-04-29 03:33:26 +0400 |
| commit | d8282da5452b9bb8487d9bce611b922244a74a08 (patch) | |
| tree | bb4d231d4b9dd441466ef78a8f425886ca06001b /source/gameengine | |
| parent | 3448822b2ffc2a560c6902470d5a572dfa344e1d (diff) | |
Correction to last commit
Diffstat (limited to 'source/gameengine')
| -rw-r--r-- | source/gameengine/Converter/BL_ActionActuator.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
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 |