r4664 - in branches/nexuiz-2.0: . data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-10-08 07:27:59 -0400 (Wed, 08 Oct 2008)
New Revision: 4664

Modified:
   branches/nexuiz-2.0/.patchsets
   branches/nexuiz-2.0/data/qcsrc/server/clientcommands.qc
   branches/nexuiz-2.0/data/qcsrc/server/t_items.qc
Log:
r4662 | div0 | 2008-10-08 12:24:32 +0200 (Wed, 08 Oct 2008) | 2 lines
fix default weapon color (0xAA is no longer neutral)
r4663 | div0 | 2008-10-08 13:26:32 +0200 (Wed, 08 Oct 2008) | 2 lines
reset the ready count too on ready-restart (not just the flags)

Modified: branches/nexuiz-2.0/.patchsets
===================================================================
--- branches/nexuiz-2.0/.patchsets	2008-10-08 11:26:32 UTC (rev 4663)
+++ branches/nexuiz-2.0/.patchsets	2008-10-08 11:27:59 UTC (rev 4664)
@@ -1,2 +1,2 @@
 master = svn://svn.icculus.org/nexuiz/trunk
-revisions_applied = 1-4660
+revisions_applied = 1-4663

Modified: branches/nexuiz-2.0/data/qcsrc/server/clientcommands.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/clientcommands.qc	2008-10-08 11:26:32 UTC (rev 4663)
+++ branches/nexuiz-2.0/data/qcsrc/server/clientcommands.qc	2008-10-08 11:27:59 UTC (rev 4664)
@@ -462,6 +462,8 @@
 	//reset the .ready status of all players (also spectators)
 	FOR_EACH_CLIENTSLOT(e)
 		e.ready = 0;
+	readycount = 0;
+	Nagger_ReadyCounted();
 	FOR_EACH_REALCLIENT(e)
 	{
 		msg_entity = e;

Modified: branches/nexuiz-2.0/data/qcsrc/server/t_items.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/t_items.qc	2008-10-08 11:26:32 UTC (rev 4663)
+++ branches/nexuiz-2.0/data/qcsrc/server/t_items.qc	2008-10-08 11:27:59 UTC (rev 4664)
@@ -495,10 +495,12 @@
 		setsize (self, '-16 -16 0', '16 16 48');
 	else
 		setsize (self, '-16 -16 0', '16 16 32');
+
+	if (self.classname != "droppedweapon") // if dropped, colormap is already set up nicely
 	if (itemflags & FL_WEAPON)
 	{
 		// neutral team color for pickup weapons
-		self.colormap = 160 * 1024 + 160;
+		self.colormap = 1024; // color shirt=0 pants=0 grey
 	}
 
 	if (cvar("g_fullbrightitems"))