stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-03-22 02:42:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'bosszero' into 'next'

Browse source 
Do not consider 0 a valid executor tag for bosses

Closes #1017

See merge request STJr/SRB2!2037
This commit is contained in:
sphere 2023-07-14 13:17:48 +00:00
commit 47436ee495
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/p_enemy.c
View file

@ -3938,7 +3938,7 @@ static void P_DoBossVictory(mobj_t *mo)
}
// victory!
if (mo->spawnpoint)
if (mo->spawnpoint && mo->spawnpoint->args[3])
P_LinedefExecute(mo->spawnpoint->args[3], mo, NULL);
if (stoppedclock && modeattacking) // if you're just time attacking, skip making the capsule appear since you don't need to step on it anyways.
@ -4157,7 +4157,7 @@ void A_BossDeath(mobj_t *mo)
if (LUA_CallAction(A_BOSSDEATH, mo))
return;
if (mo->spawnpoint)
if (mo->spawnpoint && mo->spawnpoint->args[2])
P_LinedefExecute(mo->spawnpoint->args[2], mo, NULL);
mo->health = 0;
@ -7138,7 +7138,7 @@ void A_Boss1Chase(mobj_t *actor)
}
else
{
if (actor->spawnpoint)
if (actor->spawnpoint && actor->spawnpoint->args[4])
P_LinedefExecute(actor->spawnpoint->args[4], actor, NULL);
P_SetMobjState(actor, actor->info->raisestate);
}