From 959e4dfe15ec49a19c1173cb8e086c09225d8bcb Mon Sep 17 00:00:00 2001 From: Mario Date: Wed, 17 Dec 2014 09:42:13 +1100 Subject: [PATCH] Make it work --- qcsrc/server/mutators/mutator_overkill.qc | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/qcsrc/server/mutators/mutator_overkill.qc b/qcsrc/server/mutators/mutator_overkill.qc index ced2e7106..8beb5cb15 100644 --- a/qcsrc/server/mutators/mutator_overkill.qc +++ b/qcsrc/server/mutators/mutator_overkill.qc @@ -91,8 +91,6 @@ MUTATOR_HOOKFUNCTION(ok_PlayerDies) other = world; } - self.ok_lastwep = self.weapon; - self.ok_deathloc = self.origin; self = spawn(); self.ok_item = TRUE; self.noalign = TRUE; @@ -107,6 +105,8 @@ MUTATOR_HOOKFUNCTION(ok_PlayerDies) SUB_SetFade(self, time + 5, 1); self = oldself; + self.ok_lastwep = self.switchweapon; + return FALSE; } @@ -142,6 +142,12 @@ MUTATOR_HOOKFUNCTION(ok_PlayerPreThink) if(self.deadflag != DEAD_NO || !IS_PLAYER(self) || self.frozen) return FALSE; + if(self.ok_lastwep) + { + self.switchweapon = self.ok_lastwep; + self.ok_lastwep = 0; + } + ok_IncreaseCharge(self, self.weapon); if(self.BUTTON_ATCK2) @@ -206,9 +212,6 @@ MUTATOR_HOOKFUNCTION(ok_PlayerSpawn) self.ok_pauseregen_finished = time + 2; - self.switchweapon = self.ok_lastwep; - self.ok_lastwep = 0; - return FALSE; } -- 2.39.2