summaryrefslogtreecommitdiff
path: root/src/gui/windows/questswindow.h
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-02-08 21:33:36 +0300
committerAndrei Karas <akaras@inbox.ru>2017-02-08 21:33:36 +0300
commit70fc4db1b5570beceda662e9f34ec1729610512e (patch)
treeaf3873113624fa3484bf3eaef57711d51bca6c19 /src/gui/windows/questswindow.h
parent55a27d259810111936ed92711e69de86431b1fbe (diff)
downloadplus-70fc4db1b5570beceda662e9f34ec1729610512e.tar.gz
plus-70fc4db1b5570beceda662e9f34ec1729610512e.tar.bz2
plus-70fc4db1b5570beceda662e9f34ec1729610512e.tar.xz
plus-70fc4db1b5570beceda662e9f34ec1729610512e.zip
Move quests loading code into quests db.
Diffstat (limited to 'src/gui/windows/questswindow.h')
-rw-r--r--src/gui/windows/questswindow.h18
1 files changed, 4 insertions, 14 deletions
diff --git a/src/gui/windows/questswindow.h b/src/gui/windows/questswindow.h
index 082ab011e..dd3464fae 100644
--- a/src/gui/windows/questswindow.h
+++ b/src/gui/windows/questswindow.h
@@ -47,8 +47,6 @@ struct QuestItem;
typedef std::map<BeingTypeId, const QuestEffect*> NpcQuestEffectMap;
typedef NpcQuestEffectMap::const_iterator NpcQuestEffectMapCIter;
-typedef std::map<int, QuestVar> NpcQuestVarMap;
-typedef NpcQuestVarMap::const_iterator NpcQuestVarMapCIter;
class QuestsWindow final : public Window,
public ActionListener
@@ -79,13 +77,6 @@ class QuestsWindow final : public Window,
void addEffect(Being *const being);
private:
- void loadXmlFile(const std::string &fileName,
- const SkipError skipError);
-
- void loadQuest(const int var, const XmlNodePtr node);
-
- void loadEffect(const int var, const XmlNodePtr node);
-
QuestsModel *mQuestsModel A_NONNULLPOINTER;
ExtendedListBox *mQuestsListBox A_NONNULLPOINTER;
ScrollArea *mQuestScrollArea A_NONNULLPOINTER;
@@ -95,12 +86,11 @@ class QuestsWindow final : public Window,
Button *mCloseButton A_NONNULLPOINTER;
Image *mCompleteIcon;
Image *mIncompleteIcon;
- // quest variables: var, (val1, val2, val3, time)
- NpcQuestVarMap mVars;
- // quests: var, quests
- std::map<int, std::vector<QuestItem*> > mQuests;
- std::vector<QuestEffect*> mAllEffects;
std::vector<const QuestEffect*> mMapEffects;
+ NpcQuestVarMap *mVars;
+ std::map<int, std::vector<QuestItem*> > *mQuests;
+ std::vector<QuestEffect*> *mAllEffects;
+
// npc effects for current map and values: npc, effect
NpcQuestEffectMap mNpcEffects;
std::vector<QuestItem*> mQuestLinks;