OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- fixed: ACS calls need to explicitly pass the level into COPY_AAPTR.

Browse source 
Unlike from an action function, this can be called with a null actor, which for the player constants still needs to return something valid.
This commit is contained in:
Christoph Oelckers 2019-02-07 15:41:35 +01:00
commit bcc1aa95b2
6 changed files with 19 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/p_actionfunctions.cpp
View file

@ -485,7 +485,7 @@ DEFINE_ACTION_FUNCTION(AActor, CountProximity)
}
else
{
ret->SetInt(P_Thing_CheckProximity(self, classname, distance, 0, flags, ptr, true));
ret->SetInt(P_Thing_CheckProximity(self->Level, self, classname, distance, 0, flags, ptr, true));
}
return 1;
}
@ -4520,7 +4520,7 @@ DEFINE_ACTION_FUNCTION(AActor, CheckProximity)
PARAM_INT(flags);
PARAM_INT(ptr);
ACTION_RETURN_BOOL(!!P_Thing_CheckProximity(self, classname, distance, count, flags, ptr));
ACTION_RETURN_BOOL(!!P_Thing_CheckProximity(self->Level, self, classname, distance, count, flags, ptr));
}
/*===========================================================================