Merge branch 'master' into divVerent/csqcmodel

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / announcer.qc

diff --git a/qcsrc/client/announcer.qc b/qcsrc/client/announcer.qc
index 83ceaff74fc7430ac7a3ab2226812b8352c429a2..c1f023d6b4a239fefb2d13e85f63753f5b26344d 100644 (file)
--- a/qcsrc/client/announcer.qc
+++ b/qcsrc/client/announcer.qc
@@ -12,7 +12,9 @@ void Announcer_Play(string announcement)
        {
                sound(world, CH_INFO, strcat("announcer/", autocvar_cl_announcer, "/", announcement, ".wav"), VOL_BASEVOICE, ATTN_NONE);
 
-               previous_announcement = announcement;
+               if(previous_announcement) { strunzone(previous_announcement); }
+               
+               previous_announcement = strzone(announcement);
                previous_announcement_time = time;
        }
 }
@@ -73,9 +75,8 @@ void Announcer_Gamestart()
        previous_game_starttime = startTime;
 }
 
-/**
- * Plays the 1minute or 5 minutes (of maptime) remaining sound, if client wants it
- */
+
+// Plays the 1 minute or 5 minutes (of maptime) remaining sound, if client wants it
 void Announcer_Time() 
 {
        float timelimit = getstatf(STAT_TIMELIMIT);
@@ -133,9 +134,6 @@ void Announcer_Time()
        }
 }
 
-/**
- * Announce carried items (e.g. flags in CTF).
- */
 float redflag_prev;
 float blueflag_prev;
 void carrierAnnouncer() {
@@ -184,10 +182,6 @@ void Announcer()
        carrierAnnouncer();
 }
 
-/**
- * Add all future announcer sounds precaches here.
- * TODO: announcer queues
- */
 void Announcer_Precache () 
 {
        precache_sound (strcat("announcer/", autocvar_cl_announcer, "/1minuteremains.wav"));
@@ -234,4 +228,4 @@ void Announcer_Precache ()
        precache_sound (strcat("announcer/", autocvar_cl_announcer, "/voteaccept.wav"));
        precache_sound (strcat("announcer/", autocvar_cl_announcer, "/votecall.wav"));
        precache_sound (strcat("announcer/", autocvar_cl_announcer, "/votefail.wav"));
-}
\ No newline at end of file
+}