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

Codechange: Simplify logic of mouse loop

pull/9628/head
Nicolas Chappe 2021-12-23 13:50:19 +01:00 committed by Michael Lutz
parent 65530a76f6
commit e660860d4b
1 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/window.cpp
View File

@ -2882,27 +2882,25 @@ static void MouseLoop(MouseClick click, int mousewheel)
} }
} }
if (vp == nullptr || (w->flags & WF_DISABLE_VP_SCROLL)) { switch (click) {
switch (click) { case MC_LEFT:
case MC_LEFT: case MC_DOUBLE_LEFT:
case MC_DOUBLE_LEFT: DispatchLeftClickEvent(w, x - w->left, y - w->top, click == MC_DOUBLE_LEFT ? 2 : 1);
DispatchLeftClickEvent(w, x - w->left, y - w->top, click == MC_DOUBLE_LEFT ? 2 : 1); return;
return;
default: default:
if (!scrollwheel_scrolling || w == nullptr || w->window_class != WC_SMALLMAP) break; if (!scrollwheel_scrolling || w == nullptr || w->window_class != WC_SMALLMAP) break;
/* We try to use the scrollwheel to scroll since we didn't touch any of the buttons. /* We try to use the scrollwheel to scroll since we didn't touch any of the buttons.
* Simulate a right button click so we can get started. */ * Simulate a right button click so we can get started. */
FALLTHROUGH; FALLTHROUGH;
case MC_RIGHT: case MC_RIGHT:
DispatchRightClickEvent(w, x - w->left, y - w->top); DispatchRightClickEvent(w, x - w->left, y - w->top);
return; return;
case MC_HOVER: case MC_HOVER:
DispatchHoverEvent(w, x - w->left, y - w->top); DispatchHoverEvent(w, x - w->left, y - w->top);
break; break;
}
} }
/* We're not doing anything with 2D scrolling, so reset the value. */ /* We're not doing anything with 2D scrolling, so reset the value. */