diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2024-01-01 15:53:54 +0000 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2024-01-01 15:53:54 +0000 |
| commit | 69e6b7d2d349dcc42d2d415a72181ba729d5a19d (patch) | |
| tree | 5d7dff2f2775701069806eceb4eaef23b22eba3f /game | |
| parent | Remove legacy Position types from shadowMapper (diff) | |
| download | ilt-69e6b7d2d349dcc42d2d415a72181ba729d5a19d.tar.bz2 ilt-69e6b7d2d349dcc42d2d415a72181ba729d5a19d.tar.xz ilt-69e6b7d2d349dcc42d2d415a72181ba729d5a19d.zip | |
Remove more use of legacy types
Diffstat (limited to 'game')
| -rw-r--r-- | game/vehicles/railVehicle.cpp | 2 | ||||
| -rw-r--r-- | game/vehicles/railVehicle.h | 2 | ||||
| -rw-r--r-- | game/vehicles/train.cpp | 2 | ||||
| -rw-r--r-- | game/vehicles/train.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/game/vehicles/railVehicle.cpp b/game/vehicles/railVehicle.cpp index 30b615c..7e4b1ee 100644 --- a/game/vehicles/railVehicle.cpp +++ b/game/vehicles/railVehicle.cpp @@ -44,7 +44,7 @@ RailVehicle::move(const Train * t, float & trailBy) } bool -RailVehicle::intersectRay(const Ray & ray, Position2D * baryPos, float * distance) const +RailVehicle::intersectRay(const Ray & ray, BaryPosition * baryPos, float * distance) const { constexpr const auto X = 1350.F; const auto Y = this->rvClass->length / 2.F; diff --git a/game/vehicles/railVehicle.h b/game/vehicles/railVehicle.h index 20d1ea1..8cbc49d 100644 --- a/game/vehicles/railVehicle.h +++ b/game/vehicles/railVehicle.h @@ -17,7 +17,7 @@ public: void move(const Train *, float & trailBy); - [[nodiscard]] bool intersectRay(const Ray &, Position2D *, float *) const override; + [[nodiscard]] bool intersectRay(const Ray &, BaryPosition *, float *) const override; RailVehicleClassPtr rvClass; using LV = RailVehicleClass::LocationVertex; diff --git a/game/vehicles/train.cpp b/game/vehicles/train.cpp index 4aa24dc..13905a3 100644 --- a/game/vehicles/train.cpp +++ b/game/vehicles/train.cpp @@ -20,7 +20,7 @@ Train::getBogiePosition(float linkDist, float dist) const } bool -Train::intersectRay(const Ray & ray, Position2D * baryPos, float * distance) const +Train::intersectRay(const Ray & ray, BaryPosition * baryPos, float * distance) const { return applyOne(&RailVehicle::intersectRay, ray, baryPos, distance) != end(); } diff --git a/game/vehicles/train.h b/game/vehicles/train.h index 7f0bb99..c77cd23 100644 --- a/game/vehicles/train.h +++ b/game/vehicles/train.h @@ -27,7 +27,7 @@ public: return objects.front()->location; } - [[nodiscard]] bool intersectRay(const Ray &, Position2D *, float *) const override; + [[nodiscard]] bool intersectRay(const Ray &, BaryPosition *, float *) const override; void tick(TickDuration elapsed) override; void doActivity(Go *, TickDuration) override; |