diff options
| author | Andrei Karas <akaras@inbox.ru> | 2016-10-04 23:42:07 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2016-10-04 23:42:07 +0300 |
| commit | 16be27ddb973b5c2dedb6b5b63083086984c2139 (patch) | |
| tree | 720747e6cb6e9f61b7e8297252582982a834ad02 /src/gui/windows/npcdialog.h | |
| parent | b3145fb5f1ea419d9b3ee60450866fd199ee1103 (diff) | |
| download | manaplus-16be27ddb973b5c2dedb6b5b63083086984c2139.tar.gz manaplus-16be27ddb973b5c2dedb6b5b63083086984c2139.tar.bz2 manaplus-16be27ddb973b5c2dedb6b5b63083086984c2139.tar.xz manaplus-16be27ddb973b5c2dedb6b5b63083086984c2139.zip | |
Move npcinputstate into enums directory.
Diffstat (limited to 'src/gui/windows/npcdialog.h')
| -rw-r--r-- | src/gui/windows/npcdialog.h | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/src/gui/windows/npcdialog.h b/src/gui/windows/npcdialog.h index 1b34eebf4..9a905e2f6 100644 --- a/src/gui/windows/npcdialog.h +++ b/src/gui/windows/npcdialog.h @@ -26,6 +26,8 @@ #include "enums/simpletypes/beingid.h" #include "enums/simpletypes/beingtypeid.h" +#include "enums/gui/npcinputstate.h" + #include "gui/models/extendedlistmodel.h" #include "gui/widgets/window.h" @@ -77,17 +79,6 @@ class NpcDialog final : public Window, void postInit() override final; - enum NpcInputState - { - NPC_INPUT_NONE = 0, - NPC_INPUT_LIST, - NPC_INPUT_STRING, - NPC_INPUT_INTEGER, - NPC_INPUT_ITEM, - NPC_INPUT_ITEM_INDEX, - NPC_INPUT_ITEM_CRAFT - }; - enum NpcActionState { NPC_ACTION_WAIT = 0, @@ -323,7 +314,7 @@ class NpcDialog final : public Window, ScrollArea *mItemScrollArea A_NONNULLPOINTER; - NpcInputState mInputState; + NpcInputStateT mInputState; NpcActionState mActionState; std::vector<Widget*> mSkinControls; std::string mSkinName; |