diff options
author | Chuck Miller <shadowmil@gmail.com> | 2010-11-03 23:50:35 -0400 |
---|---|---|
committer | Chuck Miller <shadowmil@gmail.com> | 2010-11-07 23:26:37 -0500 |
commit | c81b3c269e39700be94fd9e2629b0bdfb0d093f8 (patch) | |
tree | c4dbca3f9dbb288151fec3171089e12295d33e04 /src/gui/emotepopup.cpp | |
parent | 671a465fa2c9469bde36b78c49e84bd0325c4cf1 (diff) | |
download | mana-c81b3c269e39700be94fd9e2629b0bdfb0d093f8.tar.gz mana-c81b3c269e39700be94fd9e2629b0bdfb0d093f8.tar.bz2 mana-c81b3c269e39700be94fd9e2629b0bdfb0d093f8.tar.xz mana-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.cpp | 4 |
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"); |