dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove _vp_move_offs global

Browse Source
This commit is contained in:
Jonathan G Rennison
2023-09-18 19:38:13 +01:00
parent 57e4929137
commit 96ed5b5cad
1 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/viewport.cpp
View File

@@ -561,8 +561,6 @@ void InitializeWindowViewport(Window *w, int x, int y,
FillViewportCoverageRect(); FillViewportCoverageRect();
} }
static Point _vp_move_offs;
struct ViewportRedrawRegion { struct ViewportRedrawRegion {
Rect coords; Rect coords;
}; };
@@ -666,11 +664,10 @@ static void DoSetViewportPositionFillRegion(int left, int top, int width, int he
DrawOverlappedWindowForAll(left, top, left + width, top + height); DrawOverlappedWindowForAll(left, top, left + width, top + height);
}; };
static void DoSetViewportPosition(Window *w, const int vp_left, const int vp_top, const int vp_width, const int vp_height) static void DoSetViewportPosition(Window *w, const Point move_offset, const int vp_left, const int vp_top, const int vp_width, const int vp_height)
{ {
const int xo = _vp_move_offs.x; const int xo = move_offset.x;
const int yo = _vp_move_offs.y; const int yo = move_offset.y;
IncrementWindowUpdateNumber(); IncrementWindowUpdateNumber();
@@ -789,8 +786,7 @@ static void SetViewportPosition(Window *w, int x, int y, bool force_update_overl
if (old_top == 0 && old_left == 0) return; if (old_top == 0 && old_left == 0) return;
_vp_move_offs.x = old_left; Point move_offset = { old_left, old_top };
_vp_move_offs.y = old_top;
left = vp->left; left = vp->left;
top = vp->top; top = vp->top;
@@ -814,11 +810,11 @@ static void SetViewportPosition(Window *w, int x, int y, bool force_update_overl
i = top + height - _screen.height; i = top + height - _screen.height;
if (i >= 0) height -= i; if (i >= 0) height -= i;
if (height > 0 && (_vp_move_offs.x != 0 || _vp_move_offs.y != 0)) { if (height > 0 && (move_offset.x != 0 || move_offset.y != 0)) {
ClearViewportLandPixelCache(vp); ClearViewportLandPixelCache(vp);
SCOPE_INFO_FMT([&], "DoSetViewportPosition: %d, %d, %d, %d, %d, %d, %s", left, top, width, height, _vp_move_offs.x, _vp_move_offs.y, scope_dumper().WindowInfo(w)); SCOPE_INFO_FMT([&], "DoSetViewportPosition: %d, %d, %d, %d, %d, %d, %s", left, top, width, height, move_offset.x, move_offset.y, scope_dumper().WindowInfo(w));
w->viewport->update_vehicles = true; w->viewport->update_vehicles = true;
DoSetViewportPosition((Window *) w->z_front, left, top, width, height); DoSetViewportPosition((Window *) w->z_front, move_offset, left, top, width, height);
ClearViewportCache(w->viewport); ClearViewportCache(w->viewport);
FillViewportCoverageRect(); FillViewportCoverageRect();
} }