summaryrefslogtreecommitdiff
path: root/src/signs_base.h
diff options
context:
space:
mode:
authorNiels Martin Hansen <nielsm@indvikleren.dk>2019-12-01 23:17:33 +0100
committerGitHub <noreply@github.com>2019-12-01 23:17:33 +0100
commit9900af38f58c84a90bd1a3830b9acd08438c46c5 (patch)
treede630b1f7e806d1b4c1639031111151292863951 /src/signs_base.h
parentf91c701ffebe098f05b237642dd37002181f1a7f (diff)
downloadopenttd-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_base.h')
-rw-r--r--src/signs_base.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/signs_base.h b/src/signs_base.h
index 1c677db17..e92a05e2f 100644
--- a/src/signs_base.h
+++ b/src/signs_base.h
@@ -19,12 +19,12 @@ typedef Pool<Sign, SignID, 16, 64000> SignPool;
extern SignPool _sign_pool;
struct Sign : SignPool::PoolItem<&_sign_pool> {
- char *name;
- ViewportSign sign;
- int32 x;
- int32 y;
- int32 z;
- Owner owner; // placed by this company. Anyone can delete them though. OWNER_NONE for gray signs from old games.
+ char *name;
+ TrackedViewportSign sign;
+ int32 x;
+ int32 y;
+ int32 z;
+ Owner owner; // placed by this company. Anyone can delete them though. OWNER_NONE for gray signs from old games.
Sign(Owner owner = INVALID_OWNER);
~Sign();