diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2024-10-31 00:25:55 +0000 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2024-11-05 20:05:05 +0000 |
| commit | 6369d70e9e2952664bd7967ee2fd2280fc7f2b83 (patch) | |
| tree | f7e2716318501ab4ab2cab92c3d5f0bed367d777 | |
| parent | Fix GenDef for networks, should be globals (diff) | |
| download | ilt-6369d70e9e2952664bd7967ee2fd2280fc7f2b83.tar.bz2 ilt-6369d70e9e2952664bd7967ee2fd2280fc7f2b83.tar.xz ilt-6369d70e9e2952664bd7967ee2fd2280fc7f2b83.zip | |
Fix train/vehicle constructors to take const links
| -rw-r--r-- | game/vehicles/train.h | 2 | ||||
| -rw-r--r-- | game/vehicles/vehicle.cpp | 2 | ||||
| -rw-r--r-- | game/vehicles/vehicle.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/game/vehicles/train.h b/game/vehicles/train.h index 4320103..4933347 100644 --- a/game/vehicles/train.h +++ b/game/vehicles/train.h @@ -17,7 +17,7 @@ template<typename> class Ray; class Train : public Vehicle, public Collection<RailVehicle, false>, public Can<Go>, public Can<Idle> { public: - explicit Train(const Link::Ptr & link, float linkDist = 0) : Vehicle {link, linkDist} { } + explicit Train(const Link::CPtr & link, float linkDist = 0) : Vehicle {link, linkDist} { } [[nodiscard]] const Location & getLocation() const override diff --git a/game/vehicles/vehicle.cpp b/game/vehicles/vehicle.cpp index 0d46017..dd652bc 100644 --- a/game/vehicles/vehicle.cpp +++ b/game/vehicles/vehicle.cpp @@ -15,7 +15,7 @@ #include <utility> #include <vector> -Vehicle::Vehicle(const Link::Ptr & l, float ld) : linkDist {ld} +Vehicle::Vehicle(const Link::CPtr & l, float ld) : linkDist {ld} { linkHist.add(l, 0); currentActivity = std::make_unique<Idle>(); diff --git a/game/vehicles/vehicle.h b/game/vehicles/vehicle.h index 354f904..c3b35b7 100644 --- a/game/vehicles/vehicle.h +++ b/game/vehicles/vehicle.h @@ -14,7 +14,7 @@ class Location; class Vehicle : public WorldObject, public Selectable { public: - explicit Vehicle(const Link::Ptr & link, float linkDist = 0); + explicit Vehicle(const Link::CPtr & link, float linkDist = 0); float linkDist; // distance along current link float speed {}; // speed in m/s (~75 km/h) |