diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2024-01-07 13:23:27 +0000 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2024-01-07 13:23:27 +0000 |
| commit | 108bf5b2424da06aa2e1735ffd10a2b713834db8 (patch) | |
| tree | af0918a6a266aa7e6ee1d8129df6d5ef9fc4f8ab /game/vehicles/railVehicle.h | |
| parent | Remove more use of legacy types and unnecessary pointers from selectable inte... (diff) | |
| parent | Remove Position3D from RailVehicle (diff) | |
| download | ilt-108bf5b2424da06aa2e1735ffd10a2b713834db8.tar.bz2 ilt-108bf5b2424da06aa2e1735ffd10a2b713834db8.tar.xz ilt-108bf5b2424da06aa2e1735ffd10a2b713834db8.zip | |
Merge branch 'template-types'
Diffstat (limited to 'game/vehicles/railVehicle.h')
| -rw-r--r-- | game/vehicles/railVehicle.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/game/vehicles/railVehicle.h b/game/vehicles/railVehicle.h index f6e4764..bf1e782 100644 --- a/game/vehicles/railVehicle.h +++ b/game/vehicles/railVehicle.h @@ -7,7 +7,7 @@ #include <glm/glm.hpp> #include <memory> -class Ray; +template<typename> class Ray; class Train; class RailVehicle : Selectable, RailVehicleClass::Instance { @@ -16,7 +16,7 @@ public: void move(const Train *, float & trailBy); - [[nodiscard]] bool intersectRay(const Ray &, BaryPosition &, RelativeDistance &) const override; + [[nodiscard]] bool intersectRay(const Ray<GlobalPosition3D> &, BaryPosition &, RelativeDistance &) const override; RailVehicleClassPtr rvClass; using LV = RailVehicleClass::LocationVertex; |