cpp/openttd-patchpack/source Changeset - r17073:2bafd423f0ee

Changeset - r17073:2bafd423f0ee

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

alberth - 13 years ago 2011-01-16 11:39:09
alberth@openttd.org

(svn r21820) -Codechange: Concatenate both functions.

1 file changed with 8 insertions and 15 deletions:

src/window.cpp

0 comments (0 inline, 0 general)

src/window.cpp

➞

Show inline comments

@@ @@ -1424,15 +1424,15 @@ static void HandlePlacePresize() @@
+}
 /**
  * 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 @@ static EventState HandleMouseDrag() @@
+	}
 	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 @@ static void MouseLoop(MouseClick click, @@
 	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;

0 comments (0 inline, 0 general)