From ea7605ef3c32b7b1d76ee3d7c3207a26f72a1146 Mon Sep 17 00:00:00 2001 From: div0 Date: Sat, 3 Oct 2009 11:14:27 +0000 Subject: [PATCH] some spawnshieldtime fixes git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8016 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/server/cl_player.qc | 2 +- data/qcsrc/server/g_damage.qc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/data/qcsrc/server/cl_player.qc b/data/qcsrc/server/cl_player.qc index f1ccfefc1..5870832e8 100644 --- a/data/qcsrc/server/cl_player.qc +++ b/data/qcsrc/server/cl_player.qc @@ -506,7 +506,7 @@ void PlayerDamage (entity inflictor, entity attacker, float damage, float deatht if (take > 100) Violence_GibSplash_At(hitloc, force * -0.2, 3, 1, self, attacker); - if (time > self.spawnshieldtime) + if (time >= self.spawnshieldtime) { if (!(self.flags & FL_GODMODE)) { diff --git a/data/qcsrc/server/g_damage.qc b/data/qcsrc/server/g_damage.qc index cb721358f..942d51da2 100644 --- a/data/qcsrc/server/g_damage.qc +++ b/data/qcsrc/server/g_damage.qc @@ -885,7 +885,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float // apply push if (self.damageforcescale) if (vlen(force)) - if (self.damage != "player" || time > self.spawnshieldtime) + if (self.damage != "player" || time >= self.spawnshieldtime || g_midair) { self.velocity = self.velocity + self.damageforcescale * force; self.flags &~= FL_ONGROUND; @@ -902,7 +902,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float // Savage: vampire mode if (g_vampire) if (!g_minstagib) - if (time > self.spawnshieldtime) + if (time >= self.spawnshieldtime) { attacker.health += damage; } -- 2.39.2