diff options
author | Jared Adams <jaxad0127@gmail.com> | 2009-03-12 06:44:16 -0600 |
---|---|---|
committer | Ira Rice <irarice@gmail.com> | 2009-03-12 08:38:07 -0600 |
commit | 37b812f2892a9b11a88abcbcde0b47aca76f4a71 (patch) | |
tree | 6872d9c5420845c50c1ea411c0f999aeb8ffc434 /src/gui/emoteshortcutcontainer.cpp | |
parent | 5b1e2aae6391edc99425ed7671d59eddd774212e (diff) | |
download | mana-client-37b812f2892a9b11a88abcbcde0b47aca76f4a71.tar.gz mana-client-37b812f2892a9b11a88abcbcde0b47aca76f4a71.tar.bz2 mana-client-37b812f2892a9b11a88abcbcde0b47aca76f4a71.tar.xz mana-client-37b812f2892a9b11a88abcbcde0b47aca76f4a71.zip |
Move emote sprite loading into EmoteDB
Diffstat (limited to 'src/gui/emoteshortcutcontainer.cpp')
-rw-r--r-- | src/gui/emoteshortcutcontainer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/emoteshortcutcontainer.cpp b/src/gui/emoteshortcutcontainer.cpp index f4cef106..8c9df14e 100644 --- a/src/gui/emoteshortcutcontainer.cpp +++ b/src/gui/emoteshortcutcontainer.cpp @@ -60,7 +60,7 @@ EmoteShortcutContainer::EmoteShortcutContainer(): // Setup emote sprites for (int i = 0; i <= EmoteDB::getLast(); i++) { - mEmoteImg.push_back(player_node->getEmote(i)); + mEmoteImg.push_back(EmoteDB::getAnimation(i)); } mMaxItems = EmoteDB::getLast() < MAX_ITEMS ? EmoteDB::getLast() : MAX_ITEMS; @@ -113,7 +113,7 @@ void EmoteShortcutContainer::draw(gcn::Graphics *graphics) if (mEmoteMoved) { // Draw the emote image being dragged by the cursor. - AnimatedSprite* sprite = mEmoteImg[mEmoteMoved - 1]; + const AnimatedSprite* sprite = mEmoteImg[mEmoteMoved - 1]; if (sprite) { const int tPosX = mCursorPosX - (sprite->getWidth() / 2); |