From 41543498f4d13741527e6f8b53cf556cc1a8831d Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Tue, 16 Apr 2024 17:51:51 +0100 Subject: [PATCH] Fix ships leaving dots behind in viewport map mode Fixes: 57db9a41 --- src/ship_cmd.cpp | 9 ++++----- src/vehicle.cpp | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/ship_cmd.cpp b/src/ship_cmd.cpp index 1349194767..a6c465d82d 100644 --- a/src/ship_cmd.cpp +++ b/src/ship_cmd.cpp @@ -397,11 +397,10 @@ bool RecentreShipSpriteBounds(Vehicle *v) Ship *ship = Ship::From(v); if (ship->rotation != ship->cur_image_valid_dir) { ship->cur_image_valid_dir = INVALID_DIR; - Point offset = RemapCoords(ship->x_offs, ship->y_offs, 0); - ship->sprite_seq_bounds.left = -offset.x - 16; - ship->sprite_seq_bounds.right = ship->sprite_seq_bounds.left + 32; - ship->sprite_seq_bounds.top = -offset.y - 16; - ship->sprite_seq_bounds.bottom = ship->sprite_seq_bounds.top + 32; + ship->sprite_seq_bounds.left = -16; + ship->sprite_seq_bounds.right = 16; + ship->sprite_seq_bounds.top = -16; + ship->sprite_seq_bounds.bottom = 16; return true; } return false; diff --git a/src/vehicle.cpp b/src/vehicle.cpp index d5a80ea368..b89e817a76 100644 --- a/src/vehicle.cpp +++ b/src/vehicle.cpp @@ -2064,7 +2064,7 @@ void ViewportMapDrawVehicles(DrawPixelInfo *dpi, Viewport *vp) while (v != nullptr) { if (!(v->vehstatus & (VS_HIDDEN | VS_UNCLICKABLE)) && (v->type != VEH_EFFECT)) { - Point pt = RemapCoords(v->x_pos + v->x_offs, v->y_pos + v->y_offs, v->z_pos); + Point pt = { v->coord.left, v->coord.top }; if (pt.x >= l && pt.x < r && pt.y >= t && pt.y < b) { const int pixel_x = UnScaleByZoomLower(pt.x - l, dpi->zoom); const int pixel_y = UnScaleByZoomLower(pt.y - t, dpi->zoom);