diff options
author | Andrei Karas <akaras@inbox.ru> | 2016-10-04 23:47:58 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2016-10-04 23:47:58 +0300 |
commit | 360fac210a053c3217cc87a43ed00e2734ba9aa9 (patch) | |
tree | 5906a1ae86ad4dcc9b38329d19cbbea14dddfa88 /src/gui/windows/npcdialog.h | |
parent | 16be27ddb973b5c2dedb6b5b63083086984c2139 (diff) | |
download | mv-360fac210a053c3217cc87a43ed00e2734ba9aa9.tar.gz mv-360fac210a053c3217cc87a43ed00e2734ba9aa9.tar.bz2 mv-360fac210a053c3217cc87a43ed00e2734ba9aa9.tar.xz mv-360fac210a053c3217cc87a43ed00e2734ba9aa9.zip |
Move npcactionstate into enums directory.
Diffstat (limited to 'src/gui/windows/npcdialog.h')
-rw-r--r-- | src/gui/windows/npcdialog.h | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/src/gui/windows/npcdialog.h b/src/gui/windows/npcdialog.h index 9a905e2f6..429cf95c7 100644 --- a/src/gui/windows/npcdialog.h +++ b/src/gui/windows/npcdialog.h @@ -26,6 +26,7 @@ #include "enums/simpletypes/beingid.h" #include "enums/simpletypes/beingtypeid.h" +#include "enums/gui/npcactionstate.h" #include "enums/gui/npcinputstate.h" #include "gui/models/extendedlistmodel.h" @@ -79,14 +80,6 @@ class NpcDialog final : public Window, void postInit() override final; - enum NpcActionState - { - NPC_ACTION_WAIT = 0, - NPC_ACTION_NEXT, - NPC_ACTION_INPUT, - NPC_ACTION_CLOSE - }; - /** * Called when receiving actions from the widgets. */ @@ -230,7 +223,7 @@ class NpcDialog final : public Window, void mousePressed(MouseEvent &event) override final; int isCloseState() const - { return mActionState == NPC_ACTION_CLOSE; } + { return mActionState == NpcActionState::CLOSE; } void setSkin(const std::string &skin); @@ -315,7 +308,7 @@ class NpcDialog final : public Window, NpcInputStateT mInputState; - NpcActionState mActionState; + NpcActionStateT mActionState; std::vector<Widget*> mSkinControls; std::string mSkinName; PlayerBox *mPlayerBox A_NONNULLPOINTER; |