dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix viewport kdtree not being updated for waypoints when sign moved

Browse Source
This commit is contained in:
Jonathan G Rennison
2019-07-06 14:58:42 +01:00
parent 94f705e45e
commit ac84f34062
2 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/waypoint.cpp
View File

@@ -51,6 +51,21 @@ void Waypoint::GetTileArea(TileArea *ta, StationType type) const
}
}
/**
* Move the waypoint main coordinate somewhere else.
* @param new_xy new tile location of the sign
*/
void Waypoint::MoveSign(TileIndex new_xy)
{
if (this->xy == new_xy) return;
if (_viewport_sign_kdtree_valid) _viewport_sign_kdtree.Remove(ViewportSignKdtreeItem::MakeWaypoint(this->index, this->viewport_sign_kdtree_pt));
this->BaseStation::MoveSign(new_xy);
if (_viewport_sign_kdtree_valid) _viewport_sign_kdtree.Insert(ViewportSignKdtreeItem::MakeWaypoint(this->index));
}
Waypoint::~Waypoint()
{
if (CleaningPool()) return;

2
src/waypoint_base.h
View File

@@ -27,6 +27,8 @@ struct Waypoint FINAL : SpecializedStation<Waypoint, true> {
void UpdateVirtCoord() override;
void MoveSign(TileIndex new_xy) override;
inline bool TileBelongsToRailStation(TileIndex tile) const override
{
return IsRailWaypointTile(tile) && GetStationIndex(tile) == this->index;