From e6cca647da0482090d2259a57bd7f8b8a87c1041 Mon Sep 17 00:00:00 2001
From: Markus Mittendrein <git@maxmitti.tk>
Date: Mon, 29 Jul 2019 21:08:36 +0200
Subject: Replace ArrayAppend(arr, value) with arr[] = value

---
 DTArrays.c            |  3 ++-
 DTColorStack.c        |  4 ++--
 DTFilterObjects.c     |  6 +++---
 DTMenuCompatibility.c | 18 +++++++++---------
 DTPhysicalStack.c     |  6 +++---
 5 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/DTArrays.c b/DTArrays.c
index 0b78ef4..82fe51d 100644
--- a/DTArrays.c
+++ b/DTArrays.c
@@ -36,9 +36,10 @@ global func ArrayInsert(array& arr, int index, value)
 	arr[index] = value;
 }
 
+// only here for backwards compatibility; use arr[] = value directly
 global func ArrayAppend(array& arr, value)
 {
-	arr[GetLength(arr)] = value;
+	arr[] = value;
 }
 
 global func ArrayAppendArray(array& arr, array append)
diff --git a/DTColorStack.c b/DTColorStack.c
index 9f9535f..608f090 100644
--- a/DTColorStack.c
+++ b/DTColorStack.c
@@ -12,7 +12,7 @@ global func AddClrModulation(int color, int baseColor, int factor, int precision
 	target = target || this || FatalError("AddClrModulation: no target object given");
 	factor = factor || 1;
 	precision = precision || 1;
-	
+
 	return EffectCall(target, GetClrModulationStack(target), "AddModulation", color, baseColor, factor, precision);
 }
 
@@ -33,7 +33,7 @@ global func FxClrModulationStackStart(object target, int effectNumber, int temp)
 
 global func FxClrModulationStackAddModulation(object target, int effectNumber, int color, int baseColor, int factor, int precision)
 {
-	ArrayAppend(EffectVar(1, target, effectNumber), [++EffectVar(0, target, effectNumber), color, baseColor, factor, precision]);
+	EffectVar(1, target, effectNumber)[] = [++EffectVar(0, target, effectNumber), color, baseColor, factor, precision];
 	EffectCall(target, effectNumber, "ApplyModulation");
 	return EffectVar(0, target, effectNumber);
 }
diff --git a/DTFilterObjects.c b/DTFilterObjects.c
index 77db745..e1ac9fa 100644
--- a/DTFilterObjects.c
+++ b/DTFilterObjects.c
@@ -274,11 +274,11 @@ global func FilterObjects(array objects, array filtersSortings, int limit)
 
 		if(Inside(filterSorting[0], C4SO_First, C4SO_Last))
 		{
-			ArrayAppend(sortings, filterSorting);
+			sortings[] = filterSorting;
 		}
 		else
 		{
-			ArrayAppend(filters, filterSorting);
+			filters[] = filterSorting;
 		}
 	}
 
@@ -298,7 +298,7 @@ global func FilterObjects(array objects, array filtersSortings, int limit)
 
 		if(CheckObject(filters, obj))
 		{
-			ArrayAppend(ret, obj);
+			ret[] = obj;
 
 			if(realLimit && realLimit <= GetLength(ret))
 			{
diff --git a/DTMenuCompatibility.c b/DTMenuCompatibility.c
index d4e9506..d4d5466 100644
--- a/DTMenuCompatibility.c
+++ b/DTMenuCompatibility.c
@@ -26,36 +26,36 @@ global func Menu_Entry(caption, callback, symbol, count, infoCaption, args, extr
 		var settings = [];
 		if(caption)
 		{
-			ArrayAppend(settings, Menu_Entry_Caption(caption));
+			settings[] = Menu_Entry_Caption(caption);
 		}
 		if(callback)
 		{
-			ArrayAppend(settings, Menu_Entry_Callbacks([callback]));
-			ArrayAppend(settings, Menu_Entry_Args(args));
+			settings[] = Menu_Entry_Callbacks([callback]);
+			settings[] = Menu_Entry_Args(args);
 		}
 		if(symbol)
 		{
-			ArrayAppend(settings, Menu_Entry_Symbol(symbol));
+			settings[] = Menu_Entry_Symbol(symbol);
 		}
 		if(count)
 		{
-			ArrayAppend(settings, Menu_Entry_Count(count));
+			settings[] = Menu_Entry_Count(count);
 		}
 		if(infoCaption && infoCaption != "")
 		{
-			ArrayAppend(settings, Menu_Entry_InfoCaption(infoCaption));
+			settings[] = Menu_Entry_InfoCaption(infoCaption);
 		}
 		if(extra)
 		{
-			ArrayAppend(settings, Menu_Entry_Extra(extra));
+			settings[] = Menu_Entry_Extra(extra);
 		}
 		if(XPar1)
 		{
-			ArrayAppend(settings, XPar1);
+			settings[] = XPar1;
 		}
 		if(XPar2)
 		{
-			ArrayAppend(settings, XPar2);
+			settings[] = XPar2;
 		}
 		return inherited(settings);
 	}
diff --git a/DTPhysicalStack.c b/DTPhysicalStack.c
index c0aa7ad..327dfd0 100644
--- a/DTPhysicalStack.c
+++ b/DTPhysicalStack.c
@@ -10,14 +10,14 @@ global func AddPhysicalFactor(string physical, int factor, int precision, object
 {
 	target = target || this || FatalError("AddPhysicalFactor: no target object given");
 	precision = precision || 100;
-	
+
 	return EffectCall(target, GetPhysicalFactorStack(target), "AddFactor", physical, factor, precision);
 }
 
 global func RemovePhysicalFactor(int id, object target)
 {
 	target = target || this || FatalError("AddPhysicalFactor: no target object given");
-	
+
 	return EffectCall(target, GetPhysicalFactorStack(target), "RemoveFactor", id);
 }
 
@@ -31,7 +31,7 @@ global func FxPhysicalFactorStackStart(object target, int effectNumber, int temp
 
 global func FxPhysicalFactorStackAddFactor(object target, int effectNumber, string physical, int factor, int precision)
 {
-	ArrayAppend(EffectVar(1, target, effectNumber), [++EffectVar(0, target, effectNumber), physical, factor, precision]);
+	EffectVar(1, target, effectNumber)[] = [++EffectVar(0, target, effectNumber), physical, factor, precision];
 	EffectCall(target, effectNumber, "ApplyPhysical", physical);
 	return EffectVar(0, target, effectNumber);
 }
-- 
cgit v1.2.3-54-g00ecf