Merge commit 'v1.1.11.27' into strippedstripped1.1.11.27

Conflicts:
	data/Makefile.am

1 files changed, 20 insertions, 2 deletions

diff --git a/src/animatedsprite.cpp b/src/animatedsprite.cpp
index c1f1cac85..5277ddf33 100644
--- a/src/animatedsprite.cpp
+++ b/src/animatedsprite.cpp
@@ -42,7 +42,9 @@ AnimatedSprite::AnimatedSprite(SpriteDef *sprite):
     mSprite(sprite),
     mAction(nullptr),
     mAnimation(nullptr),
-    mFrame(nullptr)
+    mFrame(nullptr),
+    mNumber(100),
+    mNumber1(100)
 {
     mAlpha = 1.0f;
 
@@ -90,7 +92,7 @@ bool AnimatedSprite::play(std::string spriteAction)
     if (!mSprite)
         return false;
 
-    Action *action = mSprite->getAction(spriteAction);
+    Action *action = mSprite->getAction(spriteAction, mNumber);
     if (!action)
         return false;
 
@@ -313,3 +315,19 @@ void *AnimatedSprite::getHash()
 //        return mAnimation;
     return this;
 }
+
+bool AnimatedSprite::updateNumber(unsigned num)
+{
+    if (mNumber1 != num)
+    {
+        mNumber1 = num;
+        mNumber = mSprite->findNumber(num);
+        if (!mNumber)
+        {
+            mNumber = 100;
+            return false;
+        }
+        return true;
+    }
+    return false;
+}