r1925 - branches/nexuiz-2.0/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2006-11-12 06:00:17 -0500 (Sun, 12 Nov 2006)
New Revision: 1925

Modified:
   branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc
   branches/nexuiz-2.0/data/qcsrc/server/constants.qh
Log:
no more fbskins for teamplay


Modified: branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc	2006-11-12 10:59:48 UTC (rev 1924)
+++ branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc	2006-11-12 11:00:17 UTC (rev 1925)
@@ -464,8 +464,10 @@
 		} else {
 			self.playermodel = CheckPlayerModel(self.playermodel);
 			setmodel_lod (self, self.playermodel);
-			self.skin = stof(self.playerskin);
-
+			if(teams_matter)
+				self.skin = math_mod(stof(self.playerskin), NUM_PLAYERSKINS_TEAMPLAY);
+			else
+				self.skin = stof(self.playerskin);
 		}
 
 		self.crouch = FALSE;
@@ -1424,8 +1426,16 @@
 				setsize (self, m1, m2);
 			}
 
-			if (self.skin != stof(self.playerskin))
-				self.skin = stof(self.playerskin);
+			if(teams_matter)
+			{
+				if (self.skin != math_mod(stof(self.playerskin), NUM_PLAYERSKINS_TEAMPLAY))
+					self.skin = math_mod(stof(self.playerskin), NUM_PLAYERSKINS_TEAMPLAY);
+			}
+			else
+			{
+				if (self.skin != stof(self.playerskin))
+					self.skin = stof(self.playerskin);
+			}
 		}
 		// Savage: Check for nameless players
 		if (strlen(self.netname) < 1) {

Modified: branches/nexuiz-2.0/data/qcsrc/server/constants.qh
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/constants.qh	2006-11-12 10:59:48 UTC (rev 1924)
+++ branches/nexuiz-2.0/data/qcsrc/server/constants.qh	2006-11-12 11:00:17 UTC (rev 1925)
@@ -223,3 +223,5 @@
 float COLOR_TEAM2	= 14; // blue
 float COLOR_TEAM3	= 10; // pink
 float COLOR_TEAM4	= 13; // yellow
+
+float NUM_PLAYERSKINS_TEAMPLAY = 3;