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 | |
parent | 45753eaadc1fe9adc53f366c2a049199690ffb93 (diff) | |
download | manaplus-2344f04e853234a762b545bad44a60209d54677f.tar.gz manaplus-2344f04e853234a762b545bad44a60209d54677f.tar.bz2 manaplus-2344f04e853234a762b545bad44a60209d54677f.tar.xz manaplus-2344f04e853234a762b545bad44a60209d54677f.zip |
Move emoteinfo into separate file.
Diffstat (limited to 'src/resources')
-rw-r--r-- | src/resources/db/emotedb.cpp | 1 | ||||
-rw-r--r-- | src/resources/db/emotedb.h | 16 | ||||
-rw-r--r-- | src/resources/emoteinfo.h | 48 |
3 files changed, 50 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; diff --git a/src/resources/emoteinfo.h b/src/resources/emoteinfo.h new file mode 100644 index 000000000..faa0429a2 --- /dev/null +++ b/src/resources/emoteinfo.h @@ -0,0 +1,48 @@ +/* + * Emote database + * Copyright (C) 2009 Aethyra Development Team + * Copyright (C) 2011-2014 The ManaPlus Developers + * + * This file is part of The ManaPlus Client. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +#ifndef RESOURCES_EMOTEINFO_H +#define RESOURCES_EMOTEINFO_H + +#include "utils/stringvector.h" + +#include <list> + +#include "localconsts.h" + +struct EmoteSprite; + +struct EmoteInfo final +{ + EmoteInfo() : + sprites(), + particles(), + time(400) + { } + + A_DELETE_COPY(EmoteInfo) + + std::list<EmoteSprite*> sprites; + StringVect particles; + int time; +}; + +#endif // RESOURCES_EMOTEINFO_H |