X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fstandalone%2FMasterState.cpp;h=ced107d1a85573c2462defb16c48e7d2eaf47aba;hb=9da6ac5e93d79e79658a95d5f6efe42146873583;hp=dccc0f958410764b1416c89ff6ac2dce6dbcd59c;hpb=5178dd1e226d45db7ae61e3d7d6866dc4254d9ae;p=blank.git diff --git a/src/standalone/MasterState.cpp b/src/standalone/MasterState.cpp index dccc0f9..ced107d 100644 --- a/src/standalone/MasterState.cpp +++ b/src/standalone/MasterState.cpp @@ -34,17 +34,18 @@ 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 {