From 71b6b902732bfc0c53033d58f91a6b1e70e8371f Mon Sep 17 00:00:00 2001
From: Stijn Buys <ingar@osirion.org>
Date: Thu, 21 Feb 2008 21:01:17 +0000
Subject: more minor updates

---
 src/core/gameinterface.cc | 34 +++++++++++++++++++++++++++++++---
 1 file changed, 31 insertions(+), 3 deletions(-)

(limited to 'src/core/gameinterface.cc')

diff --git a/src/core/gameinterface.cc b/src/core/gameinterface.cc
index 33166ee..6f6a4ac 100644
--- a/src/core/gameinterface.cc
+++ b/src/core/gameinterface.cc
@@ -19,13 +19,41 @@ namespace core
 
 Player GameInterface::game_localplayer;
 
+EntityControlable *localcontrol()
+{ 
+	if (game()->localplayer())
+		return game()->localplayer()->control();
+	else
+		return 0;
+	
+}
+Player *localplayer()
+{ 
+	return game()->localplayer();
+}
+
 GameInterface::GameInterface()
 {
+	clear();
+	
 	if (Cvar::sv_dedicated->value())
 		game_localplayer.player_name.assign("Console");
-	else
-		game_localplayer.player_name.assign("Player0");
-	clear();
+	else {
+		Cvar *cl_name = Cvar::find("cl_name");
+		if (cl_name) {
+			game_localplayer.player_name = cl_name->str();
+		}
+		
+		Cvar *cl_color = Cvar::find("cl_color");
+		math::Color color(1.0, 1.0, 1.0, 1.0);
+		if (cl_color) {
+			std::istringstream is(cl_color->str());
+			is >> color;
+		}
+		game_localplayer.player_color = color;
+		
+
+	}
 }
 
 GameInterface::~GameInterface()
-- 
cgit v1.2.3