X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;ds=sidebyside;f=src%2Fui%2Fui.cpp;h=39942987f6375a243fd0412572cffbc8201bf3fe;hb=13e676a6e49128ebc6c63b8dd08bef51d360e8e9;hp=2ec4d883d3e6f963dc047e85694a5bfb9bcec00d;hpb=4e3d9c23940c4511623b5bf328cbbe42641c4b30;p=blank.git diff --git a/src/ui/ui.cpp b/src/ui/ui.cpp index 2ec4d88..3994298 100644 --- a/src/ui/ui.cpp +++ b/src/ui/ui.cpp @@ -103,11 +103,11 @@ Interface::Interface( const Config &config, Environment &env, World &world, - Entity &player) + const Player &player) : env(env) , world(world) -// let's assume this succeeds and hope for the best for now -, ctrl(player) +, player(player) +, ctrl(*player.entity) , hud(world.BlockTypes(), env.assets.small_ui_font) , aim{{ 0, 0, 0 }, { 0, 0, -1 }} , aim_world() @@ -526,7 +526,7 @@ void Interface::UpdateOutline() { outl_buf.Clear(); aim_world.GetType().FillOutlineModel(outl_buf); outline.Update(outl_buf); - outline_transform = aim_world.GetChunk().Transform(Player().ChunkCoords()); + outline_transform = aim_world.GetChunk().Transform(player.entity->ChunkCoords()); outline_transform *= aim_world.BlockTransform(); outline_transform *= glm::scale(glm::vec3(1.005f)); }