X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fui%2FInterface.hpp;h=72db5d13eb94fbea290c434e8eae260234925cb3;hb=38a4cffc0b6aa58e49d24c06aad7bee14cb6515d;hp=7c9a91e33324520c458ff7cf773ea90d51360f56;hpb=4e3d9c23940c4511623b5bf328cbbe42641c4b30;p=blank.git diff --git a/src/ui/Interface.hpp b/src/ui/Interface.hpp index 7c9a91e..72db5d1 100644 --- a/src/ui/Interface.hpp +++ b/src/ui/Interface.hpp @@ -11,6 +11,7 @@ #include "../model/OutlineModel.hpp" #include "../world/Block.hpp" #include "../world/EntityCollision.hpp" +#include "../world/Player.hpp" #include "../world/WorldCollision.hpp" #include @@ -41,10 +42,9 @@ public: bool visual_disabled = false; }; - Interface(const Config &, Environment &, World &, Entity &); + Interface(const Config &, Environment &, World &, const Player &); - Entity &Player() noexcept { return ctrl.Controlled(); } - const Entity &Player() const noexcept { return ctrl.Controlled(); } + const Player &GetPlayer() noexcept { return player; } void HandlePress(const SDL_KeyboardEvent &); void HandleRelease(const SDL_KeyboardEvent &); @@ -91,6 +91,7 @@ private: private: Environment &env; World &world; + Player player; FPSController ctrl; HUD hud;