From 813189df5306eba08834471c030bc49240e97989 Mon Sep 17 00:00:00 2001 From: Samual Date: Tue, 27 Mar 2012 21:03:03 -0400 Subject: [PATCH] Make the flag respawn when it touches lava/slime --- qcsrc/server/mutators/gamemode_ctf.qc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/qcsrc/server/mutators/gamemode_ctf.qc b/qcsrc/server/mutators/gamemode_ctf.qc index 3cfff880f..df151f64b 100644 --- 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 -- 2.39.2