X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fclient%2Fhud%2Fpanel%2Fmodicons.qc;h=5901a16326ca40047480f5e71d67ae7d783f7cfd;hp=54c835831dec0b27510d9d41953fd2ac8c265955;hb=87cbf00c7734cf2910502c217b5c5157511ba5ea;hpb=f6dd336135aa93ee4617df2389c3bfb28f0e1c58

diff --git a/qcsrc/client/hud/panel/modicons.qc b/qcsrc/client/hud/panel/modicons.qc
index 54c835831d..5901a16326 100644
--- a/qcsrc/client/hud/panel/modicons.qc
+++ b/qcsrc/client/hud/panel/modicons.qc
@@ -108,6 +108,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 +118,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 +133,16 @@ void HUD_Mod_CTF(vector pos, vector mySize)
 
 	ctf_oneflag = (stat_items & CTF_FLAG_NEUTRAL);
 
+	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 +204,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 && team_count >= 3);
-	X(pink, myteam != NUM_TEAM_4 && team_count >= 4);
+	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 +276,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) \