1 files changed, 4 insertions, 3 deletions
diff --git a/game/gamestate.h b/game/gamestate.h
index 892aa69..85cb5db 100644
--- a/game/gamestate.h
+++ b/game/gamestate.h
@@ -6,8 +6,9 @@
 #include <special_members.h>
 
 class WorldObject;
-class GeoData;
+class Terrain;
 class Environment;
+class Renderable;
 
 class GameState {
 public:
@@ -16,8 +17,8 @@ public:
 	NO_MOVE(GameState);
 	NO_COPY(GameState);
 
-	Collection<WorldObject> world;
-	std::shared_ptr<GeoData> geoData;
+	SharedCollection<WorldObject, Renderable> world;
+	std::shared_ptr<Terrain> terrain;
 	std::shared_ptr<Environment> environment;
 	AssetFactory::Assets assets;
 };