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 
fa90b567 was not a proper fix
This commit is contained in:
Jonathan G Rennison
2020-04-30 18:52:41 +01:00
parent cba9b56ff7
commit e559bb98c4
1 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/viewport.cpp
View File

@@ -555,13 +555,26 @@ 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) { if (xo != 0) {
if (a.coords.right <= b.coords.left && xo > 0) return true; std::sort(_vp_redraw_regions.begin(), _vp_redraw_regions.end(), [&](const ViewportRedrawRegion &a, const ViewportRedrawRegion &b) {
if (a.coords.left >= b.coords.right && xo < 0) return true; if (a.coords.right <= b.coords.left && xo > 0) return true;
if (a.coords.bottom <= b.coords.top && yo > 0) return true; if (a.coords.left >= b.coords.right && xo < 0) return true;
if (a.coords.top >= b.coords.bottom && yo < 0) return true; return false;
return false; });
}); if (yo != 0) {
std::stable_sort(_vp_redraw_regions.begin(), _vp_redraw_regions.end(), [&](const ViewportRedrawRegion &a, const ViewportRedrawRegion &b) {
if (a.coords.bottom <= b.coords.top && yo > 0) return true;
if (a.coords.top >= b.coords.bottom && yo < 0) return true;
return false;
});
}
} else {
std::sort(_vp_redraw_regions.begin(), _vp_redraw_regions.end(), [&](const ViewportRedrawRegion &a, const ViewportRedrawRegion &b) {
if (a.coords.bottom <= b.coords.top && yo > 0) return true;
if (a.coords.top >= b.coords.bottom && yo < 0) return true;
return false;
});
}
while (!_vp_redraw_regions.empty()) { while (!_vp_redraw_regions.empty()) {
const Rect &rect = _vp_redraw_regions.back().coords; const Rect &rect = _vp_redraw_regions.back().coords;