From: z411 <z411@omaera.org>
Date: Sat, 27 Aug 2022 00:56:57 +0000 (-0400)
Subject: Survival: Remove now redundant round timer
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3f147da53ad4e791e52840ee3bbdca54d5d19254;p=xonotic%2Fxonotic-data.pk3dir.git

Survival: Remove now redundant round timer
---

diff --git a/qcsrc/common/gamemodes/gamemode/survival/cl_survival.qc b/qcsrc/common/gamemodes/gamemode/survival/cl_survival.qc
index 83893e69d3..c35418647e 100644
--- a/qcsrc/common/gamemodes/gamemode/survival/cl_survival.qc
+++ b/qcsrc/common/gamemodes/gamemode/survival/cl_survival.qc
@@ -29,30 +29,7 @@ void HUD_Mod_Survival(vector pos, vector mySize)
 		return;
 	}
 
-	string time_text = string_null;
-	vector timer_color = '1 1 1';
-	if(!STAT(GAME_STOPPED) && !warmup_stage && STAT(SURVIVAL_ROUNDTIMER) > 0)
-	{
-		float timeleft = max(0, STAT(SURVIVAL_ROUNDTIMER) - time);
-		timeleft = ceil(timeleft);
-		float minutesLeft = floor(timeleft / 60);
-		time_text = seconds_tostring(timeleft);
-		if(intermission_time || minutesLeft >= 5 || warmup_stage || STAT(SURVIVAL_ROUNDTIMER) == 0)
-			timer_color = '1 1 1'; //white
-		else if(minutesLeft >= 1)
-			timer_color = '1 1 0'; //yellow
-		else
-			timer_color = '1 0 0'; //red
-	}
-
-	//drawpic_aspect_skin(pos, player_icon, vec2(0.5 * mySize.x, mySize.y), '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
-	if(!time_text)
-		drawstring_aspect(pos, player_text, vec2(mySize.x, mySize.y), player_color, panel_fg_alpha, DRAWFLAG_NORMAL);
-	else
-	{
-		drawstring_aspect(pos, player_text, vec2(0.5 * mySize.x, mySize.y), player_color, panel_fg_alpha, DRAWFLAG_NORMAL);
-		drawstring_aspect(pos + eX * (0.5 * mySize.x), time_text, vec2(0.5 * mySize.x, mySize.y), timer_color, panel_fg_alpha, DRAWFLAG_NORMAL);
-	}
+	drawstring_aspect(pos, player_text, vec2(mySize.x, mySize.y), player_color, panel_fg_alpha, DRAWFLAG_NORMAL);
 }
 
 REGISTER_MUTATOR(cl_sv, true);