summaryrefslogtreecommitdiff
path: root/src/gui/emotepopup.cpp
diff options
context:
space:
mode:
authorChuck Miller <shadowmil@gmail.com>2010-11-03 23:50:35 -0400
committerChuck Miller <shadowmil@gmail.com>2010-11-07 23:26:37 -0500
commitc81b3c269e39700be94fd9e2629b0bdfb0d093f8 (patch)
treec4dbca3f9dbb288151fec3171089e12295d33e04 /src/gui/emotepopup.cpp
parent671a465fa2c9469bde36b78c49e84bd0325c4cf1 (diff)
downloadmana-client-c81b3c269e39700be94fd9e2629b0bdfb0d093f8.tar.gz
mana-client-c81b3c269e39700be94fd9e2629b0bdfb0d093f8.tar.bz2
mana-client-c81b3c269e39700be94fd9e2629b0bdfb0d093f8.tar.xz
mana-client-c81b3c269e39700be94fd9e2629b0bdfb0d093f8.zip
Convert the emote system to use particles
Reviewed-by: Jared Adams
Diffstat (limited to 'src/gui/emotepopup.cpp')
-rw-r--r--src/gui/emotepopup.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/emotepopup.cpp b/src/gui/emotepopup.cpp
index f9dc8e0f..bd40a932 100644
--- a/src/gui/emotepopup.cpp
+++ b/src/gui/emotepopup.cpp
@@ -22,7 +22,7 @@
#include "gui/emotepopup.h"
-#include "animatedsprite.h"
+#include "imagesprite.h"
#include "configuration.h"
#include "emoteshortcut.h"
#include "graphics.h"
@@ -53,7 +53,7 @@ EmotePopup::EmotePopup():
// Setup emote sprites
for (int i = 0; i <= EmoteDB::getLast(); ++i)
{
- mEmotes.push_back(EmoteDB::getAnimation(i));
+ mEmotes.push_back(EmoteDB::get(i)->sprite);
}
mSelectionImage = Theme::getImageFromTheme("selection.png");