summaryrefslogtreecommitdiff
path: root/game/gamestate.h
diff options
context:
space:
mode:
authorDan Goodliffe <dan@randomdan.homeip.net>2025-03-28 19:04:21 +0000
committerDan Goodliffe <dan@randomdan.homeip.net>2025-03-28 19:04:21 +0000
commit508ffe80c9991cc76f4fa37dd2fa21746abe3a89 (patch)
treefe5ca4a08a246191432c304708ce76fe1c3905d6 /game/gamestate.h
parentCreate the last group in jsonParse.ll (diff)
parentFix check for bulk removal (diff)
downloadilt-508ffe80c9991cc76f4fa37dd2fa21746abe3a89.tar.bz2
ilt-508ffe80c9991cc76f4fa37dd2fa21746abe3a89.tar.xz
ilt-508ffe80c9991cc76f4fa37dd2fa21746abe3a89.zip
Merge remote-tracking branch 'origin/ptrs'HEADmain
Diffstat (limited to 'game/gamestate.h')
-rw-r--r--game/gamestate.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/game/gamestate.h b/game/gamestate.h
index 189417d..85cb5db 100644
--- a/game/gamestate.h
+++ b/game/gamestate.h
@@ -8,6 +8,7 @@
class WorldObject;
class Terrain;
class Environment;
+class Renderable;
class GameState {
public:
@@ -16,7 +17,7 @@ public:
NO_MOVE(GameState);
NO_COPY(GameState);
- Collection<WorldObject> world;
+ SharedCollection<WorldObject, Renderable> world;
std::shared_ptr<Terrain> terrain;
std::shared_ptr<Environment> environment;
AssetFactory::Assets assets;