diff options
| author | Andrei Karas <akaras@inbox.ru> | 2012-04-03 01:29:22 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2012-04-03 01:29:22 +0300 |
| commit | 5e4a1bf239d76a5525a4409dc7a2094fbffe0eb3 (patch) | |
| tree | 2563cd7dd22fb1370b0311e9b7b45b8657f9ecdf /src/client.cpp | |
| parent | a56d6c4d316551940982d622e9b0e3b0f1ad1863 (diff) | |
| download | manaplus-5e4a1bf239d76a5525a4409dc7a2094fbffe0eb3.tar.gz manaplus-5e4a1bf239d76a5525a4409dc7a2094fbffe0eb3.tar.bz2 manaplus-5e4a1bf239d76a5525a4409dc7a2094fbffe0eb3.tar.xz manaplus-5e4a1bf239d76a5525a4409dc7a2094fbffe0eb3.zip | |
Put gui input logic before most game input logic.
This solving game and gui shortcuts conflicts.
Diffstat (limited to 'src/client.cpp')
| -rw-r--r-- | src/client.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/client.cpp b/src/client.cpp index dd8838244..875d70a46 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -882,6 +882,8 @@ int Client::gameExec() gui->logic(); if (mGame) mGame->logic(); + else if (gui) + gui->handleInput(); sound.logic(); |