From e8f94fe7ca5e7e7838eaa84f1792b4b42b4bada3 Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Fri, 29 Sep 2006 23:59:08 +0000
Subject: Merged trunk changes from revision 2618 to 2716 into the 0.1.0
 branch.

---
 src/being.cpp | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

(limited to 'src/being.cpp')

diff --git a/src/being.cpp b/src/being.cpp
index 982b0ebf..4d542753 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -331,10 +331,24 @@ Being::setAction(Uint8 action)
                         currentAction = ACTION_ATTACK;
                         break;
                 }
+                for (int i = 0; i < VECTOREND_SPRITE; i++)
+                {
+                    if (mSprites[i])
+                    {
+                        mSprites[i]->reset();
+                    }
+                }
             };
             break;
         case MONSTER_ATTACK:
             currentAction = ACTION_ATTACK;
+            for (int i = 0; i < VECTOREND_SPRITE; i++)
+            {
+                if (mSprites[i])
+                {
+                    mSprites[i]->reset();
+                }
+            }
             break;
         case DEAD:
             currentAction = ACTION_DEAD;
@@ -346,16 +360,7 @@ Being::setAction(Uint8 action)
 
     for (int i = 0; i < VECTOREND_SPRITE; i++)
     {
-        if (!mSprites[i])
-            continue;
-
-        if (currentAction == ACTION_ATTACK ||
-                currentAction == ACTION_ATTACK_STAB ||
-                currentAction == ACTION_ATTACK_BOW)
-        {
-            mSprites[i]->play(currentAction, mAttackSpeed);
-        }
-        else
+        if (mSprites[i])
         {
             mSprites[i]->play(currentAction);
         }
-- 
cgit v1.2.3-70-g09d2