OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- re-fixed the massacre fix for Dehacked-modified inventory items.

Browse source 
Instead of overriding the Massacre method it is preferable to clear the flags causing the bad behavior, most notably ISMONSTER.

# Conflicts:
#	src/g_inventory/a_pickups.cpp
#	src/g_inventory/a_pickups.h
This commit is contained in:
Christoph Oelckers 2018-11-27 00:14:51 +01:00
commit a14b0c58bf
6 changed files with 8 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/p_enemy.cpp
View file

@ -3465,7 +3465,7 @@ DEFINE_ACTION_FUNCTION(AActor, A_BossDeath)
//
//----------------------------------------------------------------------------
int P_Massacre (bool baddies)
int P_Massacre (bool baddies, PClassActor *cls)
{
// jff 02/01/98 'em' cheat - kill all monsters
// partially taken from Chi's .46 port
@ -3475,7 +3475,7 @@ int P_Massacre (bool baddies)
int killcount = 0;
AActor *actor;
TThinkerIterator<AActor> iterator;
TThinkerIterator<AActor> iterator(cls);
while ( (actor = iterator.Next ()) )
{