summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-05-19 15:45:29 +0300
committerAndrei Karas <akaras@inbox.ru>2014-05-19 15:45:29 +0300
commit45753eaadc1fe9adc53f366c2a049199690ffb93 (patch)
treee79993f205934a48a19a6673365764dc36561d58
parent7f97219905c2ad4ffcf9a36a019bf43ad4f0f93b (diff)
downloadmv-45753eaadc1fe9adc53f366c2a049199690ffb93.tar.gz
mv-45753eaadc1fe9adc53f366c2a049199690ffb93.tar.bz2
mv-45753eaadc1fe9adc53f366c2a049199690ffb93.tar.xz
mv-45753eaadc1fe9adc53f366c2a049199690ffb93.zip
Move emotesprite into separate file.
-rw-r--r--src/CMakeLists.txt1
-rw-r--r--src/Makefile.am1
-rw-r--r--src/being/being.cpp1
-rw-r--r--src/gui/widgets/emoteshortcutcontainer.cpp1
-rw-r--r--src/resources/db/emotedb.cpp1
-rw-r--r--src/resources/db/emotedb.h15
-rw-r--r--src/resources/emotesprite.h46
7 files changed, 52 insertions, 14 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a00277521..0dee9f08c 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/emotesprite.h
resources/db/emotedb.cpp
resources/db/emotedb.h
resources/fboinfo.h
diff --git a/src/Makefile.am b/src/Makefile.am
index faa6a241d..2f0438cb5 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/emotesprite.h \
resources/image.cpp \
resources/image.h \
resources/imagehelper.cpp \
diff --git a/src/being/being.cpp b/src/being/being.cpp
index 5eb26d1a3..e97d5d512 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/emotesprite.h"
#include "resources/iteminfo.h"
#include "resources/resourcemanager.h"
#include "resources/spriteaction.h"
diff --git a/src/gui/widgets/emoteshortcutcontainer.cpp b/src/gui/widgets/emoteshortcutcontainer.cpp
index 79a4021a4..64243e61f 100644
--- a/src/gui/widgets/emoteshortcutcontainer.cpp
+++ b/src/gui/widgets/emoteshortcutcontainer.cpp
@@ -33,6 +33,7 @@
#include "gui/popups/textpopup.h"
+#include "resources/emotesprite.h"
#include "resources/image.h"
#include "resources/db/emotedb.h"
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
{
diff --git a/src/resources/emotesprite.h b/src/resources/emotesprite.h
new file mode 100644
index 000000000..99ecd977f
--- /dev/null
+++ b/src/resources/emotesprite.h
@@ -0,0 +1,46 @@
+/*
+ * 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_EMOTESPRITE_H
+#define RESOURCES_EMOTESPRITE_H
+
+#include <string>
+
+#include "localconsts.h"
+
+class AnimatedSprite;
+
+struct EmoteSprite final
+{
+ EmoteSprite() :
+ sprite(nullptr),
+ id(0),
+ name()
+ { }
+
+ A_DELETE_COPY(EmoteSprite)
+
+ const AnimatedSprite *sprite;
+ int id;
+ std::string name;
+};
+
+#endif // RESOURCES_EMOTESPRITE_H