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

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-05-06 02:53:09 -0400 (Wed, 06 May 2009)
New Revision: 6678

Modified:
   trunk/data/qcsrc/server/cl_physics.qc
Log:
a little bit more cleanup; allow sv_maxairspeed > sv_maxspeed


Modified: trunk/data/qcsrc/server/cl_physics.qc
===================================================================
--- trunk/data/qcsrc/server/cl_physics.qc	2009-05-06 06:41:57 UTC (rev 6677)
+++ trunk/data/qcsrc/server/cl_physics.qc	2009-05-06 06:53:09 UTC (rev 6678)
@@ -512,8 +512,7 @@
 		maxspd_mod = self.spectatorspeed;
 	}
 
-	spd = sv_maxspeed * maxspd_mod * swampspd_mod;
-
+	spd = max(sv_maxspeed, sv_maxairspeed) * maxspd_mod * swampspd_mod;
 	if(self.speed != spd)
 	{
 		self.speed = spd;
@@ -524,6 +523,9 @@
 		stuffcmd(self, strcat("cl_upspeed ", temps, "\n"));
 	}
 
+	maxspd_mod *= swampspd_mod; // only one common speed modder please!
+	swampspd_mod = 1;
+
 	// if dead, behave differently
 	if (self.deadflag)
 		goto end;
@@ -605,8 +607,8 @@
 		// acceleration
 		wishdir = normalize(wishvel);
 		wishspeed = vlen(wishvel);
-		if (wishspeed > spd)
-			wishspeed = spd;
+		if (wishspeed > sv_maxspeed*maxspd_mod)
+			wishspeed = sv_maxspeed*maxspd_mod;
 		if (time >= self.teleport_time)
 		{
 			f = wishspeed - (self.velocity * wishdir);
@@ -627,8 +629,8 @@
 
 		wishdir = normalize(wishvel);
 		wishspeed = vlen(wishvel);
-		if (wishspeed > spd)
-			wishspeed = spd;
+		if (wishspeed > sv_maxspeed*maxspd_mod)
+			wishspeed = sv_maxspeed*maxspd_mod;
 		wishspeed = wishspeed * 0.7;
 
 		// water friction
@@ -675,8 +677,8 @@
 		// acceleration
 		wishdir = normalize(wishvel);
 		wishspeed = vlen(wishvel);
-		if (wishspeed > spd)
-			wishspeed = spd;
+		if (wishspeed > sv_maxspeed*maxspd_mod)
+			wishspeed = sv_maxspeed*maxspd_mod;
 		if (time >= self.teleport_time)
 		{
 			f = wishspeed - (self.velocity * wishdir);
@@ -822,8 +824,8 @@
 		// acceleration
 		wishdir = normalize(wishvel);
 		wishspeed = vlen(wishvel);
-		if (wishspeed > spd)
-			wishspeed = spd;
+		if (wishspeed > sv_maxspeed*maxspd_mod)
+			wishspeed = sv_maxspeed*maxspd_mod;
 		if (self.crouch)
 			wishspeed = wishspeed * 0.5;
 		if (time >= self.teleport_time)
@@ -839,10 +841,10 @@
 		if((self.items & IT_JETPACK) && self.BUTTON_HOOK && !(buttons_prev & 32))
 			sprint(self, "You don't have any fuel for the ^2Jetpack\n");
 
-		if(maxspd_mod*swampspd_mod < 1)
+		if(maxspd_mod < 1)
 		{
-			maxairspd = sv_maxairspeed*maxspd_mod*swampspd_mod;
-			airaccel = sv_airaccelerate*maxspd_mod*swampspd_mod;
+			maxairspd = sv_maxairspeed*maxspd_mod;
+			airaccel = sv_airaccelerate*maxspd_mod;
 		}
 		else
 		{