diff options
| author | Niels Martin Hansen <nielsm@indvikleren.dk> | 2019-12-01 23:17:33 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-01 23:17:33 +0100 |
| commit | 9900af38f58c84a90bd1a3830b9acd08438c46c5 (patch) | |
| tree | de630b1f7e806d1b4c1639031111151292863951 /src/signs_cmd.cpp | |
| parent | f91c701ffebe098f05b237642dd37002181f1a7f (diff) | |
| download | openttd-9900af38f58c84a90bd1a3830b9acd08438c46c5.tar.xz | |
Fix #7847: Use ViewportSign coordinates for sign Kdtree coordinates (#7849)
Ensure the same coordinates are used for station/town/player signs regardless of how the landscape changes below it after the coordinates were first determined.
By keeping track of whether each ViewportSign is valid for Kdtree use (and only ever registering the viewport sign when the object is valid) a lot of code can be simplified and become more robust at the same time.
Diffstat (limited to 'src/signs_cmd.cpp')
| -rw-r--r-- | src/signs_cmd.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/signs_cmd.cpp b/src/signs_cmd.cpp index 8b074e46b..d2caa4a23 100644 --- a/src/signs_cmd.cpp +++ b/src/signs_cmd.cpp @@ -57,7 +57,6 @@ CommandCost CmdPlaceSign(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 si->name = stredup(text); } si->UpdateVirtCoord(); - _viewport_sign_kdtree.Insert(ViewportSignKdtreeItem::MakeSign(si->index)); InvalidateWindowData(WC_SIGN_LIST, 0, 0); _new_sign_id = si->index; } @@ -99,7 +98,7 @@ CommandCost CmdRenameSign(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 } else { // Delete sign if (flags & DC_EXEC) { si->sign.MarkDirty(); - _viewport_sign_kdtree.Remove(ViewportSignKdtreeItem::MakeSign(si->index)); + if (si->sign.kdtree_valid) _viewport_sign_kdtree.Remove(ViewportSignKdtreeItem::MakeSign(si->index)); delete si; InvalidateWindowData(WC_SIGN_LIST, 0, 0); |