X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fapp%2FWorldState.cpp;fp=src%2Fapp%2FWorldState.cpp;h=03abe36c163c4b7c120b725fd74a9d3a337f9bd8;hb=9ebe2c320fd9f94266ab93fa2f9d9908a0a284d3;hp=243b0a1dc519d42ba18d1e6350e60864896480ba;hpb=f27b8bb27fa87487bb5d29a1456e610255287b04;p=blank.git diff --git a/src/app/WorldState.cpp b/src/app/WorldState.cpp index 243b0a1..03abe36 100644 --- a/src/app/WorldState.cpp +++ b/src/app/WorldState.cpp @@ -1,6 +1,7 @@ #include "WorldState.hpp" #include "Environment.hpp" +#include "init.hpp" #include "TextureIndex.hpp" #include @@ -23,8 +24,8 @@ WorldState::WorldState( , preload(env, world.Loader(), chunk_renderer) , unload(env, world.Loader()) { TextureIndex tex_index; - env.assets.LoadBlockTypes("default", block_types, tex_index); - chunk_renderer.LoadTextures(env.assets, tex_index); + env.loader.LoadBlockTypes("default", block_types, tex_index); + chunk_renderer.LoadTextures(env.loader, tex_index); chunk_renderer.FogDensity(wc.fog_density); // TODO: better solution for initializing HUD interface.SelectNext(); @@ -33,6 +34,7 @@ WorldState::WorldState( void WorldState::OnEnter() { env.state.Push(&preload); + env.window.GrabMouse(); }