From: MirceaKitsune Date: Mon, 2 May 2011 20:09:40 +0000 (+0300) Subject: Move the falldamage offset in the right spot X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=fdf4e3da6e6b644d79700ba9dc4019d9a8b9e011;p=voretournament%2Fvoretournament.git Move the falldamage offset in the right spot --- diff --git a/data/qcsrc/server/sv_main.qc b/data/qcsrc/server/sv_main.qc index 4fadff76..bfdbd9c2 100644 --- a/data/qcsrc/server/sv_main.qc +++ b/data/qcsrc/server/sv_main.qc @@ -70,12 +70,12 @@ void CreatureFrame (void) if(!(g_cts && !cvar("g_cts_selfdamage"))) { dm = vlen(self.oldvelocity) - vlen(self.velocity); // dm is now the velocity DECREASE. Velocity INCREASE should never cause a sound or any damage. - if(self.scale) // we are smaller or larger, so we take more or less falling damage - dm *= (1 + cvar("g_healthsize_movementfactor")) - cvar("g_healthsize_movementfactor") * self.scale; if (self.deadflag) dm = (dm - cvar("g_balance_falldamage_deadminspeed")) * cvar("g_balance_falldamage_factor"); else dm = min((dm - cvar("g_balance_falldamage_minspeed")) * cvar("g_balance_falldamage_factor"), cvar("g_balance_falldamage_maxdamage")); + if(self.scale) // we are smaller or larger, so we take more or less falling damage + dm *= (1 + cvar("g_healthsize_movementfactor")) - cvar("g_healthsize_movementfactor") * self.scale; if (dm > 0) Damage (self, world, world, dm, DEATH_FALL, self.origin, '0 0 0'); else if(vlen(self.velocity) > 100000 && cvar("developer"))