X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fclient%2Fteamplay.qc;h=80d89318f4c88d09cf5170aaa47e89c51ad0c156;hp=0c52f29d07f471bfb0a26a40d588ec2af644c1cf;hb=6f6a9d3ce8a4fd3c10f7421ba27e4bfc944c8f9b;hpb=8bac780bb3585a2668469ea787ca92474bb89ed5

diff --git a/qcsrc/client/teamplay.qc b/qcsrc/client/teamplay.qc
index 0c52f29d0..80d89318f 100644
--- a/qcsrc/client/teamplay.qc
+++ b/qcsrc/client/teamplay.qc
@@ -9,20 +9,31 @@ float TeamByColor(float color)
 	default: return 0;
 	}
 }
+float ColorByTeam(float i)
+{
+	switch(i)
+	{
+	case 0: return COLOR_TEAM1;
+	case 1: return COLOR_TEAM2;
+	case 2: return COLOR_TEAM3;
+	case 3: return COLOR_TEAM4;
+	default: return COLOR_TEAM1;
+	}
+}
 
 float GetPlayerColorForce(float i)
 {
 	if(!teamplay)
 		return 0;
 	else
-		return stof(getplayerkey(i, "colors")) & 15;
+		return stof(getplayerkeyvalue(i, "colors")) & 15;
 }
 
 float GetPlayerColor(float i)
 {
 	if not(playerslots[i].gotscores) // unconnected
 		return COLOR_SPECTATOR;
-	else if(stof(getplayerkey(i, "frags")) == FRAGS_SPECTATOR)
+	else if(stof(getplayerkeyvalue(i, "frags")) == FRAGS_SPECTATOR)
 		return COLOR_SPECTATOR;
 	else
 		return GetPlayerColorForce(i);
@@ -30,7 +41,7 @@ float GetPlayerColor(float i)
 
 string GetPlayerName(float i)
 {
-	return ColorTranslateRGB(getplayerkey(i, "name"));
+	return ColorTranslateRGB(getplayerkeyvalue(i, "name"));
 }
 
 vector GetTeamRGB(float color)