From a471eb8c007cafaab4bc78abff5e85a0c51bc2dd Mon Sep 17 00:00:00 2001 From: div0 Date: Sat, 13 Jan 2007 21:30:58 +0000 Subject: [PATCH] damn fteqcc git-svn-id: svn://svn.icculus.org/nexuiz/trunk@2103 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/server/cl_client.qc | 2 +- data/qcsrc/server/cl_player.qc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data/qcsrc/server/cl_client.qc b/data/qcsrc/server/cl_client.qc index 0572a7958..4b43377d4 100644 --- a/data/qcsrc/server/cl_client.qc +++ b/data/qcsrc/server/cl_client.qc @@ -1376,7 +1376,7 @@ void PlayerPreThink (void) { float button_pressed, force_respawn; player_anim(); - button_pressed = self.button0 || self.button2 || self.button3 || self.button4 || self.button5 || self.button6 || self.button7 || self.button8 || self.buttonuse; + button_pressed = (self.button0 || self.button2 || self.button3 || self.button4 || self.button5 || self.button6 || self.button7 || self.button8 || self.buttonuse); force_respawn = cvar("g_lms") || cvar("g_forced_respawn"); if (self.deadflag == DEAD_DYING) { diff --git a/data/qcsrc/server/cl_player.qc b/data/qcsrc/server/cl_player.qc index 15c1c8490..98d8ba7a0 100644 --- a/data/qcsrc/server/cl_player.qc +++ b/data/qcsrc/server/cl_player.qc @@ -322,7 +322,7 @@ void PlayerDamage (entity inflictor, entity attacker, float damage, float deatht self.death_time = ceil((time + sdelay) / waves) * waves; else self.death_time = time + sdelay; - if((sdelay + waves > 5.0) && (self.death_time - time > 1.75)) + if((sdelay + waves >= 5.0) && (self.death_time - time > 1.75)) self.respawn_countdown = 10; // first number to count down from is 10 else self.respawn_countdown = -1; // do not count down -- 2.39.2