Use operators .. and ..= instead of Format where appropriate

5 files changed, 30 insertions, 30 deletions

diff --git a/DTCallback.c b/DTCallback.c
index cd0b0fe..2c2e057 100644
--- a/DTCallback.c
+++ b/DTCallback.c
@@ -95,15 +95,15 @@ global func CallA(callback, args, bool safe, array refs)
 		{
 			if(pos > 0)
 			{
-				argsStr = Format("%s, ", argsStr);
+				argsStr ..= ", ";
 			}
 			if(refs[pos])
 			{
-				argsStr = Format("%sScopedVar(%s)", argsStr, Serialize(arg));
+				argsStr ..= Format("ScopedVar(%s)", Serialize(arg));
 			}
 			else
 			{
-				argsStr = Format("%s%s", argsStr, Serialize(arg));
+				argsStr ..= Serialize(arg);
 			}
 			++pos;
 		}
diff --git a/DTFilterObjects.c b/DTFilterObjects.c
index e1ac9fa..3752ac6 100644
--- a/DTFilterObjects.c
+++ b/DTFilterObjects.c
@@ -216,7 +216,7 @@ global func CompareObjects(object a, object b, array sorting)
 	}
 	else if(sorting[0] == C4SO_Random)
 	{
-		return Random65536 - Random(65536);
+		return Random(65536) - Random(65536);
 	}
 	else if(sorting[0] == C4SO_Speed)
 	{
diff --git a/DTFormatN.c b/DTFormatN.c
index 0f9481b..37f604e 100644
--- a/DTFormatN.c
+++ b/DTFormatN.c
@@ -31,7 +31,7 @@ global func FormatN(string format, array placeholders, array items)
 			{

 				if(c == 37 && GetLength(placeholderType) == 0) // %

 				{

-					ret = Format("%s%%", ret);

+					ret ..= "%";

 					inPlaceholder = 0;

 				}

 				else

diff --git a/DTTemplateFunctions.c b/DTTemplateFunctions.c
index 860c9e1..6d8cd7e 100644
--- a/DTTemplateFunctions.c
+++ b/DTTemplateFunctions.c
@@ -83,7 +83,7 @@ global func Function(arguments, commands)
 				{

 					if(argument == "")

 					{

-						contentPart = Format("%s%%", contentPart);

+						contentPart ..= "%";

 					}

 					else

 					{

@@ -125,7 +125,7 @@ global func Function(arguments, commands)
 				}

 				else if(c == 39) // '

 				{

-					contentPart = Format("%s\"", contentPart);

+					contentPart ..= "\"";

 				}

 				else

 				{

@@ -172,9 +172,9 @@ global func f(array function, array args)
 				{

 					part = EscapeString(part);

 				}

-				command = Format("%s%s", command, part);

+				command ..= part;

 			}

-			else command = Format("%s%s", command, contentPart);

+			else command ..= contentPart;

 		}

 		ret = eval(command);

 	}

@@ -201,9 +201,9 @@ global func DebugFunc(array function, array args)
 				{

 					part = EscapeString(part);

 				}

-				command = Format("%s%s", command, part);

+				command ..= part;

 			}

-			else command = Format("%s%s", command, contentPart);

+			else command ..= contentPart;

 		}

 		Log(command);

 	}

diff --git a/DTUtility.c b/DTUtility.c
index d491567..2c1e952 100644
--- a/DTUtility.c
+++ b/DTUtility.c
@@ -31,11 +31,11 @@ global func Serialize(value)
 			}

 			else

 			{

-				ret = Format("%s,", ret);

+				ret ..= ",";

 			}

-			ret = Format("%s%s", ret, Serialize(val));

+			ret ..= Serialize(val);

 		}

-		return Format("%s]", ret);

+		return ret .. "]";

 	}

 	else if(GetType(value) == C4V_Bool) if(value) return "true"; else return "false";

 	else if(GetType(value) == C4V_C4ID) return Format("%i", value);

