X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fstandalone%2FMasterState.cpp;h=98d3c839d8689dfc0950ba8ff9cb309d5c14eadf;hb=78a290bd642c5578c9dd17481c8164ff50889ca2;hp=635f2733fc4590317e36cd365e3ef9a2e52ce109;hpb=ccd6e7001572808400b9cb9bc91f9bedcf28a1ad;p=blank.git

diff --git a/src/standalone/MasterState.cpp b/src/standalone/MasterState.cpp
index 635f273..98d3c83 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,6 +22,7 @@ MasterState::MasterState(
 : config(config)
 , env(env)
 , block_types()
+, save(save)
 , world(block_types, wc)
 , player(*world.AddPlayer(config.player.name))
 , hud(env, config, player)
@@ -42,6 +44,9 @@ MasterState::MasterState(
 	chunk_renderer.FogDensity(wc.fog_density);
 	skeletons.Load();
 	spawner.LimitSkeletons(0, skeletons.Size());
+	if (save.Exists(player)) {
+		save.Read(player);
+	}
 }
 
 
@@ -72,7 +77,7 @@ void MasterState::Handle(const SDL_Event &event) {
 			interface.Handle(event.wheel);
 			break;
 		case SDL_QUIT:
-			env.state.Switch(&unload);
+			Exit();
 			break;
 		default:
 			break;
@@ -151,7 +156,8 @@ void MasterState::SetDebug(bool b) {
 }
 
 void MasterState::Exit() {
-	env.state.Pop();
+	save.Write(player);
+	env.state.Switch(&unload);
 }
 
 }