diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-05-19 15:45:29 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-05-19 15:45:29 +0300 |
| commit | 45753eaadc1fe9adc53f366c2a049199690ffb93 (patch) | |
| tree | e79993f205934a48a19a6673365764dc36561d58 /src/resources/db | |
| parent | 7f97219905c2ad4ffcf9a36a019bf43ad4f0f93b (diff) | |
| download | mv-45753eaadc1fe9adc53f366c2a049199690ffb93.tar.gz mv-45753eaadc1fe9adc53f366c2a049199690ffb93.tar.bz2 mv-45753eaadc1fe9adc53f366c2a049199690ffb93.tar.xz mv-45753eaadc1fe9adc53f366c2a049199690ffb93.zip | |
Move emotesprite 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 | 15 |
2 files changed, 2 insertions, 14 deletions
diff --git a/src/resources/db/emotedb.cpp b/src/resources/db/emotedb.cpp index 943628978..2384f3c47 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/emotesprite.h" #include "debug.h" diff --git a/src/resources/db/emotedb.h b/src/resources/db/emotedb.h index 29a2a8de4..7b4f5480a 100644 --- a/src/resources/db/emotedb.h +++ b/src/resources/db/emotedb.h @@ -31,20 +31,7 @@ class AnimatedSprite; -struct EmoteSprite final -{ - EmoteSprite() : - sprite(nullptr), - id(0), - name() - { } - - A_DELETE_COPY(EmoteSprite) - - const AnimatedSprite *sprite; - int id; - std::string name; -}; +struct EmoteSprite; struct EmoteInfo final { |