X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fui%2FInterface.hpp;h=72db5d13eb94fbea290c434e8eae260234925cb3;hb=38a4cffc0b6aa58e49d24c06aad7bee14cb6515d;hp=aab8b156596e5cdf42ba691bb8cbe8a381c46dc4;hpb=dbfcb12348b80e2582f710acb1e4ed0011889ba2;p=blank.git

diff --git a/src/ui/Interface.hpp b/src/ui/Interface.hpp
index aab8b15..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 <string>
@@ -20,6 +21,7 @@
 
 namespace blank {
 
+class Entity;
 class Environment;
 class Viewport;
 class World;
@@ -40,10 +42,9 @@ public:
 		bool visual_disabled = false;
 	};
 
-	Interface(const Config &, Environment &, World &);
+	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 &);
@@ -90,6 +91,7 @@ private:
 private:
 	Environment &env;
 	World &world;
+	Player player;
 	FPSController ctrl;
 	HUD hud;