[nexuiz-commits] r7618 - in trunk/data/qcsrc: client server

[DONOTREPLY at icculus.org]

Author: blub0
Date: 2009-09-03 16:39:09 -0400 (Thu, 03 Sep 2009)
New Revision: 7618

Modified:
   trunk/data/qcsrc/client/Main.qc
   trunk/data/qcsrc/server/g_triggers.qc
   trunk/data/qcsrc/server/scores.qc
Log:
making it compile again - div0: please check the pow() change in g_trigger.qc

Modified: trunk/data/qcsrc/client/Main.qc
===================================================================
--- trunk/data/qcsrc/client/Main.qc	2009-09-03 20:33:44 UTC (rev 7617)
+++ trunk/data/qcsrc/client/Main.qc	2009-09-03 20:39:09 UTC (rev 7618)
@@ -649,7 +649,7 @@
 	self.team = ReadByte();
 	o = self.owner = GetTeam(self.team, true); // these team numbers can always be trusted
 
-	float sf;
+	float sf, lf;
 #if MAX_TEAMSCORE <= 8
 	sf = ReadByte();
 	lf = ReadByte();

Modified: trunk/data/qcsrc/server/g_triggers.qc
===================================================================
--- trunk/data/qcsrc/server/g_triggers.qc	2009-09-03 20:33:44 UTC (rev 7617)
+++ trunk/data/qcsrc/server/g_triggers.qc	2009-09-03 20:39:09 UTC (rev 7618)
@@ -1174,7 +1174,7 @@
     if(!pushdeltatime) return;
 
     // div0: ticrate independent, 1 = identity (not 20)
-    other.velocity = other.velocity * pow(self.strength, * pushdeltatime);
+    other.velocity = other.velocity * pow(self.strength, pushdeltatime);
 }
 
 // Spherical (gravity/repulsor) mode

Modified: trunk/data/qcsrc/server/scores.qc
===================================================================
--- trunk/data/qcsrc/server/scores.qc	2009-09-03 20:33:44 UTC (rev 7617)
+++ trunk/data/qcsrc/server/scores.qc	2009-09-03 20:39:09 UTC (rev 7618)
@@ -49,7 +49,7 @@
 
 float TeamScore_SendEntity(entity to, float sendflags)
 {
-	float i, longflags;
+	float i, p, longflags;
 
 	WriteByte(MSG_ENTITY, ENT_CLIENT_TEAMSCORES);
 	WriteByte(MSG_ENTITY, self.team - 1);
@@ -66,7 +66,6 @@
 	WriteShort(MSG_ENTITY, sendflags);
 	WriteShort(MSG_ENTITY, longflags);
 #endif
-	float p;
 	for(i = 0, p = 1; i < MAX_TEAMSCORE; ++i, p *= 2)
 		if(sendflags & p)
 		{
@@ -210,7 +209,7 @@
 
 float PlayerScore_SendEntity(entity to, float sendflags)
 {
-	float i;
+	float i, p, longflags;
 
 	WriteByte(MSG_ENTITY, ENT_CLIENT_SCORES);
 	WriteByte(MSG_ENTITY, num_for_edict(self.owner));
@@ -227,7 +226,6 @@
 	WriteShort(MSG_ENTITY, sendflags);
 	WriteShort(MSG_ENTITY, longflags);
 #endif
-	float p;
 	for(i = 0, p = 1; i < MAX_SCORE; ++i, p *= 2)
 		if(sendflags & p)
 		{