diff options
| -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;
}
}
|