X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fhud%2Fpanel%2Fmodicons.qc;h=bf302fdfa3f3cff6f2fcc701e269821a4a8b1f7f;hb=451e02a2857d8c671f6dcf6a0639ea7c609b3ba9;hp=fbc98e0a5a03cd1e0f0eca7dd1b93d22ae60ddca;hpb=77d6a05629e33da863fccb3cdd03b3c63af890dd;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/hud/panel/modicons.qc b/qcsrc/client/hud/panel/modicons.qc
index fbc98e0a5..bf302fdfa 100644
--- a/qcsrc/client/hud/panel/modicons.qc
+++ b/qcsrc/client/hud/panel/modicons.qc
@@ -4,7 +4,7 @@
 #include <common/ent_cs.qh>
 #include <server/mutators/mutator/gamemode_ctf.qh> // TODO: remove
 
-// Mod icons panel (#10)
+// Mod icons (#10)
 
 bool mod_active; // is there any active mod icon?
 
@@ -16,27 +16,11 @@ void DrawCAItem(vector myPos, vector mySize, float aspect_ratio, int layout, int
 	vector color = '0 0 0';
 	switch(i)
 	{
-		case 0:
-			stat = STAT(REDALIVE);
-			pic = "player_red.tga";
-			color = '1 0 0';
-			break;
-		case 1:
-			stat = STAT(BLUEALIVE);
-			pic = "player_blue.tga";
-			color = '0 0 1';
-			break;
-		case 2:
-			stat = STAT(YELLOWALIVE);
-			pic = "player_yellow.tga";
-			color = '1 1 0';
-			break;
+		case 0: stat = STAT(REDALIVE); pic = "player_red"; color = '1 0 0'; break;
+		case 1: stat = STAT(BLUEALIVE); pic = "player_blue"; color = '0 0 1'; break;
+		case 2: stat = STAT(YELLOWALIVE); pic = "player_yellow"; color = '1 1 0'; break;
 		default:
-		case 3:
-			stat = STAT(PINKALIVE);
-			pic = "player_pink.tga";
-			color = '1 0 1';
-			break;
+		case 3: stat = STAT(PINKALIVE); pic = "player_pink"; color = '1 0 1'; break;
 	}
 
 	if(mySize.x/mySize.y > aspect_ratio)
@@ -108,6 +92,7 @@ void HUD_Mod_CTF_Reset()
 	redflag_statuschange_time = blueflag_statuschange_time = yellowflag_statuschange_time = pinkflag_statuschange_time = neutralflag_statuschange_time = 0;
 }
 
+int autocvar__teams_available;
 void HUD_Mod_CTF(vector pos, vector mySize)
 {
 	vector redflag_pos, blueflag_pos, yellowflag_pos, pinkflag_pos, neutralflag_pos;
@@ -117,10 +102,13 @@ void HUD_Mod_CTF(vector pos, vector mySize)
 	int redflag, blueflag, yellowflag, pinkflag, neutralflag; // current status
 	float redflag_statuschange_elapsedtime = 0, blueflag_statuschange_elapsedtime = 0, yellowflag_statuschange_elapsedtime = 0, pinkflag_statuschange_elapsedtime = 0, neutralflag_statuschange_elapsedtime = 0; // time since the status changed
 	bool ctf_oneflag; // one-flag CTF mode enabled/disabled
+	bool ctf_stalemate; // currently in stalemate
 	int stat_items = STAT(CTF_FLAGSTATUS);
 	float fs, fs2, fs3, size1, size2;
 	vector e1, e2;
 
+	int nteams = autocvar__teams_available;
+
 	redflag = (stat_items/CTF_RED_FLAG_TAKEN) & 3;
 	blueflag = (stat_items/CTF_BLUE_FLAG_TAKEN) & 3;
 	yellowflag = (stat_items/CTF_YELLOW_FLAG_TAKEN) & 3;
@@ -129,14 +117,16 @@ void HUD_Mod_CTF(vector pos, vector mySize)
 
 	ctf_oneflag = (stat_items & CTF_FLAG_NEUTRAL);
 
-	mod_active = (redflag || blueflag || yellowflag || pinkflag || neutralflag);
+	ctf_stalemate = (stat_items & CTF_STALEMATE);
+
+	mod_active = (redflag || blueflag || yellowflag || pinkflag || neutralflag || (stat_items & CTF_SHIELDED));
 
 	if (autocvar__hud_configure) {
 		redflag = 1;
 		blueflag = 2;
-		if (team_count >= 3)
+		if (nteams & BIT(2))
 			yellowflag = 2;
-		if (team_count >= 4)
+		if (nteams & BIT(3))
 			pinkflag = 3;
 		ctf_oneflag = neutralflag = 0; // disable neutral flag in hud editor?
 	}
@@ -198,18 +188,24 @@ void HUD_Mod_CTF(vector pos, vector mySize)
 				break; \
 		} \
 	} MACRO_END
