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

8
src/g_shared/actorptrselect.cpp
View file

@ -62,13 +62,12 @@
Only one selector of each type can be used.
*/
AActor *COPY_AAPTR(AActor *origin, int selector)
AActor *COPY_AAPTREX(FLevelLocals *Level, AActor *origin, int selector)
{
if (selector == AAPTR_DEFAULT) return origin;
FTranslatedLineTarget t;
auto Level = origin->Level;
auto AAPTR_RESOLVE_PLAYERNUM = [=](int playernum) -> AActor*
{
return (Level->PlayerInGame(playernum) ? Level->Players[playernum]->mo : nullptr);
@ -119,6 +118,11 @@ AActor *COPY_AAPTR(AActor *origin, int selector)
return origin;
}
AActor *COPY_AAPTR(AActor *origin, int selector)
{
if (origin == nullptr) return nullptr;
return COPY_AAPTREX(origin->Level, origin, selector);
}
// [FDARI] Exported logic for guarding against loops in Target (for missiles) and Master (for all) chains.
// It is called from multiple locations.