summaryrefslogtreecommitdiff
path: root/game/vehicles
diff options
context:
space:
mode:
Diffstat (limited to 'game/vehicles')
-rw-r--r--game/vehicles/linkHistory.cpp2
-rw-r--r--game/vehicles/linkHistory.h6
-rw-r--r--game/vehicles/train.h2
-rw-r--r--game/vehicles/vehicle.cpp2
-rw-r--r--game/vehicles/vehicle.h2
5 files changed, 7 insertions, 7 deletions
diff --git a/game/vehicles/linkHistory.cpp b/game/vehicles/linkHistory.cpp
index 4fac4ba..2802109 100644
--- a/game/vehicles/linkHistory.cpp
+++ b/game/vehicles/linkHistory.cpp
@@ -3,7 +3,7 @@
#include <memory>
LinkHistory::Entry
-LinkHistory::add(const LinkWPtr & l, unsigned char d)
+LinkHistory::add(const Link::WPtr & l, unsigned char d)
{
links.insert(links.begin(), {l, d});
const auto lp = l.lock();
diff --git a/game/vehicles/linkHistory.h b/game/vehicles/linkHistory.h
index 6944727..cc57fe0 100644
--- a/game/vehicles/linkHistory.h
+++ b/game/vehicles/linkHistory.h
@@ -6,9 +6,9 @@
class LinkHistory {
public:
- using WEntry = std::pair<LinkWPtr, unsigned char /*dir*/>;
- using Entry = std::pair<LinkCPtr, unsigned char /*dir*/>;
- Entry add(const LinkWPtr &, unsigned char);
+ using WEntry = std::pair<Link::WPtr, unsigned char /*dir*/>;
+ using Entry = std::pair<Link::CPtr, unsigned char /*dir*/>;
+ Entry add(const Link::WPtr &, unsigned char);
[[nodiscard]] Entry getCurrent() const;
[[nodiscard]] Entry getAt(float, float *) const;
diff --git a/game/vehicles/train.h b/game/vehicles/train.h
index 0c6a741..58e5e29 100644
--- a/game/vehicles/train.h
+++ b/game/vehicles/train.h
@@ -18,7 +18,7 @@ class Ray;
class Train : public Vehicle, public Collection<RailVehicle, false>, public Can<Go>, public Can<Idle> {
public:
- explicit Train(const LinkPtr & link, float linkDist = 0) : Vehicle {link, linkDist} { }
+ explicit Train(const Link::Ptr & 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 53450f6..6dc8371 100644
--- a/game/vehicles/vehicle.cpp
+++ b/game/vehicles/vehicle.cpp
@@ -15,7 +15,7 @@
#include <utility>
#include <vector>
-Vehicle::Vehicle(const LinkPtr & l, float ld) : linkDist {ld}
+Vehicle::Vehicle(const Link::Ptr & 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 24557b5..3fa3092 100644
--- a/game/vehicles/vehicle.h
+++ b/game/vehicles/vehicle.h
@@ -14,7 +14,7 @@ class Location;
class Vehicle : public WorldObject, public Renderable, public Selectable {
public:
- explicit Vehicle(const LinkPtr & link, float linkDist = 0);
+ explicit Vehicle(const Link::Ptr & link, float linkDist = 0);
float linkDist; // distance along current link
float speed {}; // speed in m/s (~75 km/h)