miguel.horta/openttd-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed Android compilation and warnings

Browse Source
This commit is contained in:
pelya
2021-01-25 21:31:09 +02:00
parent ac91ee617a
commit 2bc0595127
27 changed files with 67 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/window.cpp
View File

@@ -3063,7 +3063,7 @@ static void HandleContinuousScroll()
if (_scrolling_viewport && _right_button_down) {
Window *w = FindWindowFromPt(_right_button_down_pos.x, _right_button_down_pos.y);
if (w == NULL || w->flags & WF_DISABLE_VP_SCROLL) return;
ViewPort *vp = IsPtInWindowViewport(w, _right_button_down_pos.x, _right_button_down_pos.y);
Viewport *vp = IsPtInWindowViewport(w, _right_button_down_pos.x, _right_button_down_pos.y);
if (vp == NULL) return;
w->viewport->dest_scrollpos_x += ScaleByZoom(scrollspeed * (_right_button_down_pos.x - _cursor.pos.x), vp->zoom);
@@ -3922,7 +3922,7 @@ void RelocateAllWindows(int neww, int newh)
break;
case WC_STATUS_BAR:
ResizeWindow(w, std::min<uint>(neww, std::min(_toolbar_width, _screen.width - SETTING_BUTTON_HEIGHT * 2)) - w->width, 0, false);
ResizeWindow(w, std::min<uint>(neww, std::min<int>(_toolbar_width, _screen.width - SETTING_BUTTON_HEIGHT * 2)) - w->width, 0, false);
top = newh - w->height;
left = PositionStatusbar(w);