3 files changed, 36 insertions, 29 deletions
diff --git a/ttd.c b/ttd.c
index c424a7971..89853699a 100644
--- a/ttd.c
+++ b/ttd.c
@@ -1163,7 +1163,7 @@ void GameLoop(void)
 	if (!_pause || _cheats.build_in_pause.value)
 		MoveAllTextEffects();
 
-	MouseLoop();
+	InputLoop();
 
 	if (_game_mode != GM_MENU)
 		MusicLoop();
diff --git a/window.c b/window.c
index a1e4edcef..58bbf368d 100644
--- a/window.c
+++ b/window.c
@@ -1284,37 +1284,11 @@ static void HandleKeypress(uint32 key)
 extern void UpdateTileSelection(void);
 extern bool VpHandlePlaceSizingDrag(void);
 
-void MouseLoop(void)
+static void MouseLoop(int click, int mousewheel)
 {
 	int x,y;
 	Window *w;
 	ViewPort *vp;
-	int click;
-	int mousewheel;
-
-	_current_player = _local_player;
-
-	// Handle pressed keys
-	if (_pressed_key) {
-		uint32 key = _pressed_key; _pressed_key = 0;
-		HandleKeypress(key);
-	}
-
-	// Mouse event?
-	click = 0;
-	if (_left_button_down && !_left_button_clicked) {
-		_left_button_clicked = true;
-		click = 1;
-	} else if (_right_button_clicked) {
-		_right_button_clicked = false;
-		click = 2;
-	}
-
-	mousewheel = 0;
-	if (_cursor.wheel) {
-		mousewheel = _cursor.wheel;
-		_cursor.wheel = 0;
-	}
 
 	DecreaseWindowCounters();
 	HandlePlacePresize();
@@ -1410,6 +1384,39 @@ void MouseLoop(void)
 	}
 }
 
+void InputLoop(void)
+{
+	int click;
+	int mousewheel;
+
+	_current_player = _local_player;
+
+	// Handle pressed keys
+	if (_pressed_key) {
+		uint32 key = _pressed_key; _pressed_key = 0;
+		HandleKeypress(key);
+	}
+
+	// Mouse event?
+	click = 0;
+	if (_left_button_down && !_left_button_clicked) {
+		_left_button_clicked = true;
+		click = 1;
+	} else if (_right_button_clicked) {
+		_right_button_clicked = false;
+		click = 2;
+	}
+
+	mousewheel = 0;
+	if (_cursor.wheel) {
+		mousewheel = _cursor.wheel;
+		_cursor.wheel = 0;
+	}
+
+	MouseLoop(click, mousewheel);
+}
+
+
 static int _we4_timer;
 
 extern uint32 _pixels_redrawn;
diff --git a/window.h b/window.h
index fde10cdf5..82b76ef25 100644
--- a/window.h
+++ b/window.h
@@ -566,7 +566,7 @@ void InitWindowSystem(void);
 void UnInitWindowSystem(void);
 void ResetWindowSystem(void);
 int GetMenuItemIndex(Window *w, int x, int y);
-void MouseLoop(void);
+void InputLoop(void);
 void UpdateWindows(void);
 void InvalidateWidget(Window *w, byte widget_index);