From: Debugger <pyngot@hotmail.com>
Date: Thu, 13 Jun 2013 16:34:40 +0000 (+0200)
Subject: removed matchend sound (wrong commit in here)
X-Git-Tag: xonotic-v0.8.0~347^2~3
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=aaee1bb25fc551aec9e8065a37121165d35e8435;p=xonotic%2Fxonotic-data.pk3dir.git

removed matchend sound (wrong commit in here)
---

diff --git a/qcsrc/client/announcer.qc b/qcsrc/client/announcer.qc
index 7ef93b40f..240d424c6 100644
--- a/qcsrc/client/announcer.qc
+++ b/qcsrc/client/announcer.qc
@@ -5,7 +5,6 @@ string previous_announcement;
 // remaining maptime announcer sounds, true when sound was already played
 float announcer_1min;
 float announcer_5min;
-float announcer_matchend;
 
 void Announcer_Play(string announcement)
 {
@@ -32,7 +31,7 @@ void Announcer_Countdown()
 			Local_Notification(MSG_CENTER, CENTER_COUNTDOWN_BEGIN); 
 
 		Announcer_Play("begin");
-		announcer_5min = announcer_1min = announcer_matchend = FALSE; // reset maptime announcers now as well
+		announcer_5min = announcer_1min = FALSE; // reset maptime announcers now as well
 		remove(self);
 		return;
 	}
@@ -133,25 +132,6 @@ void Announcer_Time()
 			}
 		}
 	}
-	
-	// Check for matchend = 0 seconds remaining
-	if(autocvar_cl_announcer_matchend == 1)
-	{
-		if (announcer_matchend)
-		{
-			if((!warmup_stage || autocvar_g_warmup_limit == 0) && timeleft == 0)
-					announcer_matchend = TRUE;
-		}
-		else if((!warmup_stage || autocvar_g_warmup_limit == 0) && timelimit > 0 && timeleft == 0)
-		{
-			// if we're in warmup mode, dont play a sound
-			if not(autocvar_g_warmup_limit == -1 && warmup_stage) 
-			{
-				announcer_matchend = TRUE;
-				Announcer_Play("matchend");
-			}
-		}
-	}
 }
 
 void Announcer()
@@ -162,7 +142,6 @@ void Announcer()
 
 void Announcer_Precache () 
 {
-	precache_sound (strcat("announcer/", autocvar_cl_announcer, "/matchend.wav"));
 	precache_sound (strcat("announcer/", autocvar_cl_announcer, "/1minuteremains.wav"));
 	precache_sound (strcat("announcer/", autocvar_cl_announcer, "/5minutesremain.wav"));
 
diff --git a/sound/announcer/default/matchend.wav b/sound/announcer/default/matchend.wav
deleted file mode 100644
index d4fbe5aa1..000000000
Binary files a/sound/announcer/default/matchend.wav and /dev/null differ