diff options
| author | Johannes E. Krause <j.k@eclipso.de> | 2019-01-13 20:52:04 +0100 |
|---|---|---|
| committer | Niels Martin Hansen <nielsm@indvikleren.dk> | 2019-01-24 21:17:17 +0100 |
| commit | f0290d5de77176718153a2d078bee7dae57c16dc (patch) | |
| tree | ac6a55827750a9937ab49bb328476df4e023a0a9 /src/smallmap_gui.cpp | |
| parent | 43852baace470938c71147d9029b4679d62a05a8 (diff) | |
| download | openttd-f0290d5de77176718153a2d078bee7dae57c16dc.tar.xz | |
Codechange: Add InverseRemapCoords2 function for remapping viewport coordinates to underlying tile coordinates (Patch by adf88, #6583)
Diffstat (limited to 'src/smallmap_gui.cpp')
| -rw-r--r-- | src/smallmap_gui.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/smallmap_gui.cpp b/src/smallmap_gui.cpp index df9fd2df2..10eeca5d3 100644 --- a/src/smallmap_gui.cpp +++ b/src/smallmap_gui.cpp @@ -923,8 +923,8 @@ void SmallMapWindow::DrawMapIndicators() const /* Find main viewport. */ const ViewPort *vp = FindWindowById(WC_MAIN_WINDOW, 0)->viewport; - Point upper_left_smallmap_coord = TranslateXYToTileCoord(vp, vp->left, vp->top, false); - Point lower_right_smallmap_coord = TranslateXYToTileCoord(vp, vp->left + vp->width - 1, vp->top + vp->height - 1, false); + Point upper_left_smallmap_coord = InverseRemapCoords2(vp->virtual_left, vp->virtual_top); + Point lower_right_smallmap_coord = InverseRemapCoords2(vp->virtual_left + vp->virtual_width - 1, vp->virtual_top + vp->virtual_height - 1); Point upper_left = this->RemapTile(upper_left_smallmap_coord.x / (int)TILE_SIZE, upper_left_smallmap_coord.y / (int)TILE_SIZE); upper_left.x -= this->subscroll; @@ -1645,7 +1645,7 @@ void SmallMapWindow::SetNewScroll(int sx, int sy, int sub) void SmallMapWindow::SmallMapCenterOnCurrentPos() { const ViewPort *vp = FindWindowById(WC_MAIN_WINDOW, 0)->viewport; - Point viewport_center = TranslateXYToTileCoord(vp, vp->left + vp->width / 2, vp->top + vp->height / 2); + Point viewport_center = InverseRemapCoords2(vp->virtual_left + vp->virtual_width / 2, vp->virtual_top + vp->virtual_height / 2); int sub; const NWidgetBase *wid = this->GetWidget<NWidgetBase>(WID_SM_MAP); |