- ACC Changes for morph update.

SVN r988 (trunk)

diff --git a/pcode.c b/pcode.c
index 34d8f59..a0c8f95 100644 (file)
--- a/pcode.c
+++ b/pcode.c
@@ -455,6 +455,8 @@ static char *PCDNames[PCODE_COMMAND_COUNT] =
        "PCD_THINGCOUNTSECTOR",\r
        "PCD_THINGCOUNTNAMESECTOR",\r
        "PCD_CHECKPLAYERCAMERA",\r
+       "PCD_MORPHACTOR",\r
+       "PCD_UNMORPHACTOR",\r
 };\r
 \r
 // CODE --------------------------------------------------------------------\r

diff --git a/pcode.h b/pcode.h
index db73918..f2ccfad 100644 (file)
--- a/pcode.h
+++ b/pcode.h
@@ -406,6 +406,8 @@ typedef enum
        PCD_THINGCOUNTSECTOR,\r
        PCD_THINGCOUNTNAMESECTOR,\r
        PCD_CHECKPLAYERCAMERA,\r
+       PCD_MORPHACTOR,\r
+       PCD_UNMORPHACTOR,\r
 \r
        PCODE_COMMAND_COUNT\r
 } pcd_t;\r

diff --git a/symbol.c b/symbol.c
index 8462777..b406534 100644 (file)
--- a/symbol.c
+++ b/symbol.c
@@ -190,6 +190,8 @@ static internFuncDef_t InternalFunctions[] =
        { "thingcountsector", PCD_NOP, PCD_THINGCOUNTSECTOR, 3, 0, 0, YES, NO },\r
        { "thingcountnamesector", PCD_NOP, PCD_THINGCOUNTNAMESECTOR, 3, 0, 0, YES, NO },\r
        { "checkplayercamera", PCD_NOP, PCD_CHECKPLAYERCAMERA, 1, 0, 0, YES, NO },\r
+       { "morphactor", PCD_NOP, PCD_MORPHACTOR, 7, 2|4|8|16|32|64, 0, YES, NO },\r
+       { "unmorphactor", PCD_NOP, PCD_UNMORPHACTOR, 2, 2, 0, YES, NO },\r
        \r
        { NULL, PCD_NOP, PCD_NOP, 0, 0, 0, NO, NO }\r
 };\r

diff --git a/zdefs.acs b/zdefs.acs
index 439dd48..395d1ad 100644 (file)
--- a/zdefs.acs
+++ b/zdefs.acs
@@ -236,6 +236,22 @@
 #define DAMAGE_IN_AIR                          4\r
 #define DAMAGE_SUBCLASSES_PROTECT      8\r
 \r
+// Flags for MorphActor -----------------------------------------------------\r
+\r
+#define MRF_OLDEFFECTS                 0x00000000\r
+#define MRF_ADDSTAMINA                 0x00000001\r
+#define MRF_FULLHEALTH                 0x00000002\r
+#define MRF_UNDOBYTOMEOFPOWER  0x00000004\r
+#define MRF_UNDOBYCHAOSDEVICE  0x00000008\r
+#define MRF_FAILNOTELEFRAG             0x00000010\r
+#define MRF_FAILNOLAUGH                        0x00000020\r
+#define MRF_WHENINVULNERABLE   0x00000040\r
+#define MRF_LOSEACTUALWEAPON   0x00000080\r
+#define MRF_NEWTIDBEHAVIOUR            0x00000100\r
+#define MRF_UNDOBYDEATH                        0x00000200\r
+#define MRF_UNDOBYDEATHFORCED  0x00000400\r
+#define MRF_UNDOBYDEATHSAVES   0x00000800\r
+\r
 // Shared spawnable things from Hexen. You can spawn these in the other -----\r
 // games if you provide sprites for them, otherwise they'll be invisible. ---\r
 \r