Improvements to copying between static and dynamic sized queues

NarcoMarshDev · NarcoMarshDev · commit e036645cfec6 · 2022-10-05T10:50:31.000+01:00
diff --git a/scripts/Game/Global/ESE_DynamicQueue.c b/scripts/Game/Global/ESE_DynamicQueue.c
@@ -113,6 +113,11 @@ class ESE_DynamicQueue<Class T>
 		Raw.Compact();
 	}
 	// ----------------------------------------------------------------------------------------------------------- //
+	void Compact()
+	{
+		Raw.Compact();
+	}
+	// ----------------------------------------------------------------------------------------------------------- //
 	typename GetDataType()
 	{
 		return T;
diff --git a/scripts/Game/Global/ESE_Queue.c b/scripts/Game/Global/ESE_Queue.c
@@ -152,10 +152,10 @@ class ESE_Queue<Class T>
 		newArray.Copy(Raw);
 	}
 	// ----------------------------------------------------------------------------------------------------------- //
-	void CopyToQueue(notnull inout ESE_Queue<T> newQueue)
+	void CopyToDynamicQueue(notnull inout ESE_DynamicQueue<T> newQueue)
 	{
 		newQueue.Raw.Copy(this.Raw);
-		newQueue.Resize(MaxSize);
+		newQueue.Compact();
 	}
 	// ----------------------------------------------------------------------------------------------------------- //
 	void CopyFromArray(notnull array<T> oldArray)

Original file line number	Diff line number	Diff line change
`@@ -113,6 +113,11 @@ class ESE_DynamicQueue<Class T>`
`113`	`113`	`Raw.Compact();`
`114`	`114`	`}`
`115`	`115`	`// ----------------------------------------------------------------------------------------------------------- //`
	`116`	`+ void Compact()`
	`117`	`+ {`
	`118`	`+ Raw.Compact();`
	`119`	`+ }`
	`120`	`+ // ----------------------------------------------------------------------------------------------------------- //`
`116`	`121`	`typename GetDataType()`
`117`	`122`	`{`
`118`	`123`	`return T;`
Original file line number	Diff line number	Diff line change
`@@ -152,10 +152,10 @@ class ESE_Queue<Class T>`
`152`	`152`	`newArray.Copy(Raw);`
`153`	`153`	`}`
`154`	`154`	`// ----------------------------------------------------------------------------------------------------------- //`
`155`		`- void CopyToQueue(notnull inout ESE_Queue<T> newQueue)`
	`155`	`+ void CopyToDynamicQueue(notnull inout ESE_DynamicQueue<T> newQueue)`
`156`	`156`	`{`
`157`	`157`	`newQueue.Raw.Copy(this.Raw);`
`158`		`- newQueue.Resize(MaxSize);`
	`158`	`+ newQueue.Compact();`
`159`	`159`	`}`
`160`	`160`	`// ----------------------------------------------------------------------------------------------------------- //`
`161`	`161`	`void CopyFromArray(notnull array<T> oldArray)`