summaryrefslogtreecommitdiff
path: root/src/input
diff options
context:
space:
mode:
Diffstat (limited to 'src/input')
-rw-r--r--src/input/inputactionmap.h3
-rw-r--r--src/input/inputcondition.h59
2 files changed, 2 insertions, 60 deletions
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 <http://www.gnu.org/licenses/>.
- */
-
-#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