From fefd1166909b8498db8f3e5f38f39ffcf280c4c9 Mon Sep 17 00:00:00 2001
From: Jan <>
Date: Tue, 8 Mar 2016 02:28:12 +0100
Subject: Reformat FindObjectsLayer.c

---
 TemplePushing.c4s/System.c4g/FindObjectsLayer.c | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

(limited to 'TemplePushing.c4s')

diff --git a/TemplePushing.c4s/System.c4g/FindObjectsLayer.c b/TemplePushing.c4s/System.c4g/FindObjectsLayer.c
index 178a7b7..e81fe29 100644
--- a/TemplePushing.c4s/System.c4g/FindObjectsLayer.c
+++ b/TemplePushing.c4s/System.c4g/FindObjectsLayer.c
@@ -2,32 +2,30 @@
 
 global func FindObjects()
 {
-	return _inherited(Find_And(Find_Layer(GetObjectLayer(this)), ...));
+	return _inherited(Find_And(Find_Layer(GetObjectLayer()), ...));
 }
 
 global func FindObject2()
 {
-	return _inherited(Find_And(Find_Layer(GetObjectLayer(this)), ...));
+	return _inherited(Find_And(Find_Layer(GetObjectLayer()), ...));
 }
 
 global func FindObject(a, b, c, d, e, f, g, h, i, object findNext)
 {
-	var ret = findNext, layer = GetObjectLayer(this);
-	for(;;)
+	var ret = findNext, layer = GetObjectLayer();
+	for (;;)
 	{
 		ret = _inherited(a, b, c, d, e, f, g, h, i, ret);
-		if (GetObjectLayer(ret) == layer) return ret;
-		if (ret == 0) return 0;
+		if (!ret || ret->GetObjectLayer() == layer) return ret;
 	}
 }
 
 global func FindObjectOwner(a, b, c, d, e, f, g, h, i, object findNext)
 {
-	var ret = findNext, layer = GetObjectLayer(this);
-	for(;;)
+	var ret = findNext, layer = GetObjectLayer();
+	for (;;)
 	{
 		ret = _inherited(a, b, c, d, e, f, g, h, i, ret);
-		if (GetObjectLayer(ret) == layer) return ret;
-		if (ret == 0) return 0;
+		if (!ret || ret->GetObjectLayer() == layer) return ret;
 	}
 }
-- 
cgit v1.2.3-54-g00ecf