summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-05-19 15:51:59 +0300
committerAndrei Karas <akaras@inbox.ru>2014-05-19 15:51:59 +0300
commit2344f04e853234a762b545bad44a60209d54677f (patch)
tree77fb500a44aa155f63e0c87d45d62dd3a94690f0 /src
parent45753eaadc1fe9adc53f366c2a049199690ffb93 (diff)
downloadmv-2344f04e853234a762b545bad44a60209d54677f.tar.gz
mv-2344f04e853234a762b545bad44a60209d54677f.tar.bz2
mv-2344f04e853234a762b545bad44a60209d54677f.tar.xz
mv-2344f04e853234a762b545bad44a60209d54677f.zip
Move emoteinfo into separate file.
Diffstat (limited to 'src')
-rw-r--r--src/CMakeLists.txt1
-rw-r--r--src/Makefile.am1
-rw-r--r--src/being/being.cpp1
-rw-r--r--src/resources/db/emotedb.cpp1
-rw-r--r--src/resources/db/emotedb.h16
-rw-r--r--src/resources/emoteinfo.h48
6 files changed, 53 insertions, 15 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0dee9f08c..04aeae206 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -535,6 +535,7 @@ SET(SRCS
resources/dyecolor.h
resources/dyepalette.cpp
resources/dyepalette.h
+ resources/emoteinfo.h
resources/emotesprite.h
resources/db/emotedb.cpp
resources/db/emotedb.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 2f0438cb5..ed3268b23 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -73,6 +73,7 @@ dyecmd_SOURCES += dyetool/dyemain.cpp \
resources/dye.h \
resources/dyepalette.cpp \
resources/dyepalette.h \
+ resources/emoteinfo.h \
resources/emotesprite.h \
resources/image.cpp \
resources/image.h \
diff --git a/src/being/being.cpp b/src/being/being.cpp
index e97d5d512..e4205a727 100644
--- a/src/being/being.cpp
+++ b/src/being/being.cpp
@@ -62,6 +62,7 @@
#include "net/playerhandler.h"
#include "resources/attack.h"
+#include "resources/emoteinfo.h"
#include "resources/emotesprite.h"
#include "resources/iteminfo.h"
#include "resources/resourcemanager.h"
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