X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fscoreboard.qc;h=9c86d9e4c63355a9c198aa84c9ed285c89d51a50;hb=02a6cb9ffe0f7705397f14ac2c4c3354173e9ef1;hp=24cfe46abdfe5dc0d6d49f3ac91f5b25c091827f;hpb=cbd696f28d9038519ae6fccf39d76341036ce814;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/scoreboard.qc b/qcsrc/client/scoreboard.qc
index 24cfe46ab..9c86d9e4c 100644
--- a/qcsrc/client/scoreboard.qc
+++ b/qcsrc/client/scoreboard.qc
@@ -1,7 +1,7 @@
 #include "scoreboard.qh"
 
 #include "quickmenu.qh"
-#include "hud.qh"
+#include "hud/all.qh"
 
 #include "../common/constants.qh"
 #include "../common/mapinfo.qh"
@@ -109,7 +109,7 @@ void HUD_UpdatePlayerTeams()
 	for(pl = players.sort_next; pl; pl = pl.sort_next)
 	{
 		num += 1;
-		Team = GetPlayerColor(pl.sv_entnum);
+		Team = entcs_GetScoreTeam(pl.sv_entnum);
 		if(SetTeam(pl, Team))
 		{
 			tmp = pl.sort_prev;
@@ -146,8 +146,8 @@ int HUD_CompareScore(float vl, float vr, int f)
 float HUD_ComparePlayerScores(entity left, entity right)
 {
 	float vl, vr, r;
-	vl = GetPlayerColor(left.sv_entnum);
-	vr = GetPlayerColor(right.sv_entnum);
+	vl = entcs_GetTeam(left.sv_entnum);
+	vr = entcs_GetTeam(right.sv_entnum);
 
 	if(!left.gotscores)
 		vl = NUM_SPECTATOR;
@@ -303,8 +303,8 @@ void Cmd_HUD_Help()
 
 #define HUD_DefaultColumnLayout() \
 "ping pl name | " \
-"-teams,rc,lms/kills +ft,tdm/kills -teams,lms/deaths +ft,tdm/deaths -teams,lms,rc,ka/suicides +ft,tdm/suicides -rc,dm,tdm,ka,ft/frags " /* tdm already has this in "score" */ \
-"dmg dmgtaken " \
+"-teams,cts,lms/kills +ft,tdm/kills -teams,lms/deaths +ft,tdm/deaths -teams,lms,rc,ka/suicides +ft,tdm/suicides -cts,dm,tdm,ka,ft/frags " /* tdm already has this in "score" */ \
+"-rc,cts,nb/dmg -rc,cts,nb/dmgtaken " \
 "+ctf/caps +ctf/pickups +ctf/fckills +ctf/returns +ons/caps +ons/takes " \
 "+lms/lives +lms/rank " \
 "+kh/caps +kh/pushes +kh/destroyed " \
@@ -571,7 +571,7 @@ string HUD_GetField(entity pl, int field)
 					hud_field_icon2_rgb = colormapPaletteColor(f % 16, 1);
 				}
 			}
-			return GetPlayerName(pl.sv_entnum);
+			return entcs_GetName(pl.sv_entnum);
 
 		case SP_FRAGS:
 			f = pl.(scores[SP_KILLS]);
@@ -710,7 +710,7 @@ void HUD_PrintScoreboardItem(vector pos, vector item_size, entity pl, float is_s
 	string str;
 	int field;
 	float is_spec;
-	is_spec = (GetPlayerColor(pl.sv_entnum) == NUM_SPECTATOR);
+	is_spec = (entcs_GetTeam(pl.sv_entnum) == NUM_SPECTATOR);
 
 	if((rgb == '1 1 1') && (!is_spec)) {
 		rgb.x = autocvar_scoreboard_color_bg_r + 0.5;
@@ -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;
@@ -995,35 +995,26 @@ float HUD_WouldDrawScoreboard() {
 
 float average_accuracy;
 vector HUD_DrawScoreboardAccuracyStats(vector pos, vector rgb, vector bg_size)
-{SELFPARAM();
+{
+	SELFPARAM();
 	WepSet weapons_stat = WepSet_GetFromStat();
 	WepSet weapons_inmap = WepSet_GetFromStat_InMap();
 	float initial_posx = pos.x;
-	int i;
-	float weapon_stats;
 	int disownedcnt = 0;
-	for(i = WEP_FIRST; i <= WEP_LAST; ++i)
-	{
-		setself(get_weaponinfo(i));
-		if(!self.weapon)
-			continue;
-
-		weapon_stats = weapon_accuracy[i-WEP_FIRST];
+	FOREACH(Weapons, it != WEP_Null, LAMBDA(
+		int weapon_stats = weapon_accuracy[i - WEP_FIRST];
 
-		if(weapon_stats < 0 && !(weapons_stat & WepSet_FromWeapon(i) || weapons_inmap & WepSet_FromWeapon(i)))
+		WepSet set = it.m_wepset;
+		if (weapon_stats < 0 && !(weapons_stat & set || weapons_inmap & set))
 			++disownedcnt;
-	}
+	));
 
 	int weapon_cnt = (Weapons_COUNT - 1) - disownedcnt;
+	if (weapon_cnt <= 0) return pos;
 
-	if(weapon_cnt <= 0)
-		return pos;
-
-	int rows;
-	if(autocvar_scoreboard_accuracy_doublerows && weapon_cnt >= floor((Weapons_COUNT - 1) * 0.5))
+	int rows = 1;
+	if (autocvar_scoreboard_accuracy_doublerows && weapon_cnt >= floor((Weapons_COUNT - 1) * 0.5))
 		rows = 2;
-	else
-		rows = 1;
 	int columnns = ceil(weapon_cnt / rows);
 
 	float height = 40;
@@ -1044,24 +1035,24 @@ vector HUD_DrawScoreboardAccuracyStats(vector pos, vector rgb, vector bg_size)
 	drawborderlines(autocvar_scoreboard_border_thickness, pos, tmp, '0 0 0', scoreboard_alpha_bg * 0.75, DRAWFLAG_NORMAL);
 
 	// column highlighting
-	for(i = 0; i < columnns; ++i)
+	for (int i = 0; i < columnns; ++i)
 	{
-		if(!(i % 2))
+		if ((i % 2) == 0)
 			drawfill(pos + '1 0 0' * weapon_width * rows * i, '0 1 0' * height * rows + '1 0 0' * weapon_width * rows, '0 0 0', scoreboard_alpha_bg * 0.2, DRAWFLAG_NORMAL);
 	}
 
 	// row highlighting
-	for(i = 0; i < rows; ++i)
+	for (int i = 0; i < rows; ++i)
 	{
 		drawfill(pos + '0 1 0' * weapon_height + '0 1 0' * height * i, '1 0 0' * sbwidth + '0 1 0' * fontsize, '1 1 1', scoreboard_highlight_alpha, DRAWFLAG_NORMAL);
 	}
 
 	average_accuracy = 0;
 	int weapons_with_stats = 0;
-	if(rows == 2)
+	if (rows == 2)
 		pos.x += weapon_width / 2;
 
-	if(autocvar_scoreboard_accuracy_nocolors)
+	if (autocvar_scoreboard_accuracy_nocolors)
 		rgb = '1 1 1';
 	else
 		Accuracy_LoadColors();
@@ -1069,27 +1060,24 @@ vector HUD_DrawScoreboardAccuracyStats(vector pos, vector rgb, vector bg_size)
 	float oldposx = pos.x;
 	vector tmpos = pos;
 
-	int column;
-	for(i = WEP_FIRST, column = 0; i <= WEP_LAST; ++i)
-	{
-		setself(get_weaponinfo(i));
-		if (!self.weapon)
-			continue;
-		weapon_stats = weapon_accuracy[i-WEP_FIRST];
+	int column = 0;
+	FOREACH(Weapons, it != WEP_Null, LAMBDA(
+		int weapon_stats = weapon_accuracy[i - WEP_FIRST];
 
-		if(weapon_stats < 0 && !(weapons_stat & WepSet_FromWeapon(i) || weapons_inmap & WepSet_FromWeapon(i)))
+		WepSet set = it.m_wepset;
+		if (weapon_stats < 0 && !(weapons_stat & set || weapons_inmap & set))
 			continue;
 
 		float weapon_alpha;
-		if(weapon_stats >= 0)
+		if (weapon_stats >= 0)
 			weapon_alpha = scoreboard_alpha_fg;
 		else
 			weapon_alpha = 0.2 * scoreboard_alpha_fg;
 
 		// weapon icon
-		drawpic_aspect_skin(tmpos, self.model2, '1 0 0' * weapon_width + '0 1 0' * weapon_height, '1 1 1', weapon_alpha, DRAWFLAG_NORMAL);
+		drawpic_aspect_skin(tmpos, it.model2, '1 0 0' * weapon_width + '0 1 0' * weapon_height, '1 1 1', weapon_alpha, DRAWFLAG_NORMAL);
 		// the accuracy
-		if(weapon_stats >= 0) {
+		if (weapon_stats >= 0) {
 			weapons_with_stats += 1;
 			average_accuracy += weapon_stats; // store sum of all accuracies in average_accuracy
 
@@ -1106,15 +1094,15 @@ vector HUD_DrawScoreboardAccuracyStats(vector pos, vector rgb, vector bg_size)
 		}
 		tmpos.x += weapon_width * rows;
 		pos.x += weapon_width * rows;
-		if(rows == 2 && column == columnns - 1) {
+		if (rows == 2 && column == columnns - 1) {
 			tmpos.x = oldposx;
 			tmpos.y += height;
 			pos.y += height;
 		}
 		++column;
-	}
+	));
 
-	if(weapons_with_stats)
+	if (weapons_with_stats)
 		average_accuracy = floor((average_accuracy * 100 / weapons_with_stats) + 0.5);
 
 	pos.y += height;
@@ -1142,12 +1130,12 @@ vector HUD_DrawMapStats(vector pos, vector rgb, vector bg_size) {
 	string val;
 
 	// get monster stats
-	stat_monsters_killed = getstatf(STAT_MONSTERS_KILLED);
-	stat_monsters_total = getstatf(STAT_MONSTERS_TOTAL);
+	stat_monsters_killed = STAT(MONSTERS_KILLED);
+	stat_monsters_total = STAT(MONSTERS_TOTAL);
 
 	// get secrets stats
-	stat_secrets_found = getstatf(STAT_SECRETS_FOUND);
-	stat_secrets_total = getstatf(STAT_SECRETS_TOTAL);
+	stat_secrets_found = STAT(SECRETS_FOUND);
+	stat_secrets_total = STAT(SECRETS_TOTAL);
 
 	// get number of rows
 	if(stat_secrets_total)
@@ -1206,7 +1194,7 @@ vector HUD_DrawScoreboardRankings(vector pos, entity pl,  vector rgb, vector bg_
 		return pos;
 
 	float is_spec;
-	is_spec = (GetPlayerColor(pl.sv_entnum) == NUM_SPECTATOR);
+	is_spec = (entcs_GetTeam(pl.sv_entnum) == NUM_SPECTATOR);
 	vector hl_rgb;
 	hl_rgb.x = autocvar_scoreboard_color_bg_r + 0.5;
 	hl_rgb.y = autocvar_scoreboard_color_bg_g + 0.5;
@@ -1235,7 +1223,7 @@ vector HUD_DrawScoreboardRankings(vector pos, entity pl,  vector rgb, vector bg_
 			continue;
 		n = grecordholder[i];
 		p = count_ordinal(i+1);
-		if(grecordholder[i] == GetPlayerName(player_localnum))
+		if(grecordholder[i] == entcs_GetName(player_localnum))
 			drawfill(pos, '1 0 0' * sbwidth + '0 1.25 0' * hud_fontsize.y, hl_rgb, scoreboard_highlight_alpha_self, DRAWFLAG_NORMAL);
 		else if(!(i % 2) && scoreboard_highlight)
 			drawfill(pos, '1 0 0' * sbwidth + '0 1.25 0' * hud_fontsize.y, hl_rgb, scoreboard_highlight_alpha, DRAWFLAG_NORMAL);
@@ -1370,7 +1358,7 @@ void HUD_DrawScoreboard()
 		}
 		pos = HUD_DrawScoreboardRankings(pos, playerslots[player_localnum], rgb, bg_size);
 	}
-	else if(autocvar_scoreboard_accuracy && spectatee_status == 0 && !warmup_stage && gametype != MAPINFO_TYPE_NEXBALL) {
+	else if (autocvar_scoreboard_accuracy && !warmup_stage && gametype != MAPINFO_TYPE_NEXBALL) {
 		if(teamplay)
 			pos = HUD_DrawScoreboardAccuracyStats(pos, Team_ColorRGB(myteam), bg_size);
 		else
@@ -1411,9 +1399,9 @@ void HUD_DrawScoreboard()
 	// Print info string
 	float tl, fl, ll;
 	str = sprintf(_("playing ^3%s^7 on ^2%s^7"), MapInfo_Type_ToText(gametype), shortmapname);
-	tl = getstatf(STAT_TIMELIMIT);
-	fl = getstatf(STAT_FRAGLIMIT);
-	ll = getstatf(STAT_LEADLIMIT);
+	tl = STAT(TIMELIMIT);
+	fl = STAT(FRAGLIMIT);
+	ll = STAT(LEADLIMIT);
 	if(gametype == MAPINFO_TYPE_LMS)
 	{
 		if(tl > 0)
@@ -1467,7 +1455,7 @@ void HUD_DrawScoreboard()
 	drawcolorcodedstring(pos + '0.5 0 0' * (sbwidth - stringwidth(str, true, hud_fontsize)), str, hud_fontsize, scoreboard_alpha_fg, DRAWFLAG_NORMAL);
 
 	// print information about respawn status
-	float respawn_time = getstatf(STAT_RESPAWN_TIME);
+	float respawn_time = STAT(RESPAWN_TIME);
 	if(!intermission)
 	if(respawn_time)
 	{