From e3ec9492f440ea357b5e63668d6b5158ae8a642d Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Thu, 12 Jan 2012 18:23:39 +0100 Subject: [PATCH] if throwing away superweapon, it's over --- qcsrc/server/cl_client.qc | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc index 40b82224b..ebf4abc4b 100644 --- a/qcsrc/server/cl_client.qc +++ b/qcsrc/server/cl_client.qc @@ -1895,17 +1895,26 @@ void player_powerups (void) } if (self.items & IT_SUPERWEAPON) { - play_countdown(self.superweapons_finished, "misc/poweroff.wav"); self.effects = self.effects | EF_RED; - if (self.items & IT_UNLIMITED_SUPERWEAPONS) + if (!(self.weapons & WEPBIT_SUPERWEAPONS)) + { + self.superweapons_finished = 0; + self.items = self.items - (self.items & IT_SUPERWEAPON); + sprint(self, "^3Superweapons have been lost\n"); + } + else if (self.items & IT_UNLIMITED_SUPERWEAPONS) { // don't let them run out } - else if (time > self.superweapons_finished) + else { - self.items = self.items - (self.items & IT_SUPERWEAPON); - self.weapons &~= WEPBIT_SUPERWEAPONS; - sprint(self, "^3Superweapons have broken down\n"); + play_countdown(self.superweapons_finished, "misc/poweroff.wav"); + if (time > self.superweapons_finished) + { + self.items = self.items - (self.items & IT_SUPERWEAPON); + self.weapons &~= WEPBIT_SUPERWEAPONS; + sprint(self, "^3Superweapons have broken down\n"); + } } } else -- 2.39.2