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_things.cpp
View file

@ -567,9 +567,9 @@ int P_Thing_CheckInputNum(player_t *p, int inputnum)
}
return renum;
}
int P_Thing_CheckProximity(AActor *self, PClass *classname, double distance, int count, int flags, int ptr, bool counting)
int P_Thing_CheckProximity(FLevelLocals *Level, AActor *self, PClass *classname, double distance, int count, int flags, int ptr, bool counting)
{
AActor *ref = COPY_AAPTR(self, ptr);
AActor *ref = COPY_AAPTREX(Level, self, ptr);
// We need these to check out.
if (!ref || !classname || distance <= 0)