diff options
| author | Andrei Karas <akaras@inbox.ru> | 2012-04-19 23:48:29 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2012-04-19 23:48:29 +0300 |
| commit | 0b7e752bd177c90a05ca752fa31810f9e34c432c (patch) | |
| tree | db1809a48faf051af11c94058e8f126c9e9ef1ab /src/client.cpp | |
| parent | 23f87c10db7e6b149e9e1f351e1a82516c545df7 (diff) | |
| download | manaverse-0b7e752bd177c90a05ca752fa31810f9e34c432c.tar.gz manaverse-0b7e752bd177c90a05ca752fa31810f9e34c432c.tar.bz2 manaverse-0b7e752bd177c90a05ca752fa31810f9e34c432c.tar.xz manaverse-0b7e752bd177c90a05ca752fa31810f9e34c432c.zip | |
Dehardcode keys in gui widgets.
Add new tab with keys settings in input settings tab.
Diffstat (limited to 'src/client.cpp')
| -rw-r--r-- | src/client.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/client.cpp b/src/client.cpp index f068e4304..077b195c1 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -863,7 +863,15 @@ int Client::gameExec() break; case SDL_KEYDOWN: - inputManager.handleAssignKey(event, INPUT_KEYBOARD); + if (inputManager.handleAssignKey(event, INPUT_KEYBOARD)) + continue; + inputManager.updateConditionMask(); + break; + + case SDL_KEYUP: + if (inputManager.handleAssignKey(event, INPUT_KEYBOARD)) + continue; + inputManager.updateConditionMask(); break; case SDL_JOYBUTTONDOWN: |