petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

Fix #11577: Extra viewport opened in wrong location. (#11578)

Browse Source 
ExtraViewportWindow calls IninitializeViewport() with focus as 0, which is ambiguous as focus should be either a TileIndex or a VehicleID.

Instead, pass the tile and let InitializeViewport() handle setting all the coordinates.
This commit is contained in:
Peter Nelson
2023-12-13 02:19:16 +00:00
committed by GitHub
parent 0a8bcdd344
commit 6c5aeae01b
2 changed files with 15 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/viewport.cpp
View File

@@ -242,11 +242,22 @@ void InitializeWindowViewport(Window *w, int x, int y,
veh = Vehicle::Get(vp->follow_vehicle);
pt = MapXYZToViewport(vp, veh->x_pos, veh->y_pos, veh->z_pos);
} else {
x = TileX(std::get<TileIndex>(focus)) * TILE_SIZE;
y = TileY(std::get<TileIndex>(focus)) * TILE_SIZE;
TileIndex tile = std::get<TileIndex>(focus);
if (tile == INVALID_TILE) {
/* No tile? Use center of main viewport. */
const Window *mw = GetMainWindow();
/* center on same place as main window (zoom is maximum, no adjustment needed) */
pt.x = mw->viewport->scrollpos_x + mw->viewport->virtual_width / 2;
pt.x -= vp->virtual_width / 2;
pt.y = mw->viewport->scrollpos_y + mw->viewport->virtual_height / 2;
pt.y -= vp->virtual_height / 2;
} else {
x = TileX(tile) * TILE_SIZE;
y = TileY(tile) * TILE_SIZE;
pt = MapXYZToViewport(vp, x, y, GetSlopePixelZ(x, y));
}
vp->follow_vehicle = INVALID_VEHICLE;
pt = MapXYZToViewport(vp, x, y, GetSlopePixelZ(x, y));
}
vp->scrollpos_x = pt.x;