X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fstandalone%2FMasterState.cpp;h=3695b201c71f83ec8764c17ec7f02f9786dcfb19;hb=07b8335e7bfd631e0878e183c87238812d632c56;hp=d357a84b6cb47df65c4cff83aa5ea8ef2678312d;hpb=ba55bf4293f3abc742eef710545a4b207ba2c820;p=blank.git

diff --git a/src/standalone/MasterState.cpp b/src/standalone/MasterState.cpp
index d357a84..3695b20 100644
--- a/src/standalone/MasterState.cpp
+++ b/src/standalone/MasterState.cpp
@@ -3,7 +3,6 @@
 #include "../app/Config.hpp"
 #include "../app/Environment.hpp"
 #include "../app/init.hpp"
-#include "../app/TextureIndex.hpp"
 #include "../io/WorldSave.hpp"
 
 #include <SDL.h>
@@ -21,34 +20,34 @@ MasterState::MasterState(
 )
 : config(config)
 , env(env)
-, shapes()
-, block_types()
+, res()
+, sounds()
 , save(save)
-, world(block_types, wc)
+, world(res.block_types, wc)
 , spawn_index(world.Chunks().MakeIndex(wc.spawn, 3))
 , player(*world.AddPlayer(config.player.name))
 , spawn_player(false)
 , hud(env, config, player)
-, manip(env, player.GetEntity())
+, manip(env.audio, sounds, player.GetEntity())
 , input(world, player, manip)
 , interface(config, env.keymap, input, *this)
 , generator(gc)
 , chunk_loader(world.Chunks(), generator, save)
 , chunk_renderer(player.GetChunks())
-, skeletons()
-, spawner(world, skeletons, env.rng)
+, spawner(world, res.models, env.rng)
 , sky(env.loader.LoadCubeMap("skybox"))
 , preload(env, chunk_loader, chunk_renderer)
 , unload(env, world.Chunks(), save) {
-	TextureIndex tex_index;
-	env.loader.LoadShapes("default", shapes);
-	env.loader.LoadBlockTypes("default", block_types, tex_index, shapes);
-	skeletons.Load(shapes, tex_index);
-	interface.SetInventorySlots(block_types.size() - 1);
-	generator.LoadTypes(block_types);
-	chunk_renderer.LoadTextures(env.loader, tex_index);
+	res.Load(env.loader, "default");
+	if (res.models.size() < 2) {
+		throw std::runtime_error("need at least two models to run");
+	}
+	sounds.Load(env.loader, res.snd_index);
+	spawner.LimitModels(0, res.models.size());
+	interface.SetInventorySlots(res.block_types.size() - 1);
+	generator.LoadTypes(res.block_types);
+	chunk_renderer.LoadTextures(env.loader, res.tex_index);
 	chunk_renderer.FogDensity(wc.fog_density);
-	spawner.LimitSkeletons(0, skeletons.size());
 	if (save.Exists(player)) {
 		save.Read(player);
 	} else {
@@ -116,7 +115,7 @@ void MasterState::Update(int dt) {
 	} else {
 		hud.FocusNone();
 	}
-	hud.Display(block_types[player.GetInventorySlot() + 1]);
+	hud.Display(res.block_types[player.GetInventorySlot() + 1]);
 	hud.Update(dt);
 	spawner.Update(dt);
 	world.Update(dt);