(svn r2074) MouseLoop -> InputLoop(), factor out a real mouse-specific MouseLoop from the new InitLoop() (more in the spirit of HandleKeypress()).
--- a/ttd.c Sat Mar 26 04:02:50 2005 +0000
+++ b/ttd.c Sat Mar 26 04:16:39 2005 +0000
@@ -1163,7 +1163,7 @@
if (!_pause || _cheats.build_in_pause.value)
MoveAllTextEffects();
- MouseLoop();
+ InputLoop();
if (_game_mode != GM_MENU)
MusicLoop();
--- a/window.c Sat Mar 26 04:02:50 2005 +0000
+++ b/window.c Sat Mar 26 04:16:39 2005 +0000
@@ -1284,37 +1284,11 @@
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 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;
--- a/window.h Sat Mar 26 04:02:50 2005 +0000
+++ b/window.h Sat Mar 26 04:16:39 2005 +0000
@@ -566,7 +566,7 @@
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);