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 6ead29980bf2cdc9bd10573a59c7593111f6ba38..ced107d1a85573c2462defb16c48e7d2eaf47aba 100644 (file)
--- a/src/standalone/MasterState.cpp
+++ b/src/standalone/MasterState.cpp
@@ -30,22 +30,22 @@ MasterState::MasterState(
 , manip(env, player.GetEntity())
 , input(world, player, manip)
 , interface(config, env.keymap, input, *this)
-, generator(gc, block_types)
+, generator(gc)
 , 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);
-       generator.Scan();
+       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 {