From afa291036ce4a333a2af1067f655bdb6ac78bf94 Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Wed, 12 Jan 2011 21:44:04 +0100 Subject: [PATCH] simplify some freezetag code --- qcsrc/server/cl_client.qc | 2 +- qcsrc/server/cl_physics.qc | 2 +- qcsrc/server/g_hook.qc | 2 +- qcsrc/server/w_electro.qc | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc index 836f2069a..348779dba 100644 --- a/qcsrc/server/cl_client.qc +++ b/qcsrc/server/cl_client.qc @@ -1368,7 +1368,7 @@ void ClientKill (void) { // do nothing } - else if(g_freezetag && self.freezetag_frozen == 1) + else if(self.freezetag_frozen) { // do nothing } diff --git a/qcsrc/server/cl_physics.qc b/qcsrc/server/cl_physics.qc index 7a93468d9..a2773fedf 100644 --- a/qcsrc/server/cl_physics.qc +++ b/qcsrc/server/cl_physics.qc @@ -23,7 +23,7 @@ When you press the jump key */ void PlayerJump (void) { - if(g_freezetag && self.freezetag_frozen) + if(self.freezetag_frozen) return; // no jumping in freezetag when frozen float mjumpheight; diff --git a/qcsrc/server/g_hook.qc b/qcsrc/server/g_hook.qc index bb3a85464..dd6d73eff 100644 --- a/qcsrc/server/g_hook.qc +++ b/qcsrc/server/g_hook.qc @@ -332,7 +332,7 @@ void FireGrapplingHook (void) if((arena_roundbased && time < warmup) || (time < game_starttime)) return; - if(g_freezetag && self.freezetag_frozen) + if(self.freezetag_frozen) return; makevectors(self.v_angle); diff --git a/qcsrc/server/w_electro.qc b/qcsrc/server/w_electro.qc index 13301a0f7..e46f749c7 100644 --- a/qcsrc/server/w_electro.qc +++ b/qcsrc/server/w_electro.qc @@ -232,7 +232,7 @@ void lgbeam_think() remove(self); return; } - if (self.owner.weaponentity.state != WS_INUSE || (self.owner.ammo_cells <= 0 && !(self.owner.items & IT_UNLIMITED_WEAPON_AMMO)) || self.owner.deadflag != DEAD_NO || !self.owner.BUTTON_ATCK || (g_freezetag && self.owner.freezetag_frozen)) + if (self.owner.weaponentity.state != WS_INUSE || (self.owner.ammo_cells <= 0 && !(self.owner.items & IT_UNLIMITED_WEAPON_AMMO)) || self.owner.deadflag != DEAD_NO || !self.owner.BUTTON_ATCK || self.owner.freezetag_frozen) { if(self == self.owner.lgbeam) self.owner.lgbeam = world; -- 2.39.2