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/resources/emotedb.h | |
| parent | 671a465fa2c9469bde36b78c49e84bd0325c4cf1 (diff) | |
| download | mana-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/resources/emotedb.h')
| -rw-r--r-- | src/resources/emotedb.h | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/src/resources/emotedb.h b/src/resources/emotedb.h index 3d80ce8f..a2887a74 100644 --- a/src/resources/emotedb.h +++ b/src/resources/emotedb.h @@ -25,21 +25,16 @@ #include <map> #include <string> -class AnimatedSprite; +class ImageSprite; -struct EmoteSprite +struct Emote { - const AnimatedSprite *sprite; std::string name; + ImageSprite *sprite; + int effect; }; -struct EmoteInfo -{ - std::list<EmoteSprite*> sprites; - std::list<std::string> particles; -}; - -typedef std::map<int, EmoteInfo*> EmoteInfos; +typedef std::map<int, Emote*> Emotes; /** * Emote information database. @@ -50,13 +45,11 @@ namespace EmoteDB void unload(); - const EmoteInfo *get(int id); - - const AnimatedSprite *getAnimation(int id); + const Emote *get(int id); const int &getLast(); - typedef EmoteInfos::iterator EmoteInfosIterator; + typedef Emotes::iterator EmotesIterator; } #endif |