diff options
| -rw-r--r-- | src/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/Makefile.am | 1 | ||||
| -rw-r--r-- | src/gui/windows/questswindow.cpp | 19 | ||||
| -rw-r--r-- | src/resources/questeffect.h | 47 |
4 files changed, 50 insertions, 18 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 332ac133e..9f2cd061e 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/questeffect.h resources/questitem.h resources/questitemtext.h resources/db/palettedb.cpp diff --git a/src/Makefile.am b/src/Makefile.am index df746602e..50e060294 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/questeffect.h \ resources/questitem.h \ resources/questitemtext.h \ resources/db/palettedb.cpp \ diff --git a/src/gui/windows/questswindow.cpp b/src/gui/windows/questswindow.cpp index 97f11c2e4..6ed7d6650 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/questeffect.h" #include "resources/questitem.h" #include "resources/map/map.h" @@ -60,24 +61,6 @@ enum QuestType QUEST_REWARD = 2 }; -struct QuestEffect final -{ - QuestEffect() : - map(), - var(0), - id(0), - effectId(0), - values() - { - } - - std::string map; - int var; - int id; - int effectId; - std::set<int> values; -}; - QuestsWindow::QuestsWindow() : // TRANSLATORS: quests window name Window(_("Quests"), false, nullptr, "quests.xml"), diff --git a/src/resources/questeffect.h b/src/resources/questeffect.h new file mode 100644 index 000000000..534232183 --- /dev/null +++ b/src/resources/questeffect.h @@ -0,0 +1,47 @@ +/* + * 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_QUESTEFFECT_H +#define RESOURCES_QUESTEFFECT_H + +#include <set> +#include <string> + +#include "localconsts.h" + +struct QuestEffect final +{ + QuestEffect() : + map(), + var(0), + id(0), + effectId(0), + values() + { + } + + std::string map; + int var; + int id; + int effectId; + std::set<int> values; +}; + +#endif // RESOURCES_QUESTEFFECT_H |