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

diff --git a/src/standalone/MasterState.cpp b/src/standalone/MasterState.cpp
index 98d3c83..6ead299 100644
--- a/src/standalone/MasterState.cpp
+++ b/src/standalone/MasterState.cpp
@@ -24,12 +24,13 @@ MasterState::MasterState(
 , 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()
@@ -40,15 +41,22 @@ MasterState::MasterState(
 	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);
+}
+
 
 void MasterState::OnEnter() {
 	env.state.Push(&preload);