cpp/openttd-patchpack/source Changeset - r19658:6ea6f341ce9b

Changeset - r19658:6ea6f341ce9b

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

frosch - 12 years ago 2012-10-13 08:34:10
frosch@openttd.org

(svn r24589) -Codechange: Return early in HandleAutoscroll() instead of nesting ifs.

1 file changed with 25 insertions and 23 deletions:

src/window.cpp

0 comments (0 inline, 0 general)

src/window.cpp

➞

Show inline comments

@@ @@ -2290,31 +2290,33 @@ static int _input_events_this_tick = 0; @@
  */
 static void HandleAutoscroll()
+{
 	if (_settings_client.gui.autoscroll && _game_mode != GM_MENU && !HasModalProgress()) {
 		int x = _cursor.pos.x;
 		int y = _cursor.pos.y;
 		Window *w = FindWindowFromPt(x, y);
 		if (w == NULL || w->flags & WF_DISABLE_VP_SCROLL) return;
 		ViewPort *vp = IsPtInWindowViewport(w, x, y);
 		if (vp != NULL) {
 			x -= vp->left;
 			y -= vp->top;
 			/* here allows scrolling in both x and y axis */
 	if (_game_mode == GM_MENU || HasModalProgress()) return;
 	if (!_settings_client.gui.autoscroll) return;
 	int x = _cursor.pos.x;
 	int y = _cursor.pos.y;
 	Window *w = FindWindowFromPt(x, y);
 	if (w == NULL || w->flags & WF_DISABLE_VP_SCROLL) return;
 	ViewPort *vp = IsPtInWindowViewport(w, x, y);
 	if (vp == NULL) return;
 	x -= vp->left;
 	y -= vp->top;
 	/* here allows scrolling in both x and y axis */
 #define scrollspeed 3
 			if (x - 15 < 0) {
 				w->viewport->dest_scrollpos_x += ScaleByZoom((x - 15) * scrollspeed, vp->zoom);
 			} else if (15 - (vp->width - x) > 0) {
 				w->viewport->dest_scrollpos_x += ScaleByZoom((15 - (vp->width - x)) * scrollspeed, vp->zoom);
+			}
 			if (y - 15 < 0) {
 				w->viewport->dest_scrollpos_y += ScaleByZoom((y - 15) * scrollspeed, vp->zoom);
 			} else if (15 - (vp->height - y) > 0) {
 				w->viewport->dest_scrollpos_y += ScaleByZoom((15 - (vp->height - y)) * scrollspeed, vp->zoom);
+			}
 	if (x - 15 < 0) {
 		w->viewport->dest_scrollpos_x += ScaleByZoom((x - 15) * scrollspeed, vp->zoom);
 	} else if (15 - (vp->width - x) > 0) {
 		w->viewport->dest_scrollpos_x += ScaleByZoom((15 - (vp->width - x)) * scrollspeed, vp->zoom);
+	}
 	if (y - 15 < 0) {
 		w->viewport->dest_scrollpos_y += ScaleByZoom((y - 15) * scrollspeed, vp->zoom);
 	} else if (15 - (vp->height - y) > 0) {
 		w->viewport->dest_scrollpos_y += ScaleByZoom((15 - (vp->height - y)) * scrollspeed, vp->zoom);
+	}
 #undef scrollspeed
+		}
+	}
+}
 enum MouseClick {

0 comments (0 inline, 0 general)