major rewrite of Cvar, Func and Entity

1 files changed, 15 insertions, 8 deletions

diff --git a/src/core/player.h b/src/core/player.h
index aa20d20..e19b8ae 100644
--- a/src/core/player.h
+++ b/src/core/player.h
@@ -27,21 +27,28 @@ public:
 	~Player();
 	
 	/// name of the player
-	std::string name;
-	
-	/// core id of the player
-	unsigned int id;
-	
+	inline std::string const &name() const { return player_name; }
+
+	///  id of the player
+	inline unsigned int id() const { return player_id; }
+
+	///  id of the player
+	unsigned int player_id;
+
+	/// name of the player
+	std::string player_name;
+
+
 	/// dirty state
 	bool dirty;
 
 	/// the entity the Player is currently controling
 	EntityControlable *control;
+	
+	/// the local player
+	static Player local;
 };
 
-/// the local player, always has id 0
-extern Player localplayer;
-
 }
 
 #endif // __INCLUDED_CORE_PLAYER_H__