r5725 - in trunk/data/qcsrc: client server

DONOTREPLY at icculus.org DONOTREPLY at icculus.org
Tue Feb 3 08:09:16 EST 2009


Author: div0
Date: 2009-02-03 08:09:16 -0500 (Tue, 03 Feb 2009)
New Revision: 5725

Modified:
   trunk/data/qcsrc/client/Main.qc
   trunk/data/qcsrc/client/miscfunctions.qc
   trunk/data/qcsrc/client/prandom.qc
   trunk/data/qcsrc/client/prandom.qh
   trunk/data/qcsrc/server/g_world.qc
   trunk/data/qcsrc/server/miscfunctions.qc
Log:
fix some typos


Modified: trunk/data/qcsrc/client/Main.qc
===================================================================
--- trunk/data/qcsrc/client/Main.qc	2009-02-03 12:58:02 UTC (rev 5724)
+++ trunk/data/qcsrc/client/Main.qc	2009-02-03 13:09:16 UTC (rev 5725)
@@ -636,6 +636,7 @@
 		case ENT_CLIENT_ENTCS: Ent_ReadEntCS(); break;
 		case ENT_CLIENT_SCORES: Ent_ReadPlayerScore(); break;
 		case ENT_CLIENT_TEAMSCORES: Ent_ReadTeamScore(); break;
+		case ENT_CLIENT_POINTPARTICLES: Ent_PointParticles(); break;
 		case ENT_CLIENT_RAINSNOW: Ent_RainOrSnow(); break;
 		case ENT_CLIENT_LASER: Ent_Laser(); break;
 		case ENT_CLIENT_NAGGER: Ent_Nagger(); break;
@@ -662,8 +663,6 @@
 // with others, make sure it can no longer do so.
 void Ent_Remove()
 {
-	float i;
-
 	if(self.entremove)
 		self.entremove();
 

Modified: trunk/data/qcsrc/client/miscfunctions.qc
===================================================================
--- trunk/data/qcsrc/client/miscfunctions.qc	2009-02-03 12:58:02 UTC (rev 5724)
+++ trunk/data/qcsrc/client/miscfunctions.qc	2009-02-03 13:09:16 UTC (rev 5725)
@@ -386,10 +386,10 @@
 	return s2;
 }
 
-float cvar_or(string cvar, float v)
+float cvar_or(string cv, float v)
 {
 	string s;
-	s = cvar_string(cvar);
+	s = cvar_string(cv);
 	if(s == "")
 		return v;
 	else

Modified: trunk/data/qcsrc/client/prandom.qc
===================================================================
--- trunk/data/qcsrc/client/prandom.qc	2009-02-03 12:58:02 UTC (rev 5724)
+++ trunk/data/qcsrc/client/prandom.qc	2009-02-03 13:09:16 UTC (rev 5725)
@@ -1,5 +1,6 @@
 // prandom - PREDICTABLE random number generator (not seeded yet)
 
+#ifdef USE_PRANDOM
 float prandom_seed;
 float prandom()
 {
@@ -28,3 +29,4 @@
 {
 	prandom_seed = seed;
 }
+#endif

Modified: trunk/data/qcsrc/client/prandom.qh
===================================================================
--- trunk/data/qcsrc/client/prandom.qh	2009-02-03 12:58:02 UTC (rev 5724)
+++ trunk/data/qcsrc/client/prandom.qh	2009-02-03 13:09:16 UTC (rev 5725)
@@ -1,5 +1,12 @@
 // prandom - PREDICTABLE random number generator
+
+#ifdef USE_PRANDOM
 float prandom();
 vector prandomvec();
 
 void psrandom(float seed);
+#else
+#define prandom random
+#define prandomvec randomvec
+#define psrandom(x)
+#endif

Modified: trunk/data/qcsrc/server/g_world.qc
===================================================================
--- trunk/data/qcsrc/server/g_world.qc	2009-02-03 12:58:02 UTC (rev 5724)
+++ trunk/data/qcsrc/server/g_world.qc	2009-02-03 13:09:16 UTC (rev 5725)
@@ -303,6 +303,7 @@
 {
 	WriteByte(MSG_ENTITY, ENT_CLIENT_RANDOMSEED);
 	WriteShort(MSG_ENTITY, self.cnt);
+	return TRUE;
 }
 void RandomSeed_Think()
 {

Modified: trunk/data/qcsrc/server/miscfunctions.qc
===================================================================
--- trunk/data/qcsrc/server/miscfunctions.qc	2009-02-03 12:58:02 UTC (rev 5724)
+++ trunk/data/qcsrc/server/miscfunctions.qc	2009-02-03 13:09:16 UTC (rev 5725)
@@ -1642,8 +1642,8 @@
 
 	if(e.model == "" || self.modelindex == 0)
 	{
-		mi = self.mins;
-		ma = self.maxs;
+		mi = e.mins;
+		ma = e.maxs;
 		setmodel(e, "null");
 		setsize(e, mi, ma);
 	}




More information about the nexuiz-commits mailing list