X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fstandalone%2FMasterState.cpp;h=6ead29980bf2cdc9bd10573a59c7593111f6ba38;hb=78dcbeb7a905c4c153cb1b20e23f5adc1efc6d7e;hp=272e5a39ac2afbf1caff668d89e991b847cdaf24;hpb=b066e776622f96e906600a0c4a08de392bd03676;p=blank.git

diff --git a/src/standalone/MasterState.cpp b/src/standalone/MasterState.cpp
index 272e5a3..6ead299 100644
--- a/src/standalone/MasterState.cpp
+++ b/src/standalone/MasterState.cpp
@@ -4,6 +4,7 @@
 #include "../app/Environment.hpp"
 #include "../app/init.hpp"
 #include "../app/TextureIndex.hpp"
+#include "../io/WorldSave.hpp"
 
 #include <SDL.h>
 
@@ -21,13 +22,15 @@ MasterState::MasterState(
 : config(config)
 , env(env)
 , block_types()
+, save(save)
 , world(block_types, wc)
+, spawn_index(world.Chunks().MakeIndex(wc.spawn, 3))
 , player(*world.AddPlayer(config.player.name))
 , hud(env, config, player)
 , manip(env, player.GetEntity())
 , input(world, player, manip)
 , interface(config, env.keymap, input, *this)
-, generator(gc)
+, generator(gc, block_types)
 , chunk_loader(world.Chunks(), generator, save)
 , chunk_renderer(player.GetChunks())
 , skeletons()
@@ -37,10 +40,21 @@ MasterState::MasterState(
 , unload(env, world.Chunks(), save) {
 	TextureIndex tex_index;
 	env.loader.LoadBlockTypes("default", block_types, tex_index);
+	interface.SetInventorySlots(block_types.Size() - 1);
+	generator.Scan();
 	chunk_renderer.LoadTextures(env.loader, tex_index);
 	chunk_renderer.FogDensity(wc.fog_density);
 	skeletons.Load();
 	spawner.LimitSkeletons(0, skeletons.Size());
+	if (save.Exists(player)) {
+		save.Read(player);
+	} else {
+		// TODO: spawn
+	}
+}
+
+MasterState::~MasterState() {
+	world.Chunks().UnregisterIndex(spawn_index);
 }
 
 
@@ -71,7 +85,7 @@ void MasterState::Handle(const SDL_Event &event) {
 			interface.Handle(event.wheel);
 			break;
 		case SDL_QUIT:
-			env.state.Switch(&unload);
+			Exit();
 			break;
 		default:
 			break;
@@ -84,6 +98,8 @@ void MasterState::Update(int dt) {
 		hud.FocusBlock(input.BlockFocus().GetChunk(), input.BlockFocus().block);
 	} else if (input.EntityFocus()) {
 		hud.FocusEntity(*input.EntityFocus().entity);
+	} else {
+		hud.FocusNone();
 	}
 	hud.Display(block_types[player.GetInventorySlot() + 1]);
 	hud.Update(dt);
@@ -148,7 +164,8 @@ void MasterState::SetDebug(bool b) {
 }
 
 void MasterState::Exit() {
-	env.state.Pop();
+	save.Write(player);
+	env.state.Switch(&unload);
 }
 
 }