Begin implementing new touch effect

diff --git a/qcsrc/server/mutators/gamemode_ctf.qc b/qcsrc/server/mutators/gamemode_ctf.qc
index 3e3032eb7f94e2dc7929d3b1f7f14e0a01e425a1..74cc22fe2417d5cef2055807e8e6a7e9a50e801b 100644 (file)
--- 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 7ba0e50646006297cf551fb675b7ce2ba8b871d8..aca06e615d7f76d60f82ffd4f6c5a515506c7597 100644 (file)
--- 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;