X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fserver%2FServerState.hpp;h=b62cf0904224f767730bf6cd33f5156c1d7e50f8;hb=4e3afb4c7631591b80cb7740a9b6f46da69b7ae4;hp=31ad5217535567d4bf1fd63490ae72f06f6c9b08;hpb=b066e776622f96e906600a0c4a08de392bd03676;p=blank.git

diff --git a/src/server/ServerState.hpp b/src/server/ServerState.hpp
index 31ad521..b62cf09 100644
--- a/src/server/ServerState.hpp
+++ b/src/server/ServerState.hpp
@@ -5,7 +5,8 @@
 #include "../ai/Spawner.hpp"
 #include "../app/IntervalTimer.hpp"
 #include "../app/State.hpp"
-#include "../model/Skeletons.hpp"
+#include "../model/ModelRegistry.hpp"
+#include "../model/ShapeRegistry.hpp"
 #include "../world/BlockTypeRegistry.hpp"
 #include "../world/ChunkLoader.hpp"
 #include "../world/Generator.hpp"
@@ -31,6 +32,7 @@ public:
 		const WorldSave &,
 		const Config &
 	);
+	~ServerState();
 
 	void Handle(const SDL_Event &) override;
 	void Update(int dt) override;
@@ -38,11 +40,12 @@ public:
 
 private:
 	HeadlessEnvironment &env;
+	ShapeRegistry shapes;
 	BlockTypeRegistry block_types;
+	ModelRegistry models;
 	World world;
 	Generator generator;
 	ChunkLoader chunk_loader;
-	Skeletons skeletons;
 	Spawner spawner;
 	Server server;
 	IntervalTimer loop_timer;