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

Viewport: Fix scroll region sort comparison not meeting strict weak ordering

Browse Source 
See: #137
This commit is contained in:
Jonathan G Rennison
2020-03-29 02:20:02 +01:00
parent 0a6a38886d
commit fa90b56780
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/viewport.cpp
View File

@@ -553,11 +553,11 @@ static void DoSetViewportPosition(Window *w, const int left, const int top, cons
if (_networking) NetworkUndrawChatMessage(); if (_networking) NetworkUndrawChatMessage();
std::sort(_vp_redraw_regions.begin(), _vp_redraw_regions.end(), [&](const ViewportRedrawRegion &a, const ViewportRedrawRegion &b) { std::sort(_vp_redraw_regions.begin(), _vp_redraw_regions.end(), [&](const ViewportRedrawRegion &a, const ViewportRedrawRegion &b) {
if (a.coords.right <= b.coords.left) return xo > 0; if (a.coords.right <= b.coords.left && xo > 0) return true;
if (a.coords.left >= b.coords.right) return xo < 0; if (a.coords.left >= b.coords.right && xo < 0) return true;
if (a.coords.bottom <= b.coords.top) return yo > 0; if (a.coords.bottom <= b.coords.top && yo > 0) return true;
if (a.coords.top >= b.coords.bottom) return yo < 0; if (a.coords.top >= b.coords.bottom && yo < 0) return true;
NOT_REACHED(); return false;
}); });
while (!_vp_redraw_regions.empty()) { while (!_vp_redraw_regions.empty()) {