Merge branch 'uniquetid_overflow_fix' of https://github.com/edward-san/zdoom

This commit is contained in:
Christoph Oelckers 2014-01-16 11:38:53 +01:00
commit af3e619232
2 changed files with 11 additions and 7 deletions

View file

@ -4934,7 +4934,7 @@ int DLevelScript::CallFunction(int argCount, int funcIndex, SDWORD *args, const
break;
case ACSF_UniqueTID:
return P_FindUniqueTID(argCount > 0 ? args[0] : 0, argCount > 1 ? args[1] : 0);
return P_FindUniqueTID(argCount > 0 ? args[0] : 0, (argCount > 1 && args[1] >= 0) ? args[1] : 0);
case ACSF_IsTIDUsed:
return P_IsTIDUsed(args[0]);