Mercurial > hg > openttd

changeset 17083:b7d04eec5e11 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r21820) -Codechange: Concatenate both functions.
author alberth <alberth@openttd.org>
date Sun, 16 Jan 2011 11:39:09 +0000
parents 35d166b470fa
children 6f1d1c0828cd
files src/window.cpp
diffstat 1 files changed, 8 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -1424,15 +1424,15 @@
 }
 
 /**
- * Handle dragging in mouse dragging mode (#WSM_DRAGDROP).
+ * Handle dragging and dropping in mouse dragging mode (#WSM_DRAGDROP).
  * @return State of handling the event.
  */
-static EventState HandleMouseDrag()
+static EventState HandleMouseDragDrop()
 {
 	Window *w;
 
-	if (_special_mouse_mode != WSM_DRAGDROP) return ES_NOT_HANDLED;
-	if (!_left_button_down || (_cursor.delta.x == 0 && _cursor.delta.y == 0)) return ES_NOT_HANDLED;
+	if (_special_mouse_mode != WSM_DRAGDROP) goto handle_dragdop;
+	if (!_left_button_down || (_cursor.delta.x == 0 && _cursor.delta.y == 0)) goto handle_dragdop;
 
 	w = _thd.GetCallbackWnd();
 
@@ -1445,18 +1445,12 @@
 	}
 
 	return ES_HANDLED;
-}
-
-/**
- * Handle drop in mouse dragging mode (#WSM_DRAGDROP).
- * @return State of handling the event.
- */
-static EventState HandleDragDrop()
-{
+
+handle_dragdop:
 	if (_special_mouse_mode != WSM_DRAGDROP) return ES_NOT_HANDLED;
 	if (_left_button_down) return ES_HANDLED;
 
-	Window *w = _thd.GetCallbackWnd();
+	w = _thd.GetCallbackWnd();
 
 	if (w != NULL) {
 		/* send an event in client coordinates. */
@@ -2178,8 +2172,7 @@
 	UpdateTileSelection();
 
 	if (VpHandlePlaceSizingDrag()  == ES_HANDLED) return;
-	if (HandleMouseDrag()          == ES_HANDLED) return;
-	if (HandleDragDrop()           == ES_HANDLED) return;
+	if (HandleMouseDragDrop()      == ES_HANDLED) return;
 	if (HandleWindowDragging()     == ES_HANDLED) return;
 	if (HandleScrollbarScrolling() == ES_HANDLED) return;
 	if (HandleViewportScroll()     == ES_HANDLED) return;