X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fstandalone%2FMasterState.hpp;h=97834e6371db843f003fe5dbee5326a45452366c;hb=07b8335e7bfd631e0878e183c87238812d632c56;hp=9e0b8e4c68e119fade7c03636bff1b71f79e30fb;hpb=04531ab5fc3d82ba5b5d456bcc277fe6499e1150;p=blank.git

diff --git a/src/standalone/MasterState.hpp b/src/standalone/MasterState.hpp
index 9e0b8e4..97834e6 100644
--- a/src/standalone/MasterState.hpp
+++ b/src/standalone/MasterState.hpp
@@ -7,13 +7,13 @@
 #include "PreloadState.hpp"
 #include "UnloadState.hpp"
 #include "../ai/Spawner.hpp"
+#include "../audio/SoundBank.hpp"
 #include "../graphics/SkyBox.hpp"
-#include "../model/Skeletons.hpp"
+#include "../shared/WorldResources.hpp"
 #include "../ui/DirectInput.hpp"
 #include "../ui/HUD.hpp"
 #include "../ui/InteractiveManipulator.hpp"
 #include "../ui/Interface.hpp"
-#include "../world/BlockTypeRegistry.hpp"
 #include "../world/ChunkIndex.hpp"
 #include "../world/ChunkLoader.hpp"
 #include "../world/ChunkRenderer.hpp"
@@ -62,7 +62,8 @@ public:
 private:
 	Config &config;
 	Environment &env;
-	BlockTypeRegistry block_types;
+	WorldResources res;
+	SoundBank sounds;
 	const WorldSave &save;
 	World world;
 	ChunkIndex &spawn_index;
@@ -75,7 +76,6 @@ private:
 	Generator generator;
 	ChunkLoader chunk_loader;
 	ChunkRenderer chunk_renderer;
-	Skeletons skeletons;
 	Spawner spawner;
 
 	SkyBox sky;