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

Add missing braces around calls to ViewportMapDraw in ViewportDoDraw

Browse Source
This commit is contained in:
Jonathan G Rennison
2024-02-08 18:26:51 +00:00
parent 9aa8059c79
commit ea8aa47832
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/viewport.cpp
View File

@@ -3912,12 +3912,18 @@ void ViewportDoDraw(Viewport *vp, int left, int top, int right, int bottom, uint
if (vp->zoom >= ZOOM_LVL_DRAW_MAP) { if (vp->zoom >= ZOOM_LVL_DRAW_MAP) {
/* Here the rendering is like smallmap. */ /* Here the rendering is like smallmap. */
if (BlitterFactory::GetCurrentBlitter()->GetScreenDepth() == 32) { if (BlitterFactory::GetCurrentBlitter()->GetScreenDepth() == 32) {
if (_settings_client.gui.show_slopes_on_viewport_map) ViewportMapDraw<true, true>(vp); if (_settings_client.gui.show_slopes_on_viewport_map) {
else ViewportMapDraw<true, false>(vp); ViewportMapDraw<true, true>(vp);
} else {
ViewportMapDraw<true, false>(vp);
}
} else { } else {
_pal2trsp_remap_ptr = IsTransparencySet(TO_TREES) ? GetNonSprite(GB(PALETTE_TO_TRANSPARENT, 0, PALETTE_WIDTH), SpriteType::Recolour) + 1 : nullptr; _pal2trsp_remap_ptr = IsTransparencySet(TO_TREES) ? GetNonSprite(GB(PALETTE_TO_TRANSPARENT, 0, PALETTE_WIDTH), SpriteType::Recolour) + 1 : nullptr;
if (_settings_client.gui.show_slopes_on_viewport_map) ViewportMapDraw<false, true>(vp); if (_settings_client.gui.show_slopes_on_viewport_map) {
else ViewportMapDraw<false, false>(vp); ViewportMapDraw<false, true>(vp);
} else {
ViewportMapDraw<false, false>(vp);
}
} }
ViewportMapDrawVehicles(&_vdd->dpi, vp); ViewportMapDrawVehicles(&_vdd->dpi, vp);
if (_scrolling_viewport && _settings_client.gui.show_scrolling_viewport_on_map) ViewportMapDrawScrollingViewportBox(vp); if (_scrolling_viewport && _settings_client.gui.show_scrolling_viewport_on_map) ViewportMapDrawScrollingViewportBox(vp);