@@ -52,11 +52,11 @@ global func EscapeString(string value)
 		var c = GetChar(value, i);

 		if(c == 34) // "

 		{

-			ret = Format("%s\\\"", ret);

+			ret ..= "\\\"";

 		}

 		else if(c == 92) // \

 		{

-			ret = Format("%s\\\\", ret);

+			ret ..= "\\\\";

 		}

 		else

 		{

@@ -73,7 +73,7 @@ global func CreateEnum(string prefix, array enum)
 

 	for(var i = 0; i < GetLength(enum); ++i)

 	{

-		log = Format("%s%cstatic const %s%s = %d;", log, 10, prefix, enum[i], i);

+		log ..= Format("%cstatic const %s%s = %d;", 10, prefix, enum[i], i);

 

 		if(switch == "")

 		{

@@ -81,7 +81,7 @@ global func CreateEnum(string prefix, array enum)
 		}

 		else

 		{

-			switch = Format("%selse if(switchval == %s%s)%c{%c%c}%c", switch, prefix, enum[i], 10, 10, 10, 10);

+			switch ..= Format("else if(switchval == %s%s)%c{%c%c}%c", prefix, enum[i], 10, 10, 10, 10);

 		}

 	}

 

@@ -100,7 +100,7 @@ global func CreateBitField(string prefix, array flags)
 

 	for(var i = 0, j = 1; i < GetLength(flags); ++i)

 	{

-		log = Format("%s%cstatic const %s%s = %d;", log, 10, prefix, flags[i], j);

+		log ..= Format("%cstatic const %s%s = %d;", 10, prefix, flags[i], j);

 		j = j << 1;

 	}

 

@@ -148,7 +148,7 @@ global func StringConcatenate(array strings)
 

 	for(var i = 1; i < GetLength(strings); ++i)

 	{

-		ret = Format("%s%s", ret, strings[i]);

+		ret ..= strings[i];

 	}

 

 	return ret;

@@ -318,7 +318,7 @@ global func SetPlrExtraDataString(int plr, string name, string data)
 

 		if((i % 4) == 0 && i != 0)

 		{

-			SetPlrExtraData(plr, Format("%s%d", name, i/4 - 1), part);

+			SetPlrExtraData(plr, name .. i/4 - 1, part);

 			part = 0;

 		}

 

@@ -327,13 +327,13 @@ global func SetPlrExtraDataString(int plr, string name, string data)
 

 	if(part != 0)

 	{

-		SetPlrExtraData(plr, Format("%s%d", name, i/4), part);

+		SetPlrExtraData(plr, name .. i/4, part);

 	}

 

 	i = i/4 + 1;

-	while(GetPlrExtraData(plr, Format("%s%d", name, i)))

+	while(GetPlrExtraData(plr, name .. i))

 	{

-		SetPlrExtraData(plr, Format("%s%d", name, i++), 0);

+		SetPlrExtraData(plr, name .. i++, 0);

 	}

 }

 

@@ -343,7 +343,7 @@ global func GetPlrExtraDataString(int plr, string name)
 	var part = true;

 	for(var i = 0; part != 0; ++i)

 	{

-		part = CastInt(GetPlrExtraData(plr, Format("%s%d", name, i)));

+		part = CastInt(GetPlrExtraData(plr, name .. i));

 		for(var j = 0; j < 4; ++j)

 		{

 			var c = (part >> (j * 8)) & 0xFF;

@@ -377,7 +377,7 @@ global func GetPlrExtraDataArray(int plr, string name)
 

 global func SetPlrExtraDataIntArray(int plr, string name, array arr)

 {

-	var lengthName = Format("%sL", name);

+	var lengthName = name .. "L";

 

 	var oldLength = CastInt(GetPlrExtraData(plr, lengthName));

 

@@ -385,7 +385,7 @@ global func SetPlrExtraDataIntArray(int plr, string name, array arr)
 

 	for(var i = 0; i < length; ++i)

 	{

-		var partName = Format("%s%d", name, i);

+		var partName = name .. i;

 		if(arr[i] != 0)

 		{

 			SetPlrExtraData(plr, partName, arr[i]);

@@ -400,7 +400,7 @@ global func SetPlrExtraDataIntArray(int plr, string name, array arr)
 

 	for(var i = length; i < oldLength; ++i)

 	{

-		var partName = Format("%s%d", name, i);

+		var partName = name .. i;

 		if(GetPlrExtraData(plr, partName) != 0)

 		{

 			SetPlrExtraData(plr, partName, 0);

@@ -410,13 +410,13 @@ global func SetPlrExtraDataIntArray(int plr, string name, array arr)
 

 global func GetPlrExtraDataIntArray(int plr, string name)

 {

-	var length = CastInt(GetPlrExtraData(plr, Format("%sL", name)));

+	var length = CastInt(GetPlrExtraData(plr, name .. "L"));

 

 	var ret = CreateArray(length);

 

 	for(var i = 0; i < length; ++i)

 	{

-		ret[i] = CastInt(GetPlrExtraData(plr, Format("%s%d", name, i)));

+		ret[i] = CastInt(GetPlrExtraData(plr, name .. i));

 	}

 

 	return ret;