cpp/openttd-patchpack/source Changeset - r1570:9926c7803b79

Changeset - r1570:9926c7803b79

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

pasky - 20 years ago 2005-03-26 04:16:39
pasky@openttd.org

(svn r2074) MouseLoop -> InputLoop(), factor out a real mouse-specific MouseLoop from the new InitLoop() (more in the spirit of HandleKeypress()).

3 files changed with 36 insertions and 29 deletions:

ttd.c

window.c

window.h

0 comments (0 inline, 0 general)

ttd.c

➞

Show inline comments

@@ @@ -1163,7 +1163,7 @@ void GameLoop(void) @@
 	if (!_pause || _cheats.build_in_pause.value)
 		MoveAllTextEffects();
-	MouseLoop();
+	InputLoop();
 	if (_game_mode != GM_MENU)
 		MusicLoop();

window.c

➞

Show inline comments

@@ @@ -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;

window.h

➞

Show inline comments

@@ @@ -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);

0 comments (0 inline, 0 general)