From 360fac210a053c3217cc87a43ed00e2734ba9aa9 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 4 Oct 2016 23:47:58 +0300 Subject: Move npcactionstate into enums directory. --- src/gui/windows/npcdialog.h | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'src/gui/windows/npcdialog.h') 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 mSkinControls; std::string mSkinName; PlayerBox *mPlayerBox A_NONNULLPOINTER; -- cgit v1.2.3-60-g2f50