X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fstandalone%2FMasterState.cpp;h=ced107d1a85573c2462defb16c48e7d2eaf47aba;hb=9240fdf2e68ee014da0d0a89a7fb2f29ebf28e2d;hp=dedb4ce3c49206b90c0a8deb96592cecf9f869d9;hpb=825f479edf9867938b6789215ad7ae6303596cba;p=blank.git diff --git a/src/standalone/MasterState.cpp b/src/standalone/MasterState.cpp index dedb4ce..ced107d 100644 --- a/src/standalone/MasterState.cpp +++ b/src/standalone/MasterState.cpp @@ -30,7 +30,7 @@ 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() @@ -40,8 +40,8 @@ MasterState::MasterState( , 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();