X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fstandalone%2Fstandalone.cpp;h=b556918db34023cd645dd3c3fed9df45aab8a015;hb=3ff7bfeecf8ddc8d5b384683246a39bc05f9794d;hp=ad6450d5b05bda8a42d419f5969e32c977256a05;hpb=fa3c4a14546d73ddc2671cd5cc58208839bf7173;p=blank.git

diff --git a/src/standalone/standalone.cpp b/src/standalone/standalone.cpp
index ad6450d..b556918 100644
--- a/src/standalone/standalone.cpp
+++ b/src/standalone/standalone.cpp
@@ -12,13 +12,14 @@
 #include "../world/ChunkRenderer.hpp"
 
 #include <SDL.h>
+#include <iostream>
 
 
 namespace blank {
 namespace standalone {
 
 DirectCLIFeedback::DirectCLIFeedback(Player &p, HUD &h)
-: CLIContext(p)
+: CLIContext(&p)
 , hud(h) {
 
 }
@@ -59,7 +60,7 @@ MasterState::MasterState(
 , generator(gc)
 , chunk_loader(world.Chunks(), generator, save)
 , chunk_renderer(player.GetChunks())
-, spawner(world, res.models, env.rng)
+, spawner(world, res.models)
 , sky(env.loader.LoadCubeMap("skybox"))
 , cli(world)
 , cli_ctx(player, hud)
@@ -94,6 +95,7 @@ void MasterState::OnResume() {
 		env.state.Push(&preload);
 		return;
 	}
+	std::cout << "chunk preloading complete" << std::endl;
 	if (spawn_player) {
 		// TODO: spawn
 		spawn_player = false;
@@ -164,7 +166,7 @@ void MasterState::Update(int dt) {
 	if (input.BlockFocus()) {
 		hud.FocusBlock(input.BlockFocus().GetChunk(), input.BlockFocus().block);
 	} else if (input.EntityFocus()) {
-		hud.FocusEntity(*input.EntityFocus().entity);
+		hud.FocusEntity(input.EntityFocus().GetEntity());
 	} else {
 		hud.FocusNone();
 	}
@@ -266,7 +268,7 @@ PreloadState::PreloadState(Environment &env, ChunkLoader &loader, ChunkRenderer
 
 }
 
-void PreloadState::Update(int dt) {
+void PreloadState::Update(int) {
 	loader.LoadN(per_update);
 	if (loader.ToLoad() <= 0) {
 		env.state.Pop();
@@ -306,7 +308,7 @@ void UnloadState::Handle(const SDL_Event &) {
 	// ignore everything
 }
 
-void UnloadState::Update(int dt) {
+void UnloadState::Update(int) {
 	for (std::size_t i = 0; i < per_update && cur != end; ++i, ++cur, ++done) {
 		if (cur->ShouldUpdateSave()) {
 			save.Write(*cur);