summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-05-16 17:34:46 +0300
committerAndrei Karas <akaras@inbox.ru>2014-05-16 17:35:51 +0300
commit2b16c3c72da75637c3e1dfc5ae0d7fb0015005fb (patch)
tree504f2a2d15ff4965b836d16995c377f420de7c6e
parentb2c84fc1db9284acdd0bf5fc344e9d2435d7f45d (diff)
downloadmv-2b16c3c72da75637c3e1dfc5ae0d7fb0015005fb.tar.gz
mv-2b16c3c72da75637c3e1dfc5ae0d7fb0015005fb.tar.bz2
mv-2b16c3c72da75637c3e1dfc5ae0d7fb0015005fb.tar.xz
mv-2b16c3c72da75637c3e1dfc5ae0d7fb0015005fb.zip
Move questitem into separate file.
-rw-r--r--src/CMakeLists.txt1
-rw-r--r--src/Makefile.am1
-rw-r--r--src/gui/windows/questswindow.cpp26
-rw-r--r--src/resources/questitem.h56
4 files changed, 59 insertions, 25 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a8e76543b..332ac133e 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/questitem.h
resources/questitemtext.h
resources/db/palettedb.cpp
resources/db/palettedb.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 2bc9285b5..df746602e 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/questitem.h \
resources/questitemtext.h \
resources/db/palettedb.cpp \
resources/db/palettedb.h \
diff --git a/src/gui/windows/questswindow.cpp b/src/gui/windows/questswindow.cpp
index de7c62116..97f11c2e4 100644
--- a/src/gui/windows/questswindow.cpp
+++ b/src/gui/windows/questswindow.cpp
@@ -47,7 +47,7 @@
#include "utils/translation/podict.h"
#include "resources/beingcommon.h"
-#include "resources/questitemtext.h"
+#include "resources/questitem.h"
#include "resources/map/map.h"
@@ -60,30 +60,6 @@ enum QuestType
QUEST_REWARD = 2
};
-struct QuestItem final
-{
- QuestItem() :
- var(0),
- name(),
- group(),
- incomplete(),
- complete(),
- texts(),
- completeFlag(-1),
- broken(false)
- {
- }
-
- int var;
- std::string name;
- std::string group;
- std::set<int> incomplete;
- std::set<int> complete;
- std::vector<QuestItemText> texts;
- int completeFlag;
- bool broken;
-};
-
struct QuestEffect final
{
QuestEffect() :
diff --git a/src/resources/questitem.h b/src/resources/questitem.h
new file mode 100644
index 000000000..c3940f5cb
--- /dev/null
+++ b/src/resources/questitem.h
@@ -0,0 +1,56 @@
+/*
+ * 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_QUESTITEM_H
+#define RESOURCES_QUESTITEM_H
+
+#include "resources/questitemtext.h"
+
+#include <set>
+#include <string>
+#include <vector>
+
+#include "localconsts.h"
+
+struct QuestItem final
+{
+ QuestItem() :
+ var(0),
+ name(),
+ group(),
+ incomplete(),
+ complete(),
+ texts(),
+ completeFlag(-1),
+ broken(false)
+ {
+ }
+
+ int var;
+ std::string name;
+ std::string group;
+ std::set<int> incomplete;
+ std::set<int> complete;
+ std::vector<QuestItemText> texts;
+ int completeFlag;
+ bool broken;
+};
+
+#endif // RESOURCES_QUESTITEM_H