Link weak_ptrs

2 files changed, 10 insertions, 8 deletions

diff --git a/game/vehicles/railloco.cpp b/game/vehicles/railloco.cpp
index 54582c2..d06474c 100644
--- a/game/vehicles/railloco.cpp
+++ b/game/vehicles/railloco.cpp
@@ -12,23 +12,25 @@ void
 RailLoco::tick(TickDuration dur)
 {
 	linkDist += dur.count() * speed;
-	while (linkDist > link->length) {
-		location = link->positionAt(link->length, linkDir);
-		const auto & nexts {link->nexts[1 - linkDir]};
+	auto curLink {link.lock()};
+	while (linkDist > curLink->length) {
+		location = curLink->positionAt(curLink->length, linkDir);
+		const auto & nexts {curLink->nexts[1 - linkDir]};
 		const auto next = std::find_if(nexts.begin(), nexts.end(), [ang = location.GetRot().y](const Link::Next & n) {
-			return std::abs(normalize(n.first->ends[n.second].second - ang)) < 0.1F;
+			return std::abs(normalize(n.first.lock()->ends[n.second].second - ang)) < 0.1F;
 		});
 		if (next != nexts.end()) {
-			linkDist -= link->length;
+			linkDist -= curLink->length;
 			link = next->first;
+			curLink = link.lock();
 			linkDir = next->second;
 		}
 		else {
-			linkDist = link->length;
+			linkDist = curLink->length;
 			speed = 0;
 		}
 	}
-	location = link->positionAt(linkDist, linkDir);
+	location = curLink->positionAt(linkDist, linkDir);
 }
 
 Brush47::Brush47(const LinkPtr & l) : RailLoco(l, "brush47.obj", "brush47.png") { }
diff --git a/game/vehicles/vehicle.h b/game/vehicles/vehicle.h
index cd2249d..d59588c 100644
--- a/game/vehicles/vehicle.h
+++ b/game/vehicles/vehicle.h
@@ -9,7 +9,7 @@
 class Vehicle : public WorldObject, public Physical {
 public:
 	Vehicle(const LinkPtr & link, const std::string & obj, const std::string & tex);
-	LinkPtr link; // Which link are we travelling along
+	LinkWPtr link; // Which link are we travelling along
 	unsigned char linkDir {0}; // Starting end e0->e1 or e1->e0
 	float linkDist {0}; // distance long current link
 	float speed {50}; // speed in m/s (~75 km/h)