[nexuiz-commits] r8016 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-10-03 07:14:27 -0400 (Sat, 03 Oct 2009)
New Revision: 8016

Modified:
   trunk/data/qcsrc/server/cl_player.qc
   trunk/data/qcsrc/server/g_damage.qc
Log:
some spawnshieldtime fixes


Modified: trunk/data/qcsrc/server/cl_player.qc
===================================================================
--- trunk/data/qcsrc/server/cl_player.qc	2009-10-03 11:11:01 UTC (rev 8015)
+++ trunk/data/qcsrc/server/cl_player.qc	2009-10-03 11:14:27 UTC (rev 8016)
@@ -506,7 +506,7 @@
 	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))
 		{

Modified: trunk/data/qcsrc/server/g_damage.qc
===================================================================
--- trunk/data/qcsrc/server/g_damage.qc	2009-10-03 11:11:01 UTC (rev 8015)
+++ trunk/data/qcsrc/server/g_damage.qc	2009-10-03 11:14:27 UTC (rev 8016)
@@ -885,7 +885,7 @@
 	// 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 @@
 		// Savage: vampire mode
 		if (g_vampire)
 		if (!g_minstagib)
-		if (time > self.spawnshieldtime)
+		if (time >= self.spawnshieldtime)
 		{
 			attacker.health += damage;
 		}