diff options
| -rw-r--r-- | DTCallback.c | 1 | ||||
| -rw-r--r-- | DTUtility.c | 14 |
2 files changed, 8 insertions, 7 deletions
diff --git a/DTCallback.c b/DTCallback.c index 58f6403..5ec876d 100644 --- a/DTCallback.c +++ b/DTCallback.c @@ -172,6 +172,7 @@ global func BindArgs(array binding, array args, bool safe, array& refs) var ret = CreateArray(GetLength(binding)), pos = 0; for(var bind in binding) { + bind ??= 0; // necessary for non-#strict 3 compatibility if(GetType(bind) == C4V_Int || GetType(bind) == C4V_Any && bind >= 0) { ret[pos] = args[bind]; diff --git a/DTUtility.c b/DTUtility.c index 752000b..4ebad0f 100644 --- a/DTUtility.c +++ b/DTUtility.c @@ -315,9 +315,9 @@ global func GetIDByName(string name, int category) // WARNING: desyncs between c var i, id;
while(id = GetDefinition(i++, category))
{
- if(GetName(0, id) == name) return id;
+ if(GetName(nil, id) == name) return id;
}
- return 0;
+ return nil;
}
global func GetIDsByName(string name, int category) // WARNING: desyncs between clients with different languages
@@ -325,7 +325,7 @@ global func GetIDsByName(string name, int category) // WARNING: desyncs between var i, id, ret = [];
while(id = GetDefinition(i++, category))
{
- if(GetName(0, id) == name)
+ if(GetName(nil, id) == name)
{
ret[] = id;
}
@@ -598,9 +598,9 @@ global func GetSolidMask(object obj) obj = obj || this;
return
[
- GetObjectVal("SolidMask", 0, obj, 0), GetObjectVal("SolidMask", 0, obj, 1),
- GetObjectVal("SolidMask", 0, obj, 2), GetObjectVal("SolidMask", 0, obj, 3),
- GetObjectVal("SolidMask", 0, obj, 4), GetObjectVal("SolidMask", 0, obj, 5)
+ GetObjectVal("SolidMask", nil, obj, 0), GetObjectVal("SolidMask", nil, obj, 1),
+ GetObjectVal("SolidMask", nil, obj, 2), GetObjectVal("SolidMask", nil, obj, 3),
+ GetObjectVal("SolidMask", nil, obj, 4), GetObjectVal("SolidMask", nil, obj, 5)
];
}
@@ -885,4 +885,4 @@ global func InitMap(array init) ret[init[i]] = init[i + 1];
}
return ret;
-}
\ No newline at end of file +}
|