X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fstandalone%2FMasterState.hpp;h=97834e6371db843f003fe5dbee5326a45452366c;hb=4da2ae6f12d7cf4594edb2d560c5c112e9bcd094;hp=f72c38ceed7b73f83059b3e1249c4da46f4c42f9;hpb=7e782291e0ce39eb2d4e8c1df28f682c313e6f8d;p=blank.git

diff --git a/src/standalone/MasterState.hpp b/src/standalone/MasterState.hpp
index f72c38c..97834e6 100644
--- a/src/standalone/MasterState.hpp
+++ b/src/standalone/MasterState.hpp
@@ -7,14 +7,13 @@
 #include "PreloadState.hpp"
 #include "UnloadState.hpp"
 #include "../ai/Spawner.hpp"
+#include "../audio/SoundBank.hpp"
 #include "../graphics/SkyBox.hpp"
-#include "../model/ModelRegistry.hpp"
-#include "../model/ShapeRegistry.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"
@@ -63,9 +62,8 @@ public:
 private:
 	Config &config;
 	Environment &env;
-	ShapeRegistry shapes;
-	BlockTypeRegistry block_types;
-	ModelRegistry models;
+	WorldResources res;
+	SoundBank sounds;
 	const WorldSave &save;
 	World world;
 	ChunkIndex &spawn_index;