merge common parts of pre- and unload states

[blank.git] / src / standalone / MasterState.cpp

diff --git a/src/standalone/MasterState.cpp b/src/standalone/MasterState.cpp
index 98d3c839d8689dfc0950ba8ff9cb309d5c14eadf..ced107d1a85573c2462defb16c48e7d2eaf47aba 100644 (file)
--- a/src/standalone/MasterState.cpp
+++ b/src/standalone/MasterState.cpp
@@ -24,6 +24,7 @@ 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())
@@ -33,22 +34,29 @@ MasterState::MasterState(
 , chunk_loader(world.Chunks(), generator, save)
 , chunk_renderer(player.GetChunks())
 , skeletons()
-, spawner(world, skeletons, gc.seed)
+, spawner(world, skeletons, env.rng)
 , sky(env.loader.LoadCubeMap("skybox"))
 , preload(env, chunk_loader, chunk_renderer)
 , unload(env, world.Chunks(), save) {
        TextureIndex tex_index;
        env.loader.LoadBlockTypes("default", block_types, tex_index);
-       interface.SetInventorySlots(block_types.Size() - 1);
+       interface.SetInventorySlots(block_types.size() - 1);
+       generator.LoadTypes(block_types);
        chunk_renderer.LoadTextures(env.loader, tex_index);
        chunk_renderer.FogDensity(wc.fog_density);
        skeletons.Load();
-       spawner.LimitSkeletons(0, skeletons.Size());
+       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);