X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fstandalone%2FMasterState.cpp;h=1035bb23688da035893c3a10fdd8e687a9190b79;hb=f430ad789fe620ad2e8b2b2b99af868372791295;hp=7ae67418a6160bec46081c23924eaf7e8bab357f;hpb=9c5308ba4108bd842af6d9d2e893ea575a7e6ca8;p=blank.git

diff --git a/src/standalone/MasterState.cpp b/src/standalone/MasterState.cpp
index 7ae6741..1035bb2 100644
--- a/src/standalone/MasterState.cpp
+++ b/src/standalone/MasterState.cpp
@@ -21,13 +21,14 @@ MasterState::MasterState(
 : config(config)
 , env(env)
 , res()
+, sounds()
 , save(save)
 , 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)
@@ -41,7 +42,9 @@ MasterState::MasterState(
 	if (res.models.size() < 2) {
 		throw std::runtime_error("need at least two models to run");
 	}
-	spawner.LimitModels(0, res.models.size());
+	res.models[0].Instantiate(player.GetEntity().GetModel());
+	sounds.Load(env.loader, res.snd_index);
+	spawner.LimitModels(1, res.models.size());
 	interface.SetInventorySlots(res.block_types.size() - 1);
 	generator.LoadTypes(res.block_types);
 	chunk_renderer.LoadTextures(env.loader, res.tex_index);
@@ -129,7 +132,9 @@ void MasterState::Update(int dt) {
 }
 
 void MasterState::Render(Viewport &viewport) {
-	viewport.WorldPosition(player.GetEntity().Transform(player.GetEntity().ChunkCoords()));
+	viewport.WorldPosition(
+		player.GetEntity().Transform(player.GetEntity().ChunkCoords())
+		* player.GetEntity().GetModel().EyesTransform());
 	if (config.video.world) {
 		chunk_renderer.Render(viewport);
 		world.Render(viewport);