X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fstandalone%2Fstandalone.cpp;h=b556918db34023cd645dd3c3fed9df45aab8a015;hb=f85083db1989c218d91a09f43dd92fde9fb179c7;hp=2ffe6bc862c85a72600cf5ce4512d4efbdecb323;hpb=dc9e991ce52da5d89722e1b5f3862988afaa41cc;p=blank.git diff --git a/src/standalone/standalone.cpp b/src/standalone/standalone.cpp index 2ffe6bc..b556918 100644 --- a/src/standalone/standalone.cpp +++ b/src/standalone/standalone.cpp @@ -12,13 +12,14 @@ #include "../world/ChunkRenderer.hpp" #include +#include namespace blank { namespace standalone { DirectCLIFeedback::DirectCLIFeedback(Player &p, HUD &h) -: CLIContext(p) +: CLIContext(&p) , hud(h) { } @@ -59,7 +60,7 @@ MasterState::MasterState( , generator(gc) , chunk_loader(world.Chunks(), generator, save) , chunk_renderer(player.GetChunks()) -, spawner(world, res.models, env.rng) +, spawner(world, res.models) , sky(env.loader.LoadCubeMap("skybox")) , cli(world) , cli_ctx(player, hud) @@ -94,6 +95,7 @@ void MasterState::OnResume() { env.state.Push(&preload); return; } + std::cout << "chunk preloading complete" << std::endl; if (spawn_player) { // TODO: spawn spawn_player = false; @@ -266,7 +268,7 @@ PreloadState::PreloadState(Environment &env, ChunkLoader &loader, ChunkRenderer } -void PreloadState::Update(int dt) { +void PreloadState::Update(int) { loader.LoadN(per_update); if (loader.ToLoad() <= 0) { env.state.Pop(); @@ -306,7 +308,7 @@ void UnloadState::Handle(const SDL_Event &) { // ignore everything } -void UnloadState::Update(int dt) { +void UnloadState::Update(int) { for (std::size_t i = 0; i < per_update && cur != end; ++i, ++cur, ++done) { if (cur->ShouldUpdateSave()) { save.Write(*cur);