Merged AnimatedSprite into Sprite

With AnimatedSprite being the only implementation of the Sprite
interface, there was no longer a point in separating these.

2 files changed, 6 insertions, 6 deletions

diff --git a/src/gui/ministatuswindow.cpp b/src/gui/ministatuswindow.cpp
index 8172189b..534a5c42 100644
--- a/src/gui/ministatuswindow.cpp
+++ b/src/gui/ministatuswindow.cpp
@@ -21,10 +21,10 @@
 
 #include "gui/ministatuswindow.h"
 
-#include "animatedsprite.h"
 #include "configuration.h"
 #include "graphics.h"
 #include "playerinfo.h"
+#include "sprite.h"
 #include "statuseffect.h"
 
 #include "gui/gui.h"
@@ -95,7 +95,7 @@ MiniStatusWindow::MiniStatusWindow():
     addMouseListener(this);
 }
 
-void MiniStatusWindow::setIcon(int index, AnimatedSprite *sprite)
+void MiniStatusWindow::setIcon(int index, Sprite *sprite)
 {
     if (index >= (int) mIcons.size())
         mIcons.resize(index + 1);
@@ -168,7 +168,7 @@ void MiniStatusWindow::event(Event::Channel channel,
                 effect->deliverMessage();
                 effect->playSFX();
 
-                AnimatedSprite *sprite = effect->getIcon();
+                Sprite *sprite = effect->getIcon();
 
                 if (!sprite)
                 {
diff --git a/src/gui/ministatuswindow.h b/src/gui/ministatuswindow.h
index 9400b661..b496fb00 100644
--- a/src/gui/ministatuswindow.h
+++ b/src/gui/ministatuswindow.h
@@ -27,7 +27,7 @@
 
 #include <vector>
 
-class AnimatedSprite;
+class Sprite;
 class Graphics;
 class ProgressBar;
 class TextPopup;
@@ -60,7 +60,7 @@ class MiniStatusWindow : public Popup, public EventListener
         /**
          * Sets one of the icons.
          */
-        void setIcon(int index, AnimatedSprite *sprite);
+        void setIcon(int index, Sprite *sprite);
 
         void eraseIcon(int index);
 
@@ -73,7 +73,7 @@ class MiniStatusWindow : public Popup, public EventListener
         TextPopup *mTextPopup;
 
         std::vector<int> mStatusEffectIcons;
-        std::vector<AnimatedSprite *> mIcons;
+        std::vector<Sprite *> mIcons;
 };
 
 extern MiniStatusWindow *miniStatusWindow;