summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-05-16 17:26:23 +0300
committerAndrei Karas <akaras@inbox.ru>2014-05-16 17:26:23 +0300
commitb2c84fc1db9284acdd0bf5fc344e9d2435d7f45d (patch)
tree3b0b8a45aad3e1937db8907792d425df05559335
parent396b3e298b21677ebe3c6f5c2f5b837ac25625f2 (diff)
downloadplus-b2c84fc1db9284acdd0bf5fc344e9d2435d7f45d.tar.gz
plus-b2c84fc1db9284acdd0bf5fc344e9d2435d7f45d.tar.bz2
plus-b2c84fc1db9284acdd0bf5fc344e9d2435d7f45d.tar.xz
plus-b2c84fc1db9284acdd0bf5fc344e9d2435d7f45d.zip
Move questitemtext into separate file.
-rw-r--r--src/CMakeLists.txt1
-rw-r--r--src/Makefile.am1
-rw-r--r--src/gui/windows/questswindow.cpp12
-rw-r--r--src/resources/questitemtext.h39
4 files changed, 42 insertions, 11 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a04bd8845..a8e76543b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -535,6 +535,7 @@ SET(SRCS
resources/db/npcdb.h
resources/openglimagehelper.cpp
resources/openglimagehelper.h
+ resources/questitemtext.h
resources/db/palettedb.cpp
resources/db/palettedb.h
resources/db/petdb.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index c963a244a..2bc9285b5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -631,6 +631,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
resources/db/npcdb.h \
resources/openglimagehelper.cpp \
resources/openglimagehelper.h \
+ resources/questitemtext.h \
resources/db/palettedb.cpp \
resources/db/palettedb.h \
resources/db/petdb.cpp \
diff --git a/src/gui/windows/questswindow.cpp b/src/gui/windows/questswindow.cpp
index c32d8e928..de7c62116 100644
--- a/src/gui/windows/questswindow.cpp
+++ b/src/gui/windows/questswindow.cpp
@@ -47,6 +47,7 @@
#include "utils/translation/podict.h"
#include "resources/beingcommon.h"
+#include "resources/questitemtext.h"
#include "resources/map/map.h"
@@ -59,17 +60,6 @@ enum QuestType
QUEST_REWARD = 2
};
-struct QuestItemText final
-{
- QuestItemText(const std::string &text0, const int type0) :
- text(text0), type(type0)
- {
- }
-
- std::string text;
- int type;
-};
-
struct QuestItem final
{
QuestItem() :
diff --git a/src/resources/questitemtext.h b/src/resources/questitemtext.h
new file mode 100644
index 000000000..86f8827d2
--- /dev/null
+++ b/src/resources/questitemtext.h
@@ -0,0 +1,39 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2012-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_QUESTITEMTEXT_H
+#define RESOURCES_QUESTITEMTEXT_H
+
+#include <string>
+
+#include "localconsts.h"
+
+struct QuestItemText final
+{
+ QuestItemText(const std::string &text0, const int type0) :
+ text(text0), type(type0)
+ {
+ }
+
+ std::string text;
+ int type;
+};
+
+#endif // RESOURCES_QUESTITEMTEXT_H