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

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-03-18 10:13:36 -0400 (Wed, 18 Mar 2009)
New Revision: 6214

Modified:
   trunk/data/qcsrc/server/cl_player.qc
   trunk/data/qcsrc/server/csqcprojectile.qc
   trunk/data/qcsrc/server/defs.qh
   trunk/data/qcsrc/server/sv_main.qc
   trunk/data/qcsrc/server/w_common.qc
Log:
typo fix, and some StartFrame speedup


Modified: trunk/data/qcsrc/server/cl_player.qc
===================================================================
--- trunk/data/qcsrc/server/cl_player.qc	2009-03-18 14:08:12 UTC (rev 6213)
+++ trunk/data/qcsrc/server/cl_player.qc	2009-03-18 14:13:36 UTC (rev 6214)
@@ -545,7 +545,7 @@
 		return -2;
 
 	// not visible in any way? forget it
-	if(!checkpvs(p, so))
+	if(!checkpvs(so, p))
 		return -2;
 
 	traceline(so, p.origin, MOVE_NOMONSTERS, self);

Modified: trunk/data/qcsrc/server/csqcprojectile.qc
===================================================================
--- trunk/data/qcsrc/server/csqcprojectile.qc	2009-03-18 14:08:12 UTC (rev 6213)
+++ trunk/data/qcsrc/server/csqcprojectile.qc	2009-03-18 14:13:36 UTC (rev 6214)
@@ -70,11 +70,24 @@
 	}
 }
 
+.void(void) csqcprojectile_oldthink;
+.float csqcprojectile_oldnextthink;
+
+void CSQCProjectile_Update_Think()
+{
+	UpdateCSQCProjectile(self);
+	self.think = self.csqcprojectile_oldthink;
+	self.nextthink = max(time, self.csqcprojectile_oldnextthink);
+}
+
 void UpdateCSQCProjectileNextFrame(entity e)
 {
 	if(e.SendEntity == CSQCProjectile_SendEntity)
+	if(e.think != CSQCProjectile_Update_Think)
 	{
-		// send new origin data
-		e.NextFrameSendFlags |= 1;
+		e.csqcprojectile_oldthink = e.think;
+		e.csqcprojectile_oldnextthink = e.nextthink;
+		e.think = CSQCProjectile_Update_Think;
+		e.nextthink = time;
 	}
 }

Modified: trunk/data/qcsrc/server/defs.qh
===================================================================
--- trunk/data/qcsrc/server/defs.qh	2009-03-18 14:08:12 UTC (rev 6213)
+++ trunk/data/qcsrc/server/defs.qh	2009-03-18 14:13:36 UTC (rev 6214)
@@ -551,5 +551,3 @@
 .float wasplayer;
 
 float servertime, serverprevtime, serverframetime;
-
-.float NextFrameSendFlags;

Modified: trunk/data/qcsrc/server/sv_main.qc
===================================================================
--- trunk/data/qcsrc/server/sv_main.qc	2009-03-18 14:08:12 UTC (rev 6213)
+++ trunk/data/qcsrc/server/sv_main.qc	2009-03-18 14:13:36 UTC (rev 6214)
@@ -141,11 +141,6 @@
 	dprint_load(); // load dprint status from cvar
 
 	entity e;
-	for(e = world; (e = findflags(e, NextFrameSendFlags, 0xFFFFFF)); )
-	{
-		e.SendFlags |= e.NextFrameSendFlags;
-		e.NextFrameSendFlags = 0;
-	}
 	for(e = world; (e = findfloat(e, csqcprojectile_clientanimate, 1)); )
 		CSQCProjectile_Check(e);
 

Modified: trunk/data/qcsrc/server/w_common.qc
===================================================================
--- trunk/data/qcsrc/server/w_common.qc	2009-03-18 14:08:12 UTC (rev 6213)
+++ trunk/data/qcsrc/server/w_common.qc	2009-03-18 14:13:36 UTC (rev 6214)
@@ -159,7 +159,7 @@
 	self.velocity = self.W_BallisticBullet_LeaveSolid_velocity;
 
 	self.think = self.W_BallisticBullet_LeaveSolid_think_save;
-	self.nextthink = max(time, self.W_BallisticBullet_LeaveSolid_nextthink_save) + 1;
+	self.nextthink = max(time, self.W_BallisticBullet_LeaveSolid_nextthink_save);
 	self.W_BallisticBullet_LeaveSolid_think_save = SUB_Null;
 
 	self.flags &~= FL_ONGROUND;