diff options
| author | Jan <> | 2016-03-08 02:28:12 +0100 |
|---|---|---|
| committer | Jan <> | 2016-03-08 02:28:12 +0100 |
| commit | fefd1166909b8498db8f3e5f38f39ffcf280c4c9 (patch) | |
| tree | 84d85e16da39be4366c733cfac5097d870793ffb /TemplePushing.c4s/System.c4g | |
| parent | 5d9c5b3fae92e67d2723e768412b69c8a0c08dfb (diff) | |
| download | tempelschubsen-fefd1166909b8498db8f3e5f38f39ffcf280c4c9.tar.gz tempelschubsen-fefd1166909b8498db8f3e5f38f39ffcf280c4c9.zip | |
Reformat FindObjectsLayer.c
Diffstat (limited to 'TemplePushing.c4s/System.c4g')
| -rw-r--r-- | TemplePushing.c4s/System.c4g/FindObjectsLayer.c | 18 |
1 files changed, 8 insertions, 10 deletions
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;
}
}
|