From: Samual Lenks <samual@xonotic.org>
Date: Fri, 31 Aug 2012 20:11:27 +0000 (-0400)
Subject: Give it a unique identifier and precache it too
X-Git-Tag: xonotic-v0.7.0~240^2~65
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=21035f157ad18793f7c001db588416f8c419b97f;p=xonotic%2Fxonotic-data.pk3dir.git

Give it a unique identifier and precache it too
---

diff --git a/qcsrc/server/mutators/gamemode_ctf.qc b/qcsrc/server/mutators/gamemode_ctf.qc
index 70dafd500..8f1952d4b 100644
--- a/qcsrc/server/mutators/gamemode_ctf.qc
+++ b/qcsrc/server/mutators/gamemode_ctf.qc
@@ -226,7 +226,7 @@ void ctf_Handle_Retrieve(entity flag, entity player)
 	flag.ctf_status = FLAG_CARRY;
 
 	// messages and sounds
-	sound(player, CH_TRIGGER, "ctf/pass.wav", VOL_BASE, ATTN_NORM);
+	sound(player, CH_TRIGGER, flag.snd_flag_pass, VOL_BASE, ATTN_NORM);
 	ctf_EventLog("recieve", flag.team, player);
 	
 	FOR_EACH_REALPLAYER(tmp_player)
@@ -957,6 +957,7 @@ void ctf_FlagSetup(float teamnumber, entity flag) // called when spawning a flag
 	if(!flag.snd_flag_respawn) { flag.snd_flag_respawn = "ctf/flag_respawn.wav"; } // if there is ever a team-based sound for this, update the code to match.
 	if(!flag.snd_flag_dropped) { flag.snd_flag_dropped = ((teamnumber) ? "ctf/red_dropped.wav" : "ctf/blue_dropped.wav"); }
 	if(!flag.snd_flag_touch) { flag.snd_flag_touch = "keepaway/touch.wav"; } // again has no team-based sound // FIXME
+	if(!flag.snd_flag_pass) { flag.snd_flag_pass = "ctf/pass.wav"; } // same story here
 	
 	// precache
 	precache_sound(flag.snd_flag_taken);
@@ -965,6 +966,7 @@ void ctf_FlagSetup(float teamnumber, entity flag) // called when spawning a flag
 	precache_sound(flag.snd_flag_respawn);
 	precache_sound(flag.snd_flag_dropped);
 	precache_sound(flag.snd_flag_touch);
+	precache_sound(flag.snd_flag_pass);
 	precache_model(flag.model);
 	precache_model("models/ctf/shield.md3");
 	precache_model("models/ctf/shockwavetransring.md3");
diff --git a/qcsrc/server/mutators/gamemode_ctf.qh b/qcsrc/server/mutators/gamemode_ctf.qh
index aca06e615..fc91e94a4 100644
--- a/qcsrc/server/mutators/gamemode_ctf.qh
+++ b/qcsrc/server/mutators/gamemode_ctf.qh
@@ -43,6 +43,7 @@ void spawnfunc_ctf_team();
 #define snd_flag_respawn noise3
 .string snd_flag_dropped;
 .string snd_flag_touch;
+.string snd_flag_pass;
 
 // effects
 .string toucheffect;