diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2021-03-08 20:03:40 +0000 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2021-03-08 20:03:40 +0000 |
| commit | a32a8447028798ef05af33230fbcfa3195ab430c (patch) | |
| tree | b311ea9623ac1816f48bdc1cd1f9a8f1d78091a4 /game/vehicles/vehicle.h | |
| parent | Shut up cppcheck, an STL implementation of that would be stupid (diff) | |
| download | ilt-a32a8447028798ef05af33230fbcfa3195ab430c.tar.bz2 ilt-a32a8447028798ef05af33230fbcfa3195ab430c.tar.xz ilt-a32a8447028798ef05af33230fbcfa3195ab430c.zip | |
Initial commit of the orders/activities system
Has the main window provide some control over our test train
Diffstat (limited to 'game/vehicles/vehicle.h')
| -rw-r--r-- | game/vehicles/vehicle.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/game/vehicles/vehicle.h b/game/vehicles/vehicle.h index 659821f..c4c8beb 100644 --- a/game/vehicles/vehicle.h +++ b/game/vehicles/vehicle.h @@ -2,7 +2,9 @@ #define VEHICLE_H #include "linkHistory.h" +#include <game/activity.h> #include <game/network/link.h> +#include <game/orders.h> #include <game/worldobject.h> #include <gfx/renderable.h> #include <memory> @@ -13,9 +15,12 @@ class Vehicle : public WorldObject, public Renderable { public: explicit Vehicle(const LinkPtr & link, float linkDist = 0); float linkDist; // distance along current link - float speed {50}; // speed in m/s (~75 km/h) + float speed {}; // speed in m/s (~75 km/h) [[nodiscard]] virtual const Location & getLocation() const = 0; + Orders orders; + + ActivityPtr currentActivity; protected: LinkHistory linkHist; |