X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fserver%2FServerState.hpp;h=4ad6bd72497bfd8ffae5da30edd4c5d90ad56ed8;hb=d507e4b06e32aff46caacf961b310ba1050b232f;hp=8f564ab5105c3f0d7f2220fa2f5e17b669c0be4c;hpb=8ae45b6555d55f301f83daf8c1337d332d8305ab;p=blank.git

diff --git a/src/server/ServerState.hpp b/src/server/ServerState.hpp
index 8f564ab..4ad6bd7 100644
--- a/src/server/ServerState.hpp
+++ b/src/server/ServerState.hpp
@@ -5,8 +5,7 @@
 #include "../ai/Spawner.hpp"
 #include "../app/IntervalTimer.hpp"
 #include "../app/State.hpp"
-#include "../model/Skeletons.hpp"
-#include "../world/BlockTypeRegistry.hpp"
+#include "../shared/WorldResources.hpp"
 #include "../world/ChunkLoader.hpp"
 #include "../world/Generator.hpp"
 #include "../world/World.hpp"
@@ -14,6 +13,7 @@
 
 namespace blank {
 
+class Config;
 class HeadlessEnvironment;
 class WorldSave;
 
@@ -28,8 +28,9 @@ public:
 		const Generator::Config &,
 		const World::Config &,
 		const WorldSave &,
-		const Server::Config &
+		const Config &
 	);
+	~ServerState();
 
 	void Handle(const SDL_Event &) override;
 	void Update(int dt) override;
@@ -37,14 +38,13 @@ public:
 
 private:
 	HeadlessEnvironment &env;
-	BlockTypeRegistry block_types;
+	WorldResources res;
 	World world;
 	Generator generator;
 	ChunkLoader chunk_loader;
-	Skeletons skeletons;
 	Spawner spawner;
 	Server server;
-	IntervalTimer loop_timer;
+	CoarseTimer loop_timer;
 
 };