From 1e12f4404dcc8c244e691cf38d79dc93150a59c8 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sat, 24 Feb 2007 12:09:36 +0000 Subject: [PATCH] - Fixed: In the Doom2 cast finale it was impossible to toggle the console. - Added APROP_Friendly actor property for ACS. - Added a new flag, MF2_DONTREFLECT that prevents missiles from being reflected. - Fixed: ALoreShot::DoSpecialDamage must check whether the shooter is still present. If it had been removed before the projectile hits its target a crash could occur. - Fixed: GetPlayerInfo was missing breaks and always returned 0 as a result. - Added Grubber's submission for printing key bindings in ACS. SVN r491 (trunk) --- parse.c | 3 +++ pcode.c | 1 + pcode.h | 1 + zdefs.acs | 2 ++ 4 files changed, 7 insertions(+) diff --git a/parse.c b/parse.c index ed5267e..6e89858 100644 --- a/parse.c +++ b/parse.c @@ -2045,6 +2045,9 @@ static void BuildPrintString(void) case 'f': // [RH] fixed point printCmd = PCD_PRINTFIXED; break; + case 'k': // [GRB] key binding + printCmd = PCD_PRINTBIND; + break; default: printCmd = PCD_PRINTSTRING; ERR_Error(ERR_UNKNOWN_PRTYPE, YES); diff --git a/pcode.c b/pcode.c index 8132e47..ca55932 100644 --- a/pcode.c +++ b/pcode.c @@ -443,6 +443,7 @@ static char *PCDNames[PCODE_COMMAND_COUNT] = "PCD_NEGATEBINARY", "PCD_GETACTORPITCH", "PCD_SETACTORPITCH", + "PCD_PRINTBIND", }; // CODE -------------------------------------------------------------------- diff --git a/pcode.h b/pcode.h index b84dfbd..b2d571a 100644 --- a/pcode.h +++ b/pcode.h @@ -393,6 +393,7 @@ typedef enum PCD_NEGATEBINARY, PCD_GETACTORPITCH, PCD_SETACTORPITCH, + PCD_PRINTBIND, PCODE_COMMAND_COUNT } pcd_t; diff --git a/zdefs.acs b/zdefs.acs index 0f751da..8f2a6ee 100644 --- a/zdefs.acs +++ b/zdefs.acs @@ -172,6 +172,8 @@ #define APROP_JumpZ 12 #define APROP_ChaseGoal 13 #define APROP_Frightened 14 +#define APROP_Gravity 15 +#define APROP_Friendly 16 #define APROP_SeeSound 5 // Sounds can only be set, not gotten #define APROP_AttackSound 6 #define APROP_PainSound 7