From: Samual Lenks <samual@xonotic.org>
Date: Fri, 31 Aug 2012 18:16:26 +0000 (-0400)
Subject: Begin implementing new touch effect
X-Git-Tag: xonotic-v0.7.0~240^2~68
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f41c063b4ecf76fdaf63629c48a32741a333df11;p=xonotic%2Fxonotic-data.pk3dir.git

Begin implementing new touch effect
---

diff --git a/qcsrc/server/mutators/gamemode_ctf.qc b/qcsrc/server/mutators/gamemode_ctf.qc
index 3e3032eb7..74cc22fe2 100644
--- a/qcsrc/server/mutators/gamemode_ctf.qc
+++ b/qcsrc/server/mutators/gamemode_ctf.qc
@@ -650,7 +650,7 @@ void ctf_FlagThink()
 		
 		case FLAG_DROPPED:
 		{
-			if(autocvar_g_ctf_flag_dropped_floatinwater)// && (self.flags & FL_INWATER))
+			if(autocvar_g_ctf_flag_dropped_floatinwater)
 			{
 				vector midpoint = ((self.absmin + self.absmax) * 0.5);
 				if(pointcontents(midpoint) == CONTENT_WATER)
@@ -948,6 +948,7 @@ void ctf_FlagSetup(float teamnumber, entity flag) // called when spawning a flag
 	if(!flag.model) { flag.model = ((teamnumber) ? autocvar_g_ctf_flag_red_model : autocvar_g_ctf_flag_blue_model); }
 	if(!flag.scale) { flag.scale = FLAG_SCALE; }
 	if(!flag.skin) { flag.skin = ((teamnumber) ? autocvar_g_ctf_flag_red_skin : autocvar_g_ctf_flag_blue_skin); }
+	if(!flag.toucheffect) { flag.toucheffect = ((teamnumber) ? "redflag_touch" : "blueflag_touch"); }
 	
 	// sound 
 	if(!flag.snd_flag_taken) { flag.snd_flag_taken  = ((teamnumber) ? "ctf/red_taken.wav" : "ctf/blue_taken.wav"); }
diff --git a/qcsrc/server/mutators/gamemode_ctf.qh b/qcsrc/server/mutators/gamemode_ctf.qh
index 7ba0e5064..aca06e615 100644
--- a/qcsrc/server/mutators/gamemode_ctf.qh
+++ b/qcsrc/server/mutators/gamemode_ctf.qh
@@ -44,6 +44,9 @@ void spawnfunc_ctf_team();
 .string snd_flag_dropped;
 .string snd_flag_touch;
 
+// effects
+.string toucheffect;
+
 // list of flags on the map
 entity ctf_worldflaglist;
 .entity ctf_worldflagnext;