OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- call the native A_BossDeath directly instead of going through the VM-enabled action function.

Browse source 
- undo some formatting screwup in a_clericstaff.cpp.
This commit is contained in:
Christoph Oelckers 2016-02-10 13:57:21 +01:00
commit b5029e0976
5 changed files with 32 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/g_shared/a_morph.cpp
View file

@ -550,10 +550,7 @@ bool P_MorphedDeath(AActor *actor, AActor **morphed, int *morphedstyle, int *mor
if (realme->flags4 & MF4_BOSSDEATH)
{
realme->health = 0; // make sure that A_BossDeath considers it dead.
// FIXME: Use the caller's stack once the whole chain is scriptable.
VMFrameStack stack;
VMValue params[3] = { realme, realme, VMValue(NULL, ATAG_STATE) };
stack.Call(A_BossDeath_VMPtr, params, countof(params), NULL, 0, NULL);
A_BossDeath(realme);
}
}
fakeme->flags3 |= MF3_STAYMORPHED; // moved here from AMorphedMonster::Die()