From b178bb261237c4bb1fbf013504e16658e13152a7 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Fri, 27 Oct 2006 08:20:54 +0000 Subject: [PATCH] - Fixed: The MinotaurFriend's MF4_NOTARGETSWITCH was put on AMinotaurFX1. SVN r363 (trunk) --- docs/rh-log.txt | 1 + src/d_main.cpp | 1 + src/g_raven/a_minotaur.cpp | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/rh-log.txt b/docs/rh-log.txt index 6d52cb697..6ef4dfea7 100644 --- a/docs/rh-log.txt +++ b/docs/rh-log.txt @@ -9,6 +9,7 @@ October 26, 2006 and Thing_Move functions so that TID 0 affects the activator. October 25, 2006 (Changes by Graf Zahl) +- Fixed: The MinotaurFriend's MF4_NOTARGETSWITCH was put on AMinotaurFX1. - Moved the sector type translation for Doom format maps into a simple lump in zdoom.pk3. - Changed Line_SetIdentification so that the fifth arg is a high-byte for the diff --git a/src/d_main.cpp b/src/d_main.cpp index df4ea27b1..a64fa14f4 100644 --- a/src/d_main.cpp +++ b/src/d_main.cpp @@ -932,6 +932,7 @@ void D_DoAdvanceDemo (void) MapData * map = P_OpenMapData("TITLEMAP"); if (map != NULL) { + delete map; G_InitNew ("TITLEMAP", true); return; } diff --git a/src/g_raven/a_minotaur.cpp b/src/g_raven/a_minotaur.cpp index 405de4548..17ed6f10f 100644 --- a/src/g_raven/a_minotaur.cpp +++ b/src/g_raven/a_minotaur.cpp @@ -197,6 +197,7 @@ IMPLEMENT_STATELESS_ACTOR (AMinotaurFriend, Hexen, -1, 0) PROP_Flags2Set (MF2_TELESTOMP) PROP_Flags3Set (MF3_STAYMORPHED) PROP_Flags3Clear (MF3_DONTMORPH) + PROP_Flags4 (MF4_NOTARGETSWITCH) END_DEFAULTS AT_GAME_SET (Minotaur) @@ -351,7 +352,6 @@ IMPLEMENT_ACTOR (AMinotaurFX1, Raven, -1, 0) PROP_DamageType (MOD_FIRE) PROP_Flags (MF_NOBLOCKMAP|MF_MISSILE|MF_DROPOFF|MF_NOGRAVITY) PROP_Flags2 (MF2_NOTELEPORT) - PROP_Flags4 (MF4_NOTARGETSWITCH) PROP_RenderStyle (STYLE_Add) PROP_SpawnState (S_MNTRFX1)