r4605 - trunk/data/qcsrc/common

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-10-03 09:29:12 -0400 (Fri, 03 Oct 2008)
New Revision: 4605

Modified:
   trunk/data/qcsrc/common/mapinfo.qc
   trunk/data/qcsrc/common/util.qc
Log:
warning fix; fix loading ons-reborn.mapinfo


Modified: trunk/data/qcsrc/common/mapinfo.qc
===================================================================
--- trunk/data/qcsrc/common/mapinfo.qc	2008-10-03 13:28:23 UTC (rev 4604)
+++ trunk/data/qcsrc/common/mapinfo.qc	2008-10-03 13:29:12 UTC (rev 4605)
@@ -629,7 +629,7 @@
 			else
 			{
 				t = car(s); s = cdr(s); f = stof(t);
-				if(s == "")
+				if(s != "")
 					print("Map ", pFilename, " contains an incorrect size line, syntax: size mins_x mins_y mins_z maxs_x maxs_y maxs_z\n");
 				else
 				{

Modified: trunk/data/qcsrc/common/util.qc
===================================================================
--- trunk/data/qcsrc/common/util.qc	2008-10-03 13:28:23 UTC (rev 4604)
+++ trunk/data/qcsrc/common/util.qc	2008-10-03 13:29:12 UTC (rev 4605)
@@ -440,18 +440,18 @@
 	return strcat(ftos(minutes), ":", substring(s, 1, 2), ".", substring(s, 3, 1));
 }
 
-string ScoreString(float vflags, float value)
+string ScoreString(float pFlags, float pValue)
 {
 	string valstr;
 	float l;
 
-	value = floor(value + 0.5); // round
+	pValue = floor(pValue + 0.5); // round
 
-	if((value == 0) && (vflags & (SFL_HIDE_ZERO | SFL_RANK | SFL_TIME)))
+	if((pValue == 0) && (pFlags & (SFL_HIDE_ZERO | SFL_RANK | SFL_TIME)))
 		valstr = "";
-	else if(vflags & SFL_RANK)
+	else if(pFlags & SFL_RANK)
 	{
-		valstr = ftos(value);
+		valstr = ftos(pValue);
 		l = strlen(valstr);
 		if((l >= 2) && (substring(valstr, l - 2, 1) == "1"))
 			valstr = strcat(valstr, "th");
@@ -464,10 +464,10 @@
 		else
 			valstr = strcat(valstr, "th");
 	}
-	else if(vflags & SFL_TIME)
-		valstr = mmsss(value);
+	else if(pFlags & SFL_TIME)
+		valstr = mmsss(pValue);
 	else
-		valstr = ftos(value);
+		valstr = ftos(pValue);
 	
 	return valstr;
 }