diff options
| -rw-r--r-- | src/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/Makefile.am | 1 | ||||
| -rw-r--r-- | src/gui/windows/questswindow.cpp | 12 | ||||
| -rw-r--r-- | src/resources/questitemtext.h | 39 |
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 |