-	X(red, myteam != NUM_TEAM_1);
-	X(blue, myteam != NUM_TEAM_2);
-	X(yellow, myteam != NUM_TEAM_3);
-	X(pink, myteam != NUM_TEAM_4);
-	X(neutral, true);
+	X(red, myteam != NUM_TEAM_1 && (nteams & BIT(0)));
+	X(blue, myteam != NUM_TEAM_2 && (nteams & BIT(1)));
+	X(yellow, myteam != NUM_TEAM_3 && (nteams & BIT(2)));
+	X(pink, myteam != NUM_TEAM_4 && (nteams & BIT(3)));
+	X(neutral, ctf_oneflag);
 	#undef X
 
+	int tcount = 2;
+	if(nteams & BIT(2))
+		tcount = 3;
+	if(nteams & BIT(3))
+		tcount = 4;
+
 	if (ctf_oneflag) {
 		// hacky, but these aren't needed
 		red_icon = red_icon_prevstatus = blue_icon = blue_icon_prevstatus = yellow_icon = yellow_icon_prevstatus = pink_icon = pink_icon_prevstatus = string_null;
 		fs = fs2 = fs3 = 1;
-	} else switch (team_count) {
+	} else switch (tcount) {
 		default:
 		case 2: fs = 0.5; fs2 = 0.5; fs3 = 0.5; break;
 		case 3: fs = 1; fs2 = 0.35; fs3 = 0.35; break;
@@ -264,6 +260,8 @@ void HUD_Mod_CTF(vector pos, vector mySize)
 
 	#define X(team) MACRO_BEGIN { \
 		f = bound(0, team##flag_statuschange_elapsedtime * 2, 1); \
+		if (team##_icon && ctf_stalemate) \
+			drawpic_aspect_skin(team##flag_pos, "flag_stalemate", flag_size, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); \
 		if (team##_icon_prevstatus && f < 1) \
 			drawpic_aspect_skin_expanding(team##flag_pos, team##_icon_prevstatus, flag_size, '1 1 1', panel_fg_alpha * team##_alpha_prevstatus, DRAWFLAG_NORMAL, f); \
 		if (team##_icon) \
@@ -285,8 +283,9 @@ void HUD_Mod_KH(vector pos, vector mySize)
 	mod_active = 1; // keyhunt should never hide the mod icons panel
 
 	// Read current state
-
 	int state = STAT(KH_KEYS);
+	if(!state) return;
+
 	int i, key_state;
 	int all_keys, team1_keys, team2_keys, team3_keys, team4_keys, dropped_keys, carrying_keys;
 	all_keys = team1_keys = team2_keys = team3_keys = team4_keys = dropped_keys = carrying_keys = 0;
@@ -317,9 +316,7 @@ void HUD_Mod_KH(vector pos, vector mySize)
 	}
 
 	// Calculate slot measurements
-
 	vector slot_size;
-
 	if(all_keys == 4 && mySize.x * 0.5 < mySize.y && mySize.y * 0.5 < mySize.x)
 	{
 		// Quadratic arrangement
@@ -349,11 +346,10 @@ void HUD_Mod_KH(vector pos, vector mySize)
 
 	// Make icons blink in case of RUN HERE
 
-	float blink = 0.6 + sin(2*M_PI*time) / 2.5; // Oscillate between 0.2 and 1
-	float alpha;
-	alpha = 1;
-
+	float alpha = 1;
 	if(carrying_keys)
+	{
+		float blink = 0.6 + sin(2 * M_PI * time) * 0.4; // Oscillate between 0.2 and 1
 		switch(myteam)
 		{
 			case NUM_TEAM_1: if(team1_keys == all_keys) alpha = blink; break;
@@ -361,6 +357,7 @@ void HUD_Mod_KH(vector pos, vector mySize)
 			case NUM_TEAM_3: if(team3_keys == all_keys) alpha = blink; break;
 			case NUM_TEAM_4: if(team4_keys == all_keys) alpha = blink; break;
 		}
+	}
 
 	// Draw icons
 
@@ -491,16 +488,36 @@ float srecordtime_change_time; // time when srecordtime last changed
 float race_status_time;
 int race_status_prev;
 string race_status_name_prev;
+
+// Check if the given name already exist in race rankings? In that case, where? (otherwise return 0)
+int race_CheckName(string net_name)
+{
+	int i;
+	for (i=RANKINGS_CNT-1;i>=0;--i)
+		if(grecordholder[i] == net_name)
+			return i+1;
+	return 0;
+}
+
+void race_showTime(string text, vector pos, vector timeText_ofs, float theTime, vector textSize, float f)
+{
+	drawstring_aspect(pos, text, textSize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
+	drawstring_aspect(pos + timeText_ofs, TIME_ENCODED_TOSTRING(theTime), textSize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
+	if (f < 1) {
+		drawstring_aspect_expanding(pos, text, textSize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL, f);
+		drawstring_aspect_expanding(pos + timeText_ofs, TIME_ENCODED_TOSTRING(theTime), textSize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL, f);
+	}
+}
+
 void HUD_Mod_Race(vector pos, vector mySize)
 {
 	mod_active = 1; // race should never hide the mod icons panel
 	entity me;
 	me = playerslots[player_localnum];
 	float score;
-	float f; // yet another function has this
-	score = me.(scores[ps_primary]);
+	score = me.(scores(ps_primary));
 
-	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
 		return; // no records in the actual race
 
 	// clientside personal record
@@ -515,7 +532,7 @@ void HUD_Mod_Race(vector pos, vector mySize)
 		db_put(ClientProgsDB, strcat(shortmapname, rr, "time"), ftos(score));
 		if(autocvar_cl_autodemo_delete_keeprecords)
 		{
-			f = autocvar_cl_autodemo_delete;
+			float f = autocvar_cl_autodemo_delete;
 			f &= ~1;
 			cvar_set("cl_autodemo_delete", ftos(f)); // don't delete demo with new record!
 		}
@@ -539,18 +556,9 @@ void HUD_Mod_Race(vector pos, vector mySize)
 		textPos = pos + eY * 0.5 * max(0, mySize.y/2 - squareSize) + eX * 0.5 * (mySize.x - squareSize);
 		medalPos = pos + eY * 0.5 * max(0, mySize.y/2 - squareSize) + eY * 0.5 * mySize.y + eX * 0.5 * (mySize.x - squareSize);
 	}
+	vector textSize = eX * squareSize + eY * 0.25 * squareSize;
 
-	f = time - crecordtime_change_time;
-
-	if (f > 1) {
-		drawstring_aspect(textPos, _("Personal best"), eX * squareSize + eY * 0.25 * squareSize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
-		drawstring_aspect(textPos + eY * 0.25 * squareSize, TIME_ENCODED_TOSTRING(t), eX * squareSize + eY * 0.25 * squareSize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
-	} else {
-		drawstring_aspect(textPos, _("Personal best"), eX * squareSize + eY * 0.25 * squareSize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
-		drawstring_aspect(textPos + eY * 0.25 * squareSize, TIME_ENCODED_TOSTRING(t), eX * squareSize + eY * 0.25 * squareSize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
-		drawstring_aspect_expanding(pos, _("Personal best"), eX * squareSize + eY * 0.25 * squareSize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL, f);
-		drawstring_aspect_expanding(pos + eY * 0.25 * squareSize, TIME_ENCODED_TOSTRING(t), eX * squareSize + eY * 0.25 * squareSize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL, f);
-	}
+	race_showTime(_("Personal best"), textPos, eY * 0.25 * squareSize, t, textSize, time - crecordtime_change_time);
 
 	// server record
 	t = race_server_record;
@@ -558,17 +566,9 @@ void HUD_Mod_Race(vector pos, vector mySize)
 		srecordtime_prev = t;
 		srecordtime_change_time = time;
 	}
-	f = time - srecordtime_change_time;
 
-	if (f > 1) {
-		drawstring_aspect(textPos + eY * 0.5 * squareSize, _("Server best"), eX * squareSize + eY * 0.25 * squareSize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
-		drawstring_aspect(textPos + eY * 0.75 * squareSize, TIME_ENCODED_TOSTRING(t), eX * squareSize + eY * 0.25 * squareSize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
-	} else {
-		drawstring_aspect(textPos + eY * 0.5 * squareSize, _("Server best"), eX * squareSize + eY * 0.25 * squareSize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
-		drawstring_aspect(textPos + eY * 0.75 * squareSize, TIME_ENCODED_TOSTRING(t), eX * squareSize + eY * 0.25 * squareSize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
-		drawstring_aspect_expanding(textPos + eY * 0.5 * squareSize, _("Server best"), eX * squareSize + eY * 0.25 * squareSize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL, f);
-		drawstring_aspect_expanding(textPos + eY * 0.75 * squareSize, TIME_ENCODED_TOSTRING(t), eX * squareSize + eY * 0.25 * squareSize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL, f);
-	}
+	textPos += eY * 0.5 * squareSize;
+	race_showTime(_("Server best"), textPos, eY * 0.25 * squareSize, t, textSize, time - srecordtime_change_time);
 
 	if (race_status != race_status_prev || race_status_name != race_status_name_prev) {
 		race_status_time = time + 5;
@@ -637,29 +637,15 @@ void DrawDomItem(vector myPos, vector mySize, float aspect_ratio, int layout, in
 	vector color = '0 0 0';
 	switch(i)
 	{
-		case 0:
-			stat = STAT(DOM_PPS_RED);
-			pic = "dom_icon_red";
-			color = '1 0 0';
-			break;
-		case 1:
-			stat = STAT(DOM_PPS_BLUE);
-			pic = "dom_icon_blue";
-			color = '0 0 1';
-			break;
-		case 2:
-			stat = STAT(DOM_PPS_YELLOW);
-			pic = "dom_icon_yellow";
-			color = '1 1 0';
-			break;
+		case 0: stat = STAT(DOM_PPS_RED); pic = "dom_icon_red"; color = '1 0 0'; break;
+		case 1: stat = STAT(DOM_PPS_BLUE); pic = "dom_icon_blue"; color = '0 0 1'; break;
+		case 2: stat = STAT(DOM_PPS_YELLOW); pic = "dom_icon_yellow"; color = '1 1 0'; break;
 		default:
-		case 3:
-			stat = STAT(DOM_PPS_PINK);
-			pic = "dom_icon_pink";
-			color = '1 0 1';
-			break;
+		case 3: stat = STAT(DOM_PPS_PINK); pic = "dom_icon_pink"; color = '1 0 1'; break;
 	}
-	float pps_ratio = stat / STAT(DOM_TOTAL_PPS);
+	float pps_ratio = 0;
+	if(STAT(DOM_TOTAL_PPS))
+		pps_ratio = stat / STAT(DOM_TOTAL_PPS);
 
 	if(mySize.x/mySize.y > aspect_ratio)
 	{
@@ -726,18 +712,7 @@ void HUD_Mod_Dom(vector myPos, vector mySize)
 
 void HUD_ModIcons_SetFunc()
 {
-	switch(gametype)
-	{
-		case MAPINFO_TYPE_KEYHUNT:		HUD_ModIcons_GameType = HUD_Mod_KH; break;
-		case MAPINFO_TYPE_CTF:			HUD_ModIcons_GameType = HUD_Mod_CTF; break;
-		case MAPINFO_TYPE_NEXBALL:		HUD_ModIcons_GameType = HUD_Mod_NexBall; break;
-		case MAPINFO_TYPE_CTS:
-		case MAPINFO_TYPE_RACE:		HUD_ModIcons_GameType = HUD_Mod_Race; break;
-		case MAPINFO_TYPE_CA:
-		case MAPINFO_TYPE_FREEZETAG:	HUD_ModIcons_GameType = HUD_Mod_CA; break;
-		case MAPINFO_TYPE_DOMINATION:	HUD_ModIcons_GameType = HUD_Mod_Dom; break;
-		case MAPINFO_TYPE_KEEPAWAY:	HUD_ModIcons_GameType = HUD_Mod_Keepaway; break;
-	}
+	HUD_ModIcons_GameType = gametype.m_modicons;
 }
 
 int mod_prev; // previous state of mod_active to check for a change
@@ -752,9 +727,6 @@ void HUD_ModIcons()
 		if(!HUD_ModIcons_GameType) return;
 	}
 
-	HUD_Panel_UpdateCvars();
-
-	draw_beginBoldFont();
 
 	if(mod_active != mod_prev) {
 		mod_change = time;
@@ -766,8 +738,19 @@ void HUD_ModIcons()
 	else
 		mod_alpha = bound(0, 1 - (time - mod_change) * 2, 1);
 
-	if(mod_alpha)
-		HUD_Panel_DrawBg(mod_alpha);
+	//if(mod_alpha <= 0)
+	//	return;
+	panel_fade_alpha *= mod_alpha;
+	HUD_Panel_LoadCvars();
+
+	draw_beginBoldFont();
+
+	if (autocvar_hud_panel_modicons_dynamichud)
+		HUD_Scale_Enable();
+	else
+		HUD_Scale_Disable();
+
+	HUD_Panel_DrawBg();
 
 	if(panel_bg_padding)
 	{