OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Fixed inconsistencies between player and monster morphing

Browse source 
The Tome of Power and Chaos Device will now work on non-players. The STAYMORPHED flag will now work on players.
This commit is contained in:
Boondorl 2024-01-01 01:31:25 -05:00 • committed by Rachael Alexanderson
commit 30730647fe
5 changed files with 116 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/playsim/p_interaction.cpp
View file

@ -330,7 +330,7 @@ void AActor::Die (AActor *source, AActor *inflictor, int dmgflags, FName MeansOf
VMCall(func, params, 1, nullptr, 0);
// Always kill the dummy Actor if it didn't unmorph, otherwise checking the morph flags.
if (realMo != nullptr && (alternative != nullptr || !(morphStyle & MORPH_UNDOBYDEATHSAVES)))
if (realMo != nullptr && (!(morphStyle & MORPH_UNDOBYDEATH) || !(morphStyle & MORPH_UNDOBYDEATHSAVES)))
{
if (wasgibbed)
{