From: Debugger <pyngot@hotmail.com>
Date: Sat, 23 Mar 2013 12:10:03 +0000 (+0100)
Subject: added a sound when the match ends
X-Git-Tag: xonotic-v0.8.0~347^2~12
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=31c6e3f115904862cf14a78af4701392e9230907;p=xonotic%2Fxonotic-data.pk3dir.git

added a sound when the match ends
---

diff --git a/qcsrc/client/announcer.qc b/qcsrc/client/announcer.qc
index 240d424c6..7ef93b40f 100644
--- a/qcsrc/client/announcer.qc
+++ b/qcsrc/client/announcer.qc
@@ -5,6 +5,7 @@ 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)
 {
@@ -31,7 +32,7 @@ void Announcer_Countdown()
 			Local_Notification(MSG_CENTER, CENTER_COUNTDOWN_BEGIN); 
 
 		Announcer_Play("begin");
-		announcer_5min = announcer_1min = FALSE; // reset maptime announcers now as well
+		announcer_5min = announcer_1min = announcer_matchend = FALSE; // reset maptime announcers now as well
 		remove(self);
 		return;
 	}
@@ -132,6 +133,25 @@ 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()
@@ -142,6 +162,7 @@ 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/qcsrc/client/autocvars.qh b/qcsrc/client/autocvars.qh
index 150efb170..3f29ada96 100644
--- a/qcsrc/client/autocvars.qh
+++ b/qcsrc/client/autocvars.qh
@@ -21,6 +21,7 @@ float autocvar_cl_allow_uid2name;
 string autocvar_cl_announcer;
 var float autocvar_cl_announcer_antispam = 2;
 var float autocvar_cl_announcer_maptime = 3;
+var float autocvar_cl_announcer_matchend = 1;
 float autocvar_cl_autodemo_delete;
 float autocvar_cl_autodemo_delete_keeprecords;
 float autocvar_cl_casings;
diff --git a/sound/announcer/default/matchend.wav b/sound/announcer/default/matchend.wav
new file mode 100644
index 000000000..d4fbe5aa1
Binary files /dev/null and b/sound/announcer/default/matchend.wav differ