From e71b8c2bd9722aae29ed36b78806867964a3121d Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 28 Aug 2013 00:29:14 +0300 Subject: add support for process all input events before entering game. add flag for in game action conditions. --- src/inputmanager.h | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) (limited to 'src/inputmanager.h') diff --git a/src/inputmanager.h b/src/inputmanager.h index 2f3a9afc1..d3c245379 100644 --- a/src/inputmanager.h +++ b/src/inputmanager.h @@ -73,20 +73,22 @@ struct KeyFunction final enum KeyCondition { - COND_DEFAULT = 1, // default condition - COND_ENABLED = 2, // keyboard must be enabled - COND_NOINPUT = 4, // input items must be unfocused - COND_NOAWAY = 8, // player not in away mode - COND_NOSETUP = 16, // setup window is hidde - COND_VALIDSPEED = 32, // valid speed - COND_NOMODAL = 64, // modal windows inactive - COND_NONPCINPUT = 128, // npc input field inactive - COND_EMODS = 256, // game modifiers enabled - COND_NOTARGET = 512, // no target/untarget keys pressed - COND_NOFOLLOW = 1024, // follow mode disabled - COND_SHORTCUT = 2 + 4 + 16 + 512, // flags for shortcut keys - COND_GAME = 2 + 4 + 8 + 16 + 64, // main game key - COND_GAME2 = 2 + 8 + 16 + 64 + COND_DEFAULT = 1, // default condition + COND_ENABLED = 2, // keyboard must be enabled + COND_NOINPUT = 4, // input items must be unfocused + COND_NOAWAY = 8, // player not in away mode + COND_NOSETUP = 16, // setup window is hidde + COND_VALIDSPEED = 32, // valid speed + COND_NOMODAL = 64, // modal windows inactive + COND_NONPCINPUT = 128, // npc input field inactive + COND_EMODS = 256, // game modifiers enabled + COND_NOTARGET = 512, // no target/untarget keys + // pressed + COND_NOFOLLOW = 1024, // follow mode disabled + COND_INGAME = 2048, // game must be started + COND_SHORTCUT = 2 + 4 + 16 + 512 + 2048, // flags for shortcut keys + COND_GAME = 2 + 4 + 8 + 16 + 64 + 2048, // main game key + COND_GAME2 = 2 + 8 + 16 + 64 + 2048 }; class InputManager final -- cgit v1.2.3-70-g09d2