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

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-04-21 11:58:18 -0400 (Tue, 21 Apr 2009)
New Revision: 6547

Modified:
   trunk/data/qcsrc/server/cl_client.qc
   trunk/data/qcsrc/server/cl_physics.qc
Log:
Try fixing bug on http://alientrap.org/forum/viewtopic.php?p=58125#58125 by no longer relying on the FL_NOTARGET flag.

Also, makes possible to fix the cheat "notarget" in the future by making bots and turrets actually honor that field.


Modified: trunk/data/qcsrc/server/cl_client.qc
===================================================================
--- trunk/data/qcsrc/server/cl_client.qc	2009-04-21 15:35:15 UTC (rev 6546)
+++ trunk/data/qcsrc/server/cl_client.qc	2009-04-21 15:58:18 UTC (rev 6547)
@@ -385,7 +385,7 @@
 	float distance;
 	float f;
 
-	if(self.flags & FL_NOTARGET) // we don't need LOD for spectators
+	if(self.classname != "player")
 		return TRUE;
 
 	if(other.cvar_cl_playerdetailreduction <= 0)
@@ -1922,7 +1922,7 @@
 	if (self == self.enemy)
 		return 0;
 	
-	if(self.enemy.flags & FL_NOTARGET)
+	if(self.enemy.classname != "player")
 		return 0;
 
 	SpectateCopy(self.enemy);
@@ -1987,7 +1987,7 @@
 			if(cvar("g_campaign"))
 				campaign_bots_may_start = 1;
 			PutClientInServer();
-			if(!(self.flags & FL_NOTARGET))
+			if(self.classname == "player")
 				bprint ("^4", self.netname, "^4 is playing now\n");
 			if(!cvar("g_campaign"))
 				centerprint(self,""); // clear MOTD

Modified: trunk/data/qcsrc/server/cl_physics.qc
===================================================================
--- trunk/data/qcsrc/server/cl_physics.qc	2009-04-21 15:35:15 UTC (rev 6546)
+++ trunk/data/qcsrc/server/cl_physics.qc	2009-04-21 15:58:18 UTC (rev 6547)
@@ -440,14 +440,14 @@
 		swampspd_mod = self.swamp_slowdown; //cvar("g_balance_swamp_moverate");
 	}
 
-	if(self.flags & FL_NOTARGET)
+	if(self.classname != "player")
 	{
 		maxspd_mod = cvar("sv_spectator_speed_multiplier");
 		if(!self.spectatorspeed)
 			self.spectatorspeed = maxspd_mod;
 		if(self.impulse && self.impulse <= 19)
 		{
-			if(self.lastflags & FL_NOTARGET)
+			// if(self.lastflags & FL_NOTARGET)
 			{
 				if(self.impulse == 10 || self.impulse == 15 || self.impulse == 18)
 					self.spectatorspeed = bound(1, self.spectatorspeed + 0.5, 5);