From: terencehill Date: Fri, 14 Dec 2012 18:45:55 +0000 (+0100) Subject: Properly turn round_handler off and forbid reviving players if game is over X-Git-Tag: xonotic-v0.7.0~61^2~86 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6e885a9ab9ab19bd761cde1bf8c6a5040acab3c0;p=xonotic%2Fxonotic-data.pk3dir.git Properly turn round_handler off and forbid reviving players if game is over --- diff --git a/qcsrc/server/mutators/gamemode_freezetag.qc b/qcsrc/server/mutators/gamemode_freezetag.qc index 64156043d..b543fba6a 100644 --- a/qcsrc/server/mutators/gamemode_freezetag.qc +++ b/qcsrc/server/mutators/gamemode_freezetag.qc @@ -408,6 +408,9 @@ MUTATOR_HOOKFUNCTION(freezetag_PlayerPreThink) float n; vector revive_extra_size; + if(gameover) + return 1; + if(self.freezetag_frozen) { // keep health = 1 diff --git a/qcsrc/server/round_handler.qc b/qcsrc/server/round_handler.qc index 882538d1e..5f61dc01f 100644 --- a/qcsrc/server/round_handler.qc +++ b/qcsrc/server/round_handler.qc @@ -123,5 +123,6 @@ void round_handler_Stop() void round_handler_Remove() { remove(round_handler); + round_handler = world; }