Make the flag respawn when it touches lava/slime

diff --git a/qcsrc/server/mutators/gamemode_ctf.qc b/qcsrc/server/mutators/gamemode_ctf.qc
index 3cfff880fc94a59bb21cbd7808ebf3f3ee183f38..df151f64b0da02ad3dd62e5c96f681c8335a9374 100644 (file)
--- a/qcsrc/server/mutators/gamemode_ctf.qc
+++ b/qcsrc/server/mutators/gamemode_ctf.qc
@@ -436,8 +436,8 @@ void ctf_FlagTouch()
 {
        if(gameover) { return; }
        if(!self) { return; }
-       if(trace_dphitq3surfaceflags & Q3SURFACEFLAG_NOIMPACT)
-       { // The flag fell off the map, respawn it since players can't get to it
+       if((trace_dphitq3surfaceflags & Q3SURFACEFLAG_NOIMPACT) || (trace_dphitcontents & (DPCONTENTS_SLIME | DPCONTENTS_LAVA)))
+       { // The flag fell off the map or into lava/slime, respawn it since players can't get to it
                ctf_RespawnFlag(self);
                return;
        }
@@ -508,6 +508,7 @@ void ctf_Reset()
                        ctf_Handle_Drop(self.owner);
                        
        ctf_RespawnFlag(self);
+       print("ctf reset\n");
 }
 
 void ctf_SetupFlag(float teamnumber, entity flag) // called when spawning a flag entity on the map as a spawnfunc