From c5e62a577f610295d80878b488b9092962ae8c54 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Mon, 21 Jul 2008 19:52:38 +0000 Subject: [PATCH] - Added MF4_BOSSDEATH to the Minotaur. - Fixed: The boss brain looped to the wrong state. SVN r1080 (trunk) --- docs/rh-log.txt | 2 ++ src/g_raven/a_minotaur.cpp | 3 ++- wadsrc/decorate/doom/bossbrain.txt | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/docs/rh-log.txt b/docs/rh-log.txt index 464b14670..c5685f00e 100644 --- a/docs/rh-log.txt +++ b/docs/rh-log.txt @@ -1,4 +1,6 @@ July 21, 2008 (Changes by Graf Zahl) +- Added MF4_BOSSDEATH to the Minotaur. +- Fixed: The boss brain looped to the wrong state. - Converted Heretic's Staff, GoldWand, Crossbow and Gauntlets to DECORATE. - fixed: Morphing to a class without a face definition crashed. - Converted all of Heretic's actors except the weapons to DECORATE. diff --git a/src/g_raven/a_minotaur.cpp b/src/g_raven/a_minotaur.cpp index 87669e902..b9625a2fe 100644 --- a/src/g_raven/a_minotaur.cpp +++ b/src/g_raven/a_minotaur.cpp @@ -110,7 +110,7 @@ FState AMinotaur::States[] = S_NORMAL (MNTR, 'E', 5, NULL , &States[S_MNTR_FADEOUT+6]), S_NORMAL (MNTR, 'E', 5, A_MinotaurFade1 , &States[S_MNTR_FADEOUT+7]), S_NORMAL (MNTR, 'E', 5, A_MinotaurFade0 , &States[S_MNTR_FADEOUT+8]), - S_NORMAL (MNTR, 'E', 10, NULL , NULL), + S_NORMAL (MNTR, 'E', 10, A_BossDeath , NULL), }; IMPLEMENT_ACTOR (AMinotaur, Heretic, 9, 0) @@ -124,6 +124,7 @@ IMPLEMENT_ACTOR (AMinotaur, Heretic, 9, 0) PROP_Flags (MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL|MF_DROPOFF) PROP_Flags2 (MF2_FLOORCLIP|MF2_PASSMOBJ|MF2_BOSS|MF2_PUSHWALL) PROP_Flags3 (MF3_NORADIUSDMG|MF3_DONTMORPH|MF3_NOTARGET) + PROP_Flags4 (MF4_BOSSDEATH) PROP_SpawnState (S_MNTR_LOOK) PROP_SeeState (S_MNTR_WALK) diff --git a/wadsrc/decorate/doom/bossbrain.txt b/wadsrc/decorate/doom/bossbrain.txt index d057be890..492cb1f80 100644 --- a/wadsrc/decorate/doom/bossbrain.txt +++ b/wadsrc/decorate/doom/bossbrain.txt @@ -57,7 +57,7 @@ ACTOR BossEye 89 See: SSWV A 181 A_BrainAwake SSWV A 150 A_BrainSpit - Loop + Wait } }