From cd5cd6387c8a62f90a8f44c3657812f3e9a4cab9 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 31 Dec 2015 20:50:50 +0300 Subject: Move inputcondition into enums directory. --- src/CMakeLists.txt | 2 +- src/Makefile.am | 2 +- src/enums/input/inputcondition.h | 59 ++++++++++++++++++++++++++++++++++++++++ src/input/inputactionmap.h | 3 +- src/input/inputcondition.h | 59 ---------------------------------------- 5 files changed, 63 insertions(+), 62 deletions(-) create mode 100644 src/enums/input/inputcondition.h delete mode 100644 src/input/inputcondition.h diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index df056585f..d036d542d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -970,7 +970,7 @@ SET(SRCS input/inputactionoperators.cpp input/inputactionoperators.h input/inputactionsortfunctor.h - input/inputcondition.h + enums/input/inputcondition.h input/inputfunction.h input/inputitem.h input/inputmanager.cpp diff --git a/src/Makefile.am b/src/Makefile.am index 5a5f0383c..050888e8e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -500,7 +500,7 @@ SRC += events/actionevent.h \ input/inputactionoperators.cpp \ input/inputactionoperators.h \ input/inputactionsortfunctor.h \ - input/inputcondition.h \ + enums/input/inputcondition.h \ input/inputfunction.h \ input/inputitem.h \ input/inputmanager.cpp \ diff --git a/src/enums/input/inputcondition.h b/src/enums/input/inputcondition.h new file mode 100644 index 000000000..148497551 --- /dev/null +++ b/src/enums/input/inputcondition.h @@ -0,0 +1,59 @@ +/* + * The ManaPlus Client + * Copyright (C) 2012-2015 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 . + */ + +#ifndef ENUMS_INPUT_INPUTCONDITION_H +#define ENUMS_INPUT_INPUTCONDITION_H + +namespace InputCondition +{ + enum Type + { + DEFAULT = 1, // default condition + ENABLED = 2, // keyboard must be enabled + NOINPUT = 4, // input items must be unfocused + NOAWAY = 8, // player not in away mode + NOSETUP = 16, // setup window is hidde + VALIDSPEED = 32, // valid speed + NOMODAL = 64, // modal windows inactive + NONPCINPUT = 128, // npc input field inactive + EMODS = 256, // game modifiers enabled + NOTARGET = 512, // no target/untarget keys + // pressed + NOFOLLOW = 1024, // follow mode disabled + INGAME = 2048, // game must be started + NOBUYSELL = 4096, // no active buy or sell dialogs + NONPCDIALOG = 8192, // no active npc dialog or + // dialog almost closed + NOTALKING = 16384, // player have no opened + // dialogs what prevent moving + ALIVE = 32768, // player alive + NOVENDING = 65536, // vending disabled + NOROOM = 131072, // not joined room + NOBLOCK = 262144, // no blocked move (trick dead) + SHORTCUT = 2 + 4 + 16 + 512 + 2048, // flags for shortcut keys + SHORTCUT0 = 2 + 4 + 16 + 512, // flags for shortcut keys + GAME = 2 + 4 + 8 + 16 + 64 + 2048, // main game key + GAME2 = 2 + 8 + 16 + 64 + 2048, + ARROWKEYS = 2 + 4 + 8 + 16 + 64 + 2048 + 4096 + + 16384 + 65536 + 131072 + 262144 + }; +} // namespace InputCondition + +#endif // ENUMS_INPUT_INPUTCONDITION_H diff --git a/src/input/inputactionmap.h b/src/input/inputactionmap.h index e08885edb..f76265d98 100644 --- a/src/input/inputactionmap.h +++ b/src/input/inputactionmap.h @@ -35,8 +35,9 @@ #include "actions/target.h" #include "actions/windows.h" +#include "enums/input/inputcondition.h" + #include "input/inputactiondata.h" -#include "input/inputcondition.h" #include "input/inputmanager.h" #include "localconsts.h" diff --git a/src/input/inputcondition.h b/src/input/inputcondition.h deleted file mode 100644 index 0f6e4cb6d..000000000 --- a/src/input/inputcondition.h +++ /dev/null @@ -1,59 +0,0 @@ -/* - * The ManaPlus Client - * Copyright (C) 2012-2015 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 . - */ - -#ifndef INPUT_INPUTCONDITION_H -#define INPUT_INPUTCONDITION_H - -namespace InputCondition -{ - enum Type - { - DEFAULT = 1, // default condition - ENABLED = 2, // keyboard must be enabled - NOINPUT = 4, // input items must be unfocused - NOAWAY = 8, // player not in away mode - NOSETUP = 16, // setup window is hidde - VALIDSPEED = 32, // valid speed - NOMODAL = 64, // modal windows inactive - NONPCINPUT = 128, // npc input field inactive - EMODS = 256, // game modifiers enabled - NOTARGET = 512, // no target/untarget keys - // pressed - NOFOLLOW = 1024, // follow mode disabled - INGAME = 2048, // game must be started - NOBUYSELL = 4096, // no active buy or sell dialogs - NONPCDIALOG = 8192, // no active npc dialog or - // dialog almost closed - NOTALKING = 16384, // player have no opened - // dialogs what prevent moving - ALIVE = 32768, // player alive - NOVENDING = 65536, // vending disabled - NOROOM = 131072, // not joined room - NOBLOCK = 262144, // no blocked move (trick dead) - SHORTCUT = 2 + 4 + 16 + 512 + 2048, // flags for shortcut keys - SHORTCUT0 = 2 + 4 + 16 + 512, // flags for shortcut keys - GAME = 2 + 4 + 8 + 16 + 64 + 2048, // main game key - GAME2 = 2 + 8 + 16 + 64 + 2048, - ARROWKEYS = 2 + 4 + 8 + 16 + 64 + 2048 + 4096 + - 16384 + 65536 + 131072 + 262144 - }; -} // namespace InputCondition - -#endif // INPUT_INPUTCONDITION_H -- cgit v1.2.3-60-g2f50