mirror of
https://github.com/ZDoom/gzdoom-gles.git
synced 2024-11-10 23:01:59 +00:00
- fixed: ACS must use COPY_AAPTREX for all pointer transfers.
It was already correct for most, but two cases have slipped through.
This commit is contained in:
parent
6129f9a9cc
commit
0676a98efc
1 changed files with 2 additions and 2 deletions
|
@ -5363,7 +5363,7 @@ int DLevelScript::CallFunction(int argCount, int funcIndex, int32_t *args)
|
|||
case ACSF_SetActivator:
|
||||
if (argCount > 1 && args[1] != AAPTR_DEFAULT) // condition (x != AAPTR_DEFAULT) is essentially condition (x).
|
||||
{
|
||||
activator = COPY_AAPTR(Level->SingleActorFromTID(args[0], activator), args[1]);
|
||||
activator = COPY_AAPTREX(Level, Level->SingleActorFromTID(args[0], activator), args[1]);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
@ -6378,7 +6378,7 @@ doplaysound: if (funcIndex == ACSF_PlayActorSound)
|
|||
const int flags = args[5];
|
||||
|
||||
AActor* const reference = ((flags & WARPF_USEPTR) && (AAPTR_DEFAULT != dest))
|
||||
? COPY_AAPTR(activator, dest)
|
||||
? COPY_AAPTREX(Level, activator, dest)
|
||||
: Level->SingleActorFromTID(dest, activator);
|
||||
|
||||
if (nullptr == reference)
|
||||
|
|
Loading…
Reference in a new issue