diff options
| author | Andrei Karas <akaras@inbox.ru> | 2016-03-04 00:40:44 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2016-03-04 00:41:49 +0300 |
| commit | 09970dfce38b0e8910b84743d62c7f66f59e2e1b (patch) | |
| tree | 4955ba789b6e3f40e5e3133aabe18133a6f03bb6 | |
| parent | b9df78a88b4294cdaabd665dd4d88425aaaec3e9 (diff) | |
| download | manaplus-09970dfce38b0e8910b84743d62c7f66f59e2e1b.tar.gz manaplus-09970dfce38b0e8910b84743d62c7f66f59e2e1b.tar.bz2 manaplus-09970dfce38b0e8910b84743d62c7f66f59e2e1b.tar.xz manaplus-09970dfce38b0e8910b84743d62c7f66f59e2e1b.zip | |
Convert questtype enum into strong typed enum.
| -rw-r--r-- | src/enums/resources/questtype.h | 14 | ||||
| -rw-r--r-- | src/gui/windows/questswindow.cpp | 2 | ||||
| -rw-r--r-- | src/resources/questitemtext.h | 6 |
3 files changed, 11 insertions, 11 deletions
diff --git a/src/enums/resources/questtype.h b/src/enums/resources/questtype.h index 62f4271c7..4e83d0f14 100644 --- a/src/enums/resources/questtype.h +++ b/src/enums/resources/questtype.h @@ -21,14 +21,14 @@ #ifndef RESOURCES_QUESTTYPE_H #define RESOURCES_QUESTTYPE_H -namespace QuestType +#include "enums/simpletypes/enumdefines.h" + +enumStart(QuestType) { - enum Type - { - TEXT = 0, - NAME = 1, - REWARD = 2 - }; + TEXT = 0, + NAME = 1, + REWARD = 2 } +enumEnd(QuestType); #endif // RESOURCES_QUESTTYPE_H diff --git a/src/gui/windows/questswindow.cpp b/src/gui/windows/questswindow.cpp index 5c57ca4eb..f8b36342a 100644 --- a/src/gui/windows/questswindow.cpp +++ b/src/gui/windows/questswindow.cpp @@ -26,8 +26,6 @@ #include "being/localplayer.h" -#include "enums/resources/questtype.h" - #include "gui/gui.h" #include "gui/fonts/font.h" diff --git a/src/resources/questitemtext.h b/src/resources/questitemtext.h index 306fe27b8..01d6706ea 100644 --- a/src/resources/questitemtext.h +++ b/src/resources/questitemtext.h @@ -21,19 +21,21 @@ #ifndef RESOURCES_QUESTITEMTEXT_H #define RESOURCES_QUESTITEMTEXT_H +#include "enums/resources/questtype.h" + #include <string> #include "localconsts.h" struct QuestItemText final { - QuestItemText(const std::string &text0, const int type0) : + QuestItemText(const std::string &text0, const QuestTypeT type0) : text(text0), type(type0) { } std::string text; - int type; + QuestTypeT type; }; #endif // RESOURCES_QUESTITEMTEXT_H |