Merge branch 'develop' into 5012-beta

DFHack · Feb 14, 2024 · b736899 · b736899
2 parents 1d061fb + 8256c99
commit b736899
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/docs/changelog.txt b/docs/changelog.txt
@@ -59,7 +59,8 @@ Template for new versions:
 - `tweak`: Add "flask-contents", makes flasks/vials/waterskins be named according to their contents
 
 ## Fixes
-- ``Units::getVisibleName``: Use ``impersonated_hf`` field of identity
+- ``Units::getVisibleName``: don't reveal the true identities of units that are impersonating other historical figures
+- ``Gui::revealInDwarfmodeMap``: properly center the zoom even when the target tile is near the edge of the map
 - `warn-stranded`: don't complain about units that aren't on the map (e.g.  soldiers out on raids)
 
 ## Misc Improvements

diff --git a/library/modules/Gui.cpp b/library/modules/Gui.cpp
@@ -2294,8 +2294,8 @@ bool Gui::revealInDwarfmodeMap(int32_t x, int32_t y, int32_t z, bool center, boo
         new_win_z = z;
     }
 
-    *window_x = clip_range(new_win_x, 0, (world->map.x_count - w));
-    *window_y = clip_range(new_win_y, 0, (world->map.y_count - h));
+    *window_x = new_win_x;
+    *window_y = new_win_y;
     *window_z = clip_range(new_win_z, 0, (world->map.z_count - 1));
     game->minimap.update = true;
     game->minimap.mustmake = true;