summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-05-31 14:41:43 +0300
committerAndrei Karas <akaras@inbox.ru>2014-05-31 14:41:43 +0300
commite349c146291d6328726143935560522fe7def3c1 (patch)
treeefc7b610bbe353f562078f9c14972af1ba374e63
parentd593fa58e641aa90d7e1f0759299c59d2665cca6 (diff)
downloadmv-e349c146291d6328726143935560522fe7def3c1.tar.gz
mv-e349c146291d6328726143935560522fe7def3c1.tar.bz2
mv-e349c146291d6328726143935560522fe7def3c1.tar.xz
mv-e349c146291d6328726143935560522fe7def3c1.zip
Move effectdescription into separate file.
-rw-r--r--src/CMakeLists.txt1
-rw-r--r--src/Makefile.am1
-rw-r--r--src/effectmanager.h19
-rw-r--r--src/resources/effectdescription.h46
4 files changed, 50 insertions, 17 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 475f1cb67..6f4557db2 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -548,6 +548,7 @@ SET(SRCS
resources/dyecolor.h
resources/dyepalette.cpp
resources/dyepalette.h
+ resources/effectdescription.h
resources/emoteinfo.h
resources/emotesprite.h
resources/db/emotedb.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 4e3233c9a..ac41e0f5d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -75,6 +75,7 @@ dyecmd_SOURCES += dyetool/dyemain.cpp \
resources/dye.h \
resources/dyepalette.cpp \
resources/dyepalette.h \
+ resources/effectdescription.h \
resources/emoteinfo.h \
resources/emotesprite.h \
resources/image.cpp \
diff --git a/src/effectmanager.h b/src/effectmanager.h
index 71f3224c4..dd90ddbec 100644
--- a/src/effectmanager.h
+++ b/src/effectmanager.h
@@ -23,6 +23,8 @@
#ifndef EFFECTMANAGER_H
#define EFFECTMANAGER_H
+#include "resources/effectdescription.h"
+
#include <string>
#include <vector>
@@ -34,23 +36,6 @@ class Particle;
class EffectManager final
{
public:
- struct EffectDescription
- {
- EffectDescription(const int id0, const std::string &gfx0,
- const std::string &sfx0,
- const std::string &sprite0) :
- id(id0),
- gfx(gfx0),
- sfx(sfx0),
- sprite(sprite0)
- {
- }
- int id;
- std::string gfx;
- std::string sfx;
- std::string sprite;
- };
-
EffectManager();
A_DELETE_COPY(EffectManager)
diff --git a/src/resources/effectdescription.h b/src/resources/effectdescription.h
new file mode 100644
index 000000000..ea9f18ba6
--- /dev/null
+++ b/src/resources/effectdescription.h
@@ -0,0 +1,46 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2008 Fate <fate.tmw@googlemail.com>
+ * Copyright (C) 2008 Chuck Miller <shadowmil@gmail.com>
+ * 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_EFFECTDESCRIPTION_H
+#define RESOURCES_EFFECTDESCRIPTION_H
+
+#include <string>
+
+#include "localconsts.h"
+
+struct EffectDescription final
+{
+ EffectDescription(const int id0, const std::string &gfx0,
+ const std::string &sfx0,
+ const std::string &sprite0) :
+ id(id0),
+ gfx(gfx0),
+ sfx(sfx0),
+ sprite(sprite0)
+ { }
+
+ int id;
+ std::string gfx;
+ std::string sfx;
+ std::string sprite;
+};
+#endif // RESOURCES_EFFECTDESCRIPTION_H