From 2344f04e853234a762b545bad44a60209d54677f Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 19 May 2014 15:51:59 +0300 Subject: Move emoteinfo into separate file. --- src/resources/db/emotedb.cpp | 1 + src/resources/db/emotedb.h | 16 +--------------- 2 files changed, 2 insertions(+), 15 deletions(-) (limited to 'src/resources/db') 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 sprites; - StringVect particles; - int time; -}; - typedef std::map EmoteInfos; typedef std::map EmoteToEmote; -- cgit v1.2.3-60-g2f50