X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fhud%2Fpanel%2Fscore.qc;h=525bf614b8be11e0cd01c075ec857b61c2937090;hb=ad2d918472c84295255fba550959b58cacc9cfb1;hp=5f1a525fd7953599d66fb20bc90660a59dc91ae4;hpb=ee7c610671151d87500ad2a8be0d57b68e2b69f7;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/hud/panel/score.qc b/qcsrc/client/hud/panel/score.qc
index 5f1a525fd..525bf614b 100644
--- a/qcsrc/client/hud/panel/score.qc
+++ b/qcsrc/client/hud/panel/score.qc
@@ -1,12 +1,15 @@
 #include "score.qh"
 
+#include <client/autocvars.qh>
+#include <client/defs.qh>
+#include <client/miscfunctions.qh>
 #include "scoreboard.qh"
 #include <common/ent_cs.qh>
 #include <common/mapinfo.qh>
+#include <common/scores.qh>
 
 // Score (#7)
 
-void Scoreboard_UpdatePlayerTeams();
 void HUD_Score_Rankings(vector pos, vector mySize, entity me)
 {
 	float score;
@@ -36,8 +39,8 @@ void HUD_Score_Rankings(vector pos, vector mySize, entity me)
 			players_per_team = max(2, ceil((entries - 1) / team_count));
 			for(i=0; i<team_count; ++i) {
 				if (i == floor((entries - 2) / players_per_team) || (entries == 1 && i == 0))
-					HUD_Panel_DrawHighlight(pos + eX * score_size * i, eX * score_size + eY * fontsize.y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
-				drawstring_aspect(pos + eX * score_size * i, ftos(175 - 23*i), eX * score_size + eY * fontsize.y, Team_ColorRGB(ColorByTeam(i)) * 0.8, panel_fg_alpha, DRAWFLAG_NORMAL);
+					HUD_Panel_DrawHighlight(pos + eX * score_size * i, vec2(score_size, fontsize.y), '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
+				drawstring_aspect(pos + eX * score_size * i, ftos(175 - 23*i), vec2(score_size, fontsize.y), Team_ColorRGB(ColorByTeam(i)) * 0.8, panel_fg_alpha, DRAWFLAG_NORMAL);
 			}
 			first_pl = 1;
 			pos.y += fontsize.y;
@@ -51,7 +54,7 @@ void HUD_Score_Rankings(vector pos, vector mySize, entity me)
 			if (i == entries-1 && autocvar_hud_panel_score_rankings == 1)
 			{
 				rgb = '1 1 0';
-				drawfill(pos, eX * mySize.x + eY * fontsize.y, rgb, highlight_alpha * panel_fg_alpha, DRAWFLAG_NORMAL);
+				drawfill(pos, vec2(mySize.x, fontsize.y), rgb, highlight_alpha * panel_fg_alpha, DRAWFLAG_NORMAL);
 				s = entcs_GetName(player_localnum);
 				score = 7;
 			}
@@ -80,11 +83,12 @@ void HUD_Score_Rankings(vector pos, vector mySize, entity me)
 		for(tm = teams.sort_next; tm; tm = tm.sort_next) {
 			if(tm.team == NUM_SPECTATOR)
 				continue;
-			if(!tm.team && teamplay)
+			if(!tm.team)
 				continue;
+
 			if (tm.team == myteam)
-				drawfill(pos + eX * score_size * i, eX * score_size + eY * fontsize.y, '1 1 1', highlight_alpha * panel_fg_alpha, DRAWFLAG_NORMAL);
-			drawstring_aspect(pos + eX * score_size * i, ftos(tm.(teamscores[ts_primary])), eX * score_size + eY * fontsize.y, Team_ColorRGB(tm.team) * 0.8, panel_fg_alpha, DRAWFLAG_NORMAL);
+				drawfill(pos + eX * score_size * i, vec2(score_size, fontsize.y), '1 1 1', highlight_alpha * panel_fg_alpha, DRAWFLAG_NORMAL);
+			drawstring_aspect(pos + eX * score_size * i, ftos(tm.(teamscores(ts_primary))), vec2(score_size, fontsize.y), Team_ColorRGB(tm.team) * 0.8, panel_fg_alpha, DRAWFLAG_NORMAL);
 			++i;
 		}
 		first_pl = 1;
@@ -124,7 +128,7 @@ void HUD_Score_Rankings(vector pos, vector mySize, entity me)
 			score_color = Team_ColorRGB(pl.team) * 0.8;
 		s = textShortenToWidth(entcs_GetName(pl.sv_entnum), name_size, fontsize, stringwidth_colors);
 		drawcolorcodedstring(pos + eX * (name_size - stringwidth(s, true, fontsize)), s, fontsize, panel_fg_alpha, DRAWFLAG_NORMAL);
-		drawstring(pos + eX * (name_size + spacing_size), ftos(pl.(scores[ps_primary])), fontsize, score_color, panel_fg_alpha, DRAWFLAG_NORMAL);
+		drawstring(pos + eX * (name_size + spacing_size), ftos(pl.(scores(ps_primary))), fontsize, score_color, panel_fg_alpha, DRAWFLAG_NORMAL);
 		pos.y += fontsize.y;
 		++i;
 	}
@@ -136,10 +140,10 @@ void HUD_Score()
 	if(!autocvar__hud_configure)
 	{
 		if(!autocvar_hud_panel_score) return;
-		if(spectatee_status == -1 && (gametype == MAPINFO_TYPE_RACE || gametype == MAPINFO_TYPE_CTS)) return;
+		if(spectatee_status == -1 && (ISGAMETYPE(RACE) || ISGAMETYPE(CTS))) return;
 	}
 
-	HUD_Panel_UpdateCvars();
+	HUD_Panel_LoadCvars();
 	vector pos, mySize;
 	pos = panel_pos;
 	mySize = panel_size;
@@ -148,7 +152,7 @@ void HUD_Score()
 		HUD_Scale_Enable();
 	else
 		HUD_Scale_Disable();
-	HUD_Panel_DrawBg(1);
+	HUD_Panel_DrawBg();
 	if(panel_bg_padding)
 	{
 		pos += '1 1 0' * panel_bg_padding;
@@ -162,25 +166,25 @@ void HUD_Score()
 
 	me = playerslots[current_player];
 
-	if((scores_flags[ps_primary] & SFL_TIME) && !teamplay) { // race/cts record display on HUD
+	if((scores_flags(ps_primary) & SFL_TIME) && !teamplay) { // race/cts record display on HUD
 		string timer, distrtimer;
 
 		pl = players.sort_next;
 		if(pl == me)
 			pl = pl.sort_next;
-		if(scores_flags[ps_primary] & SFL_ZERO_IS_WORST)
-			if(pl.scores[ps_primary] == 0)
+		if(scores_flags(ps_primary) & SFL_ZERO_IS_WORST)
+			if(pl.scores(ps_primary) == 0)
 				pl = NULL;
 
-		score = me.(scores[ps_primary]);
+		score = me.(scores(ps_primary));
 		timer = TIME_ENCODED_TOSTRING(score);
 
 		draw_beginBoldFont();
-		if (pl && ((!(scores_flags[ps_primary] & SFL_ZERO_IS_WORST)) || score)) {
+		if (pl && ((!(scores_flags(ps_primary) & SFL_ZERO_IS_WORST)) || score)) {
 			// distribution display
-			distribution = me.(scores[ps_primary]) - pl.(scores[ps_primary]);
+			distribution = me.(scores(ps_primary)) - pl.(scores(ps_primary));
 
-			distrtimer = ftos_decimals(fabs(distribution/pow(10, TIME_DECIMALS)), TIME_DECIMALS);
+			distrtimer = ftos_decimals(fabs(distribution/(10 ** TIME_DECIMALS)), TIME_DECIMALS);
 
 			if (distribution <= 0) {
 				distribution_color = '0 1 0';
@@ -190,12 +194,12 @@ void HUD_Score()
 				distribution_color = '1 0 0';
 				sign = "+";
 			}
-			drawstring_aspect(pos + eX * 0.75 * mySize.x, strcat(sign, distrtimer), eX * 0.25 * mySize.x + eY * (1/3) * mySize.y, distribution_color, panel_fg_alpha, DRAWFLAG_NORMAL);
+			drawstring_aspect(pos + eX * 0.75 * mySize.x, strcat(sign, distrtimer), vec2(0.25 * mySize.x, (1/3) * mySize.y), distribution_color, panel_fg_alpha, DRAWFLAG_NORMAL);
 		}
 		// race record display
 		if (distribution <= 0)
-			HUD_Panel_DrawHighlight(pos, eX * 0.75 * mySize.x + eY * mySize.y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
-		drawstring_aspect(pos, timer, eX * 0.75 * mySize.x + eY * mySize.y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
+			HUD_Panel_DrawHighlight(pos, vec2(0.75 * mySize.x, mySize.y), '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
+		drawstring_aspect(pos, timer, vec2(0.75 * mySize.x, mySize.y), '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
 		draw_endBoldFont();
 	} else if (!teamplay) { // non-teamgames
 		if ((spectatee_status == -1 && !autocvar__hud_configure) || autocvar_hud_panel_score_rankings)
@@ -211,11 +215,11 @@ void HUD_Score()
 		if(autocvar__hud_configure)
 			distribution = 42;
 		else if(pl)
-			distribution = me.(scores[ps_primary]) - pl.(scores[ps_primary]);
+			distribution = me.(scores(ps_primary)) - pl.(scores(ps_primary));
 		else
 			distribution = 0;
 
-		score = me.(scores[ps_primary]);
+		score = me.(scores(ps_primary));
 		if(autocvar__hud_configure)
 			score = 123;
 
@@ -238,7 +242,7 @@ void HUD_Score()
 			HUD_Panel_DrawHighlight(pos, eX * 0.75 * mySize.x + eY * mySize.y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
 		}
 		drawstring_aspect(pos, ftos(score), eX * 0.75 * mySize.x + eY * mySize.y, distribution_color, panel_fg_alpha, DRAWFLAG_NORMAL);
-		drawstring_aspect(pos + eX * 0.75 * mySize.x, distribution_str, eX * 0.25 * mySize.x + eY * (1/3) * mySize.y, distribution_color, panel_fg_alpha, DRAWFLAG_NORMAL);
+		drawstring_aspect(pos + eX * 0.75 * mySize.x, distribution_str, vec2(0.25 * mySize.x, (1/3) * mySize.y), distribution_color, panel_fg_alpha, DRAWFLAG_NORMAL);
 		draw_endBoldFont();
 	} else { // teamgames
 		float row, column, rows = 0, columns = 0;
@@ -253,7 +257,7 @@ void HUD_Score()
 		{
 			rows = HUD_GetRowCount(team_count, mySize, 3);
 			columns = ceil(team_count/rows);
-			score_size = eX * mySize.x*(1/columns) + eY * mySize.y*(1/rows);
+			score_size = vec2(mySize.x / columns, mySize.y / rows);
 
 			float newSize;
 			if(score_size.x/score_size.y > 3)
@@ -272,7 +276,7 @@ void HUD_Score()
 			}
 		}
 		else
-			score_size = eX * mySize.x*(1/4) + eY * mySize.y*(1/3);
+			score_size = vec2(mySize.x / 4, mySize.y / 3);
 
 		float max_fragcount;
 		max_fragcount = -99;
@@ -281,9 +285,10 @@ void HUD_Score()
 		for(tm = teams.sort_next; tm; tm = tm.sort_next) {
 			if(tm.team == NUM_SPECTATOR)
 				continue;
-			if(!tm.team && teamplay)
+			if(!tm.team)
 				continue;
-			score = tm.(teamscores[ts_primary]);
+
+			score = tm.(teamscores(ts_primary));
 			if(autocvar__hud_configure)
 				score = 123;
 
@@ -292,7 +297,7 @@ void HUD_Score()
 
 			if (spectatee_status == -1)
 			{
-				score_pos = pos + eX * column * (score_size.x + offset.x) + eY * row * (score_size.y + offset.y);
+				score_pos = pos + vec2(column * (score_size.x + offset.x), row * (score_size.y + offset.y));
 				if (max_fragcount == score)
 					HUD_Panel_DrawHighlight(score_pos, score_size, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
 				drawstring_aspect(score_pos, ftos(score), score_size, Team_ColorRGB(tm.team) * 0.8, panel_fg_alpha, DRAWFLAG_NORMAL);
@@ -305,12 +310,12 @@ void HUD_Score()
 			}
 			else if(tm.team == myteam) {
 				if (max_fragcount == score)
-					HUD_Panel_DrawHighlight(pos, eX * 0.75 * mySize.x + eY * mySize.y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
-				drawstring_aspect(pos, ftos(score), eX * 0.75 * mySize.x + eY * mySize.y, Team_ColorRGB(tm.team) * 0.8, panel_fg_alpha, DRAWFLAG_NORMAL);
+					HUD_Panel_DrawHighlight(pos, vec2(0.75 * mySize.x, mySize.y), '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
+				drawstring_aspect(pos, ftos(score), vec2(0.75 * mySize.x, mySize.y), Team_ColorRGB(tm.team) * 0.8, panel_fg_alpha, DRAWFLAG_NORMAL);
 			} else {
 				if (max_fragcount == score)
-					HUD_Panel_DrawHighlight(pos + eX * 0.75 * mySize.x + eY * (1/3) * rows * mySize.y, score_size, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
-				drawstring_aspect(pos + eX * 0.75 * mySize.x + eY * (1/3) * rows * mySize.y, ftos(score), score_size, Team_ColorRGB(tm.team) * 0.8, panel_fg_alpha, DRAWFLAG_NORMAL);
+					HUD_Panel_DrawHighlight(pos + vec2(0.75 * mySize.x, (1/3) * rows * mySize.y), score_size, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
+				drawstring_aspect(pos + vec2(0.75 * mySize.x, (1/3) * rows * mySize.y), ftos(score), score_size, Team_ColorRGB(tm.team) * 0.8, panel_fg_alpha, DRAWFLAG_NORMAL);
 				++rows;
 			}
 		}