diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-05-19 15:51:59 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-05-19 15:51:59 +0300 |
| commit | 2344f04e853234a762b545bad44a60209d54677f (patch) | |
| tree | 77fb500a44aa155f63e0c87d45d62dd3a94690f0 /src/resources/db | |
| parent | 45753eaadc1fe9adc53f366c2a049199690ffb93 (diff) | |
| download | mv-2344f04e853234a762b545bad44a60209d54677f.tar.gz mv-2344f04e853234a762b545bad44a60209d54677f.tar.bz2 mv-2344f04e853234a762b545bad44a60209d54677f.tar.xz mv-2344f04e853234a762b545bad44a60209d54677f.zip | |
Move emoteinfo into separate file.
Diffstat (limited to 'src/resources/db')
| -rw-r--r-- | src/resources/db/emotedb.cpp | 1 | ||||
| -rw-r--r-- | src/resources/db/emotedb.h | 16 |
2 files changed, 2 insertions, 15 deletions
diff --git a/src/resources/db/emotedb.cpp b/src/resources/db/emotedb.cpp index 2384f3c47..ba7286f61 100644 --- a/src/resources/db/emotedb.cpp +++ b/src/resources/db/emotedb.cpp @@ -28,6 +28,7 @@ #include "configuration.h" #include "resources/beingcommon.h" +#include "resources/emoteinfo.h" #include "resources/emotesprite.h" #include "debug.h" diff --git a/src/resources/db/emotedb.h b/src/resources/db/emotedb.h index 7b4f5480a..699ea7732 100644 --- a/src/resources/db/emotedb.h +++ b/src/resources/db/emotedb.h @@ -31,23 +31,9 @@ class AnimatedSprite; +struct EmoteInfo; struct EmoteSprite; -struct EmoteInfo final -{ - EmoteInfo() : - sprites(), - particles(), - time(400) - { } - - A_DELETE_COPY(EmoteInfo) - - std::list<EmoteSprite*> sprites; - StringVect particles; - int time; -}; - typedef std::map<int, EmoteInfo*> EmoteInfos; typedef std::map<int, int> EmoteToEmote; |