diff --git a/zdefs.acs b/zdefs.acs index 1cb400e..5195885 100644 --- a/zdefs.acs +++ b/zdefs.acs @@ -643,6 +643,34 @@ #define SECSEQ_FULLHEIGHT 3 #define SECSEQ_INTERIOR 4 +// Actor pointer selectors + +#DEFINE AAPTR_DEFAULT 0 +#DEFINE AAPTR_NULL 0x1 +#DEFINE AAPTR_TARGET 0x2 +#DEFINE AAPTR_MASTER 0x4 +#DEFINE AAPTR_TRACER 0x8 + +#DEFINE AAPTR_PLAYER_GETTARGET 0x10 +#DEFINE AAPTR_PLAYER_GETCONVERSATION 0x20 + +#DEFINE AAPTR_PLAYER1 0x40 +#DEFINE AAPTR_PLAYER2 0x80 +#DEFINE AAPTR_PLAYER3 0x100 +#DEFINE AAPTR_PLAYER4 0x200 +#DEFINE AAPTR_PLAYER5 0x400 +#DEFINE AAPTR_PLAYER6 0x800 +#DEFINE AAPTR_PLAYER7 0x1000 +#DEFINE AAPTR_PLAYER8 0x2000 + +#DEFINE AAPTR_FRIENDPLAYER 0x4000 + +// Actor pointer operation flags + +#DEFINE PTROP_UNSAFETARGET 1 +#DEFINE PTROP_UNSAFEMASTER 2 +#DEFINE PTROP_NOSAFEGUARDS PTROP_UNSAFETARGET |PTROP_UNSAFEMASTER + // ========================================================================== // Skulltag Definitions // ========================================================================== diff --git a/zspecial.acs b/zspecial.acs index e44339a..6a26cdb 100644 --- a/zspecial.acs +++ b/zspecial.acs @@ -252,7 +252,7 @@ special -9:GetActorVelX(1), -10:GetActorVelY(1), -11:GetActorVelZ(1), - -12:SetActivator(1), + -12:SetActivator(1,2), -13:SetActivatorToTarget(1), -14:GetActorViewHeight(1), -15:GetChar(2), @@ -278,6 +278,7 @@ special -35:CheckSight(3), -36:SpawnForced(6), -37:AnnouncerSound(2), + -38:SetPointer(2,4), -1000:__EndOfList__(10);