[nexuiz-commits] r8019 - in branches/nexuiz-2.0: . data/qcsrc/client data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-10-03 07:21:44 -0400 (Sat, 03 Oct 2009)
New Revision: 8019

Modified:
   branches/nexuiz-2.0/.patchsets
   branches/nexuiz-2.0/data/qcsrc/client/sbar.qc
   branches/nexuiz-2.0/data/qcsrc/server/cl_player.qc
   branches/nexuiz-2.0/data/qcsrc/server/g_damage.qc
Log:
r8015 | div0 | 2009-10-03 07:11:01 -0400 (Sat, 03 Oct 2009) | 2 lines
block force during spawnshield time
r8016 | div0 | 2009-10-03 07:14:27 -0400 (Sat, 03 Oct 2009) | 2 lines
some spawnshieldtime fixes
r8017 | div0 | 2009-10-03 07:17:14 -0400 (Sat, 03 Oct 2009) | 2 lines
make it compile :P
r8018 | div0 | 2009-10-03 07:19:58 -0400 (Sat, 03 Oct 2009) | 2 lines
do not alpha out the number of the armor display


Modified: branches/nexuiz-2.0/.patchsets
===================================================================
--- branches/nexuiz-2.0/.patchsets	2009-10-03 11:19:58 UTC (rev 8018)
+++ branches/nexuiz-2.0/.patchsets	2009-10-03 11:21:44 UTC (rev 8019)
@@ -1,2 +1,2 @@
 master = svn://svn.icculus.org/nexuiz/trunk
-revisions_applied = 1-7945,7948-7948,7951-7990,7993-8013
+revisions_applied = 1-7945,7948-7948,7951-7990,7993-8018

Modified: branches/nexuiz-2.0/data/qcsrc/client/sbar.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/client/sbar.qc	2009-10-03 11:19:58 UTC (rev 8018)
+++ branches/nexuiz-2.0/data/qcsrc/client/sbar.qc	2009-10-03 11:21:44 UTC (rev 8019)
@@ -2527,7 +2527,7 @@
 					Sbar_DrawXNum_Colored(armor_pos, x, 24, sbar_alpha_fg);
 				}
 				else {
-					drawpic(armor_pos + '78 -4.5 0', "gfx/hud/sb_armor", '32 32 0', '1 1 1', (x+10)/55 * sbar_alpha_fg, DRAWFLAG_NORMAL);
+					drawpic(armor_pos + '78 -4.5 0', "gfx/hud/sb_armor", '32 32 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
 					Sbar_DrawXNum_Colored(armor_pos, x, 24, (x+10)/55 * sbar_alpha_fg);
 				}
 			}

Modified: branches/nexuiz-2.0/data/qcsrc/server/cl_player.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/cl_player.qc	2009-10-03 11:19:58 UTC (rev 8018)
+++ branches/nexuiz-2.0/data/qcsrc/server/cl_player.qc	2009-10-03 11:21:44 UTC (rev 8019)
@@ -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: branches/nexuiz-2.0/data/qcsrc/server/g_damage.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/g_damage.qc	2009-10-03 11:19:58 UTC (rev 8018)
+++ branches/nexuiz-2.0/data/qcsrc/server/g_damage.qc	2009-10-03 11:21:44 UTC (rev 8019)
@@ -885,6 +885,7 @@
 	// apply push
 	if (self.damageforcescale)
 	if (vlen(force))
+	if (self.classname != "player" || time >= self.spawnshieldtime || g_midair)
 	{
 		self.velocity = self.velocity + self.damageforcescale * force;
 		self.flags &~= FL_ONGROUND;
@@ -901,7 +902,7 @@
 		// Savage: vampire mode
 		if (g_vampire)
 		if (!g_minstagib)
-		if (time > self.spawnshieldtime)
+		if (time >= self.spawnshieldtime)
 		{
 			attacker.health += damage;
 		}