mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r21821) -Codechange: Clean up the jump conditions.

release/1.1
alberth 2011-01-16 11:39:57 +00:00
parent 1e7c3fd2ff
commit 4a203e8a49
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/window.cpp
View File

@ -1431,8 +1431,10 @@ static EventState HandleMouseDragDrop()
{ {
Window *w; Window *w;
if (_special_mouse_mode != WSM_DRAGDROP) goto handle_dragdop; if (_special_mouse_mode != WSM_DRAGDROP) return ES_NOT_HANDLED;
if (!_left_button_down || (_cursor.delta.x == 0 && _cursor.delta.y == 0)) goto handle_dragdop;
if (_left_button_down && _cursor.delta.x == 0 && _cursor.delta.y == 0) return ES_HANDLED; // Dragging, but the mouse did not move.
if (!_left_button_down) goto handle_dragdop;
w = _thd.GetCallbackWnd(); w = _thd.GetCallbackWnd();
@ -1447,9 +1449,6 @@ static EventState HandleMouseDragDrop()
return ES_HANDLED; return ES_HANDLED;
handle_dragdop: handle_dragdop:
if (_special_mouse_mode != WSM_DRAGDROP) return ES_NOT_HANDLED;
if (_left_button_down) return ES_HANDLED;
w = _thd.GetCallbackWnd(); w = _thd.GetCallbackWnd();
if (w != NULL) { if (w != NULL) {