X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fscoreboard.qc;h=44b820ebc7a7acadb5faebe2da7265136193e630;hb=519d828d3e1767f7269430f5c318cd95b9bd125d;hp=4d9a8c69d0c35c91fe9496da174b91d33ea29e9c;hpb=f203a8239ab58e776da8df7bce46be73d2d655a4;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/scoreboard.qc b/qcsrc/client/scoreboard.qc
index 4d9a8c69d..44b820ebc 100644
--- a/qcsrc/client/scoreboard.qc
+++ b/qcsrc/client/scoreboard.qc
@@ -109,7 +109,7 @@ void HUD_UpdatePlayerTeams()
 	for(pl = players.sort_next; pl; pl = pl.sort_next)
 	{
 		num += 1;
-		Team = entcs_GetTeam(pl.sv_entnum);
+		Team = entcs_GetScoreTeam(pl.sv_entnum);
 		if(SetTeam(pl, Team))
 		{
 			tmp = pl.sort_prev;
@@ -608,17 +608,17 @@ string HUD_GetField(entity pl, int field)
 		case SP_DMG:
 			num = pl.(scores[SP_DMG]);
 			denom = 1000;
-			
+
 			str = sprintf("%.1f k", num/denom);
 			return str;
-			
+
 		case SP_DMGTAKEN:
 			num = pl.(scores[SP_DMGTAKEN]);
 			denom = 1000;
-			
+
 			str = sprintf("%.1f k", num/denom);
-			return str; 
-		
+			return str;
+
 		default:
 			tmp = pl.(scores[field]);
 			f = scores_flags[field];
@@ -986,7 +986,7 @@ float HUD_WouldDrawScoreboard() {
 		return 1;
 	else if (intermission == 2)
 		return 0;
-	else if (spectatee_status != -1 && getstati(STAT_HEALTH) <= 0 && autocvar_cl_deathscoreboard && gametype != MAPINFO_TYPE_CTS && !active_minigame)
+	else if (spectatee_status != -1 && STAT(HEALTH) <= 0 && autocvar_cl_deathscoreboard && gametype != MAPINFO_TYPE_CTS && !active_minigame)
 		return 1;
 	else if (scoreboard_showscores_force)
 		return 1;
@@ -1002,8 +1002,6 @@ vector HUD_DrawScoreboardAccuracyStats(vector pos, vector rgb, vector bg_size)
 	float initial_posx = pos.x;
 	int disownedcnt = 0;
 	FOREACH(Weapons, it != WEP_Null, LAMBDA(
-		if (!it.weapon) continue;
-
 		int weapon_stats = weapon_accuracy[i - WEP_FIRST];
 
 		WepSet set = it.m_wepset;
@@ -1064,7 +1062,6 @@ vector HUD_DrawScoreboardAccuracyStats(vector pos, vector rgb, vector bg_size)
 
 	int column = 0;
 	FOREACH(Weapons, it != WEP_Null, LAMBDA(
-		if (!it.weapon) continue;
 		int weapon_stats = weapon_accuracy[i - WEP_FIRST];
 
 		WepSet set = it.m_wepset;