diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2025-03-22 12:17:57 +0000 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2025-03-22 12:17:57 +0000 |
| commit | fcca8bc835db65ac170d1148d52a815df8838d53 (patch) | |
| tree | c28d017961cb05f6360042e7a089f10641f174b4 /game | |
| parent | Add ManyPtr which tracks specified subclasses (diff) | |
| download | ilt-fcca8bc835db65ac170d1148d52a815df8838d53.tar.bz2 ilt-fcca8bc835db65ac170d1148d52a815df8838d53.tar.xz ilt-fcca8bc835db65ac170d1148d52a815df8838d53.zip | |
Invert how shared/unique is specified for Collection
Template param is a pointer now, typedefs added for ease.
Diffstat (limited to 'game')
| -rw-r--r-- | game/gamestate.h | 2 | ||||
| -rw-r--r-- | game/network/network.h | 2 | ||||
| -rw-r--r-- | game/orders.h | 2 | ||||
| -rw-r--r-- | game/vehicles/train.h | 2 | ||||
| -rw-r--r-- | game/water.h | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/game/gamestate.h b/game/gamestate.h index 189417d..c5ad239 100644 --- a/game/gamestate.h +++ b/game/gamestate.h @@ -16,7 +16,7 @@ public: NO_MOVE(GameState); NO_COPY(GameState); - Collection<WorldObject> world; + SharedCollection<WorldObject> world; std::shared_ptr<Terrain> terrain; std::shared_ptr<Environment> environment; AssetFactory::Assets assets; diff --git a/game/network/network.h b/game/network/network.h index 291c4ec..73c3788 100644 --- a/game/network/network.h +++ b/game/network/network.h @@ -77,7 +77,7 @@ class NetworkOf : public Network, public Renderable, public NetworkLinkHolder<Li protected: using Network::Network; - Collection<T> links; + SharedCollection<T> links; void joinLinks(const Link::Ptr &) const; protected: diff --git a/game/orders.h b/game/orders.h index ca5cfdb..840aa3c 100644 --- a/game/orders.h +++ b/game/orders.h @@ -5,7 +5,7 @@ class Objective; -class Orders : public Collection<Objective> { +class Orders : public SharedCollection<Objective> { public: [[nodiscard]] Objective * current() const; Objective * next(); diff --git a/game/vehicles/train.h b/game/vehicles/train.h index 4933347..88e30f9 100644 --- a/game/vehicles/train.h +++ b/game/vehicles/train.h @@ -15,7 +15,7 @@ class SceneShader; class ShadowMapper; template<typename> class Ray; -class Train : public Vehicle, public Collection<RailVehicle, false>, public Can<Go>, public Can<Idle> { +class Train : public Vehicle, public UniqueCollection<RailVehicle>, public Can<Go>, public Can<Idle> { public: explicit Train(const Link::CPtr & link, float linkDist = 0) : Vehicle {link, linkDist} { } diff --git a/game/water.h b/game/water.h index f9fe080..07d9ae1 100644 --- a/game/water.h +++ b/game/water.h @@ -29,6 +29,6 @@ private: void generateMeshes(); std::shared_ptr<GeoData> geoData; - Collection<MeshT<Vertex>, false> meshes; + UniqueCollection<MeshT<Vertex>> meshes; Texture::Ptr water; }; |