summaryrefslogtreecommitdiff
path: root/window.c
diff options
context:
space:
mode:
Diffstat (limited to 'window.c')
-rw-r--r--window.c22
1 files changed, 15 insertions, 7 deletions
diff --git a/window.c b/window.c
index 4f2a238f4..b2e91990b 100644
--- a/window.c
+++ b/window.c
@@ -1397,7 +1397,10 @@ void SendWindowMessageClass(WindowClass wnd_class, uint msg, uint wparam, uint l
}
}
-static void HandleKeypress(uint32 key)
+/** Handle keyboard input.
+ * @param key Lower 8 bits contain the ASCII character, the higher
+ * 16 bits the keycode */
+void HandleKeypress(uint32 key)
{
Window *w;
WindowEvent e;
@@ -1406,6 +1409,17 @@ static void HandleKeypress(uint32 key)
* to thein this main toolbar. */
bool query_open = false;
+ /*
+ * During the generation of the world, there might be
+ * another thread that is currently building for example
+ * a road. To not interfere with those tasks, we should
+ * NOT change the _current_player here.
+ *
+ * This is not necessary either, as the only events that
+ * can be handled are the 'close application' events
+ */
+ if (!IsGeneratingWorld()) _current_player = _local_player;
+
// Setup event
e.event = WE_KEYPRESS;
e.we.keypress.ascii = key & 0xFF;
@@ -1564,12 +1578,6 @@ void InputLoop(void)
*/
if (!IsGeneratingWorld()) _current_player = _local_player;
- // Handle pressed keys
- if (_pressed_key != 0) {
- HandleKeypress(_pressed_key);
- _pressed_key = 0;
- }
-
// Mouse event?
click = 0;
if (_left_button_down && !_left_button_clicked) {