diff options
author | Simon Howard | 2010-02-07 00:59:56 +0000 |
---|---|---|
committer | Simon Howard | 2010-02-07 00:59:56 +0000 |
commit | abb5f33199e6fe036d068b5a5f59e58e1505eb8e (patch) | |
tree | 47a4df657c3301ea2db7c58fcc613bc96ba905c1 /src/heretic/info.c | |
parent | c33c1fa07680ef07540fb1c48a323bdc816e3e77 (diff) | |
download | chocolate-doom-abb5f33199e6fe036d068b5a5f59e58e1505eb8e.tar.gz chocolate-doom-abb5f33199e6fe036d068b5a5f59e58e1505eb8e.tar.bz2 chocolate-doom-abb5f33199e6fe036d068b5a5f59e58e1505eb8e.zip |
Add back unused phoenix rod object, frames, and dummy action pointer.
These were in Heretic 1.0 but were later removed. Also add comments to
info.h noting fire-death frames that were added Heretic 1.0. This is
necessary for HHE support.
Subversion-branch: /branches/raven-branch
Subversion-revision: 1854
Diffstat (limited to 'src/heretic/info.c')
-rw-r--r-- | src/heretic/info.c | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/src/heretic/info.c b/src/heretic/info.c index e566222c..4848ede9 100644 --- a/src/heretic/info.c +++ b/src/heretic/info.c @@ -95,6 +95,7 @@ void A_InitPhoenixPL2(); void A_FirePhoenixPL2(); void A_ShutdownPhoenixPL2(); void A_PhoenixPuff(); +void A_RemovedPhoenixPuff(); void A_FlameEnd(); void A_FloatPuff(); void A_FireCrossbowPL1(); @@ -663,6 +664,9 @@ state_t states[NUMSTATES] = { {SPR_FX08, 32773, 4, NULL, S_PHOENIXFXI1_7, 0, 0}, // S_PHOENIXFXI1_6 {SPR_FX08, 32774, 4, NULL, S_PHOENIXFXI1_8, 0, 0}, // S_PHOENIXFXI1_7 {SPR_FX08, 32775, 4, NULL, S_NULL, 0, 0}, // S_PHOENIXFXI1_8 + {SPR_FX08, 32776, 8, NULL, S_PHOENIXFXIX_1, 0, 0 }, // S_PHOENIXFXIX_1 + {SPR_FX08, 32777, 8, A_RemovedPhoenixFunc, S_PHOENIXFXIX_2, 0, 0 }, // S_PHOENIXFXIX_2 + {SPR_FX08, 32778, 8, NULL, S_NULL, 0, 0 }, // S_PHOENIXFXIX_3 {SPR_FX04, 1, 4, NULL, S_PHOENIXPUFF2, 0, 0}, // S_PHOENIXPUFF1 {SPR_FX04, 2, 4, NULL, S_PHOENIXPUFF3, 0, 0}, // S_PHOENIXPUFF2 {SPR_FX04, 3, 4, NULL, S_PHOENIXPUFF4, 0, 0}, // S_PHOENIXPUFF3 @@ -3727,6 +3731,37 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = { MF2_THRUGHOST | MF2_NOTELEPORT // flags2 }, + // The following thing is present in the mobjinfo table from Heretic 1.0, + // but not in Heretic 1.3 (ie. it was removed). It has been re-inserted + // here to support HHE patches. + + { // MT_PHOENIXFX_REMOVED + -1, // doomednum + S_PHOENIXFXIX_1, // spawnstate + 1000, // spawnhealth + S_NULL, // seestate + sfx_None, // seesound + 8, // reactiontime + sfx_None, // attacksound + S_NULL, // painstate + 0, // painchance + sfx_None, // painsound + S_NULL, // meleestate + S_NULL, // missilestate + S_NULL, // crashstate + S_PHOENIXFXIX_3, // deathstate + S_NULL, // xdeathstate + sfx_None, // deathsound + 0, // speed + 2 * FRACUNIT, // radius + 4 * FRACUNIT, // height + 100, // mass + 0, // damage + sfx_None, // activesound + MF_NOBLOCKMAP | MF_MISSILE | MF_DROPOFF | MF_NOGRAVITY, // flags + MF2_NOTELEPORT // flags2 + }, + { // MT_PHOENIXPUFF -1, // doomednum S_PHOENIXPUFF1, // spawnstate |