r3054 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2007-12-27 09:35:11 -0500 (Thu, 27 Dec 2007)
New Revision: 3054

Modified:
   trunk/data/qcsrc/server/cl_client.qc
Log:
minor fix (allow skin 6 in team games, for CTF fbskins)


Modified: trunk/data/qcsrc/server/cl_client.qc
===================================================================
--- trunk/data/qcsrc/server/cl_client.qc	2007-12-25 08:53:25 UTC (rev 3053)
+++ trunk/data/qcsrc/server/cl_client.qc	2007-12-27 14:35:11 UTC (rev 3054)
@@ -393,6 +393,14 @@
 		self.frags = -666;
 }
 
+float RestrictSkin(float s)
+{
+	if(!teams_matter)
+		return s;
+	if(s == 6)
+		return 6;
+	return math_mod(s, 3);
+}
 
 /*
 =============
@@ -499,19 +507,8 @@
 		} else {
 			self.playermodel = CheckPlayerModel(self.playermodel);
 			setmodel_lod (self, self.playermodel);
-			if(teams_matter)
-			{
-				float s;
-				s = stof(self.playerskin);
-				if(s >= 0 && s < 3)
-					self.skin = s;
-				else if(s == 6)
-					self.skin = 6;
-				else
-					self.skin = 0;
-			}
-			else
-				self.skin = stof(self.playerskin);
+			self.skin = RestrictSkin(stof(self.playerskin));
+			self.playerskin = ftos(self.skin);
 		}
 		if(!teams_matter)
 			if(strlen(cvar_string("sv_defaultplayercolors")))
@@ -1424,16 +1421,11 @@
 				setsize (self, m1, m2);
 			}
 
-			if(teams_matter)
+			if(self.skin != stof(self.playerskin))
 			{
-				if (self.skin != math_mod(stof(self.playerskin), NUM_PLAYERSKINS_TEAMPLAY))
-					self.skin = math_mod(stof(self.playerskin), NUM_PLAYERSKINS_TEAMPLAY);
+				self.skin = RestrictSkin(stof(self.playerskin));
+				self.playerskin = ftos(self.skin);
 			}
-			else
-			{
-				if (self.skin != stof(self.playerskin))
-					self.skin = stof(self.playerskin);
-			}
 		}
 		if(!teams_matter)
 			if(strlen(cvar_string("sv_defaultplayercolors")))