stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-15 09:11:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'brakyeet2' into 'master'

Browse source 
Brakyeet2

See merge request STJr/SRB2Internal!578
This commit is contained in:
MascaraSnake 2019-11-30 05:35:06 -05:00
commit cfe8166998
2 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/p_enemy.c
View file

@ -4059,14 +4059,12 @@ bossjustdie:
mo->flags &= ~(MF_SPECIAL|MF_NOGRAVITY|MF_NOCLIPHEIGHT);
S_StartSound(NULL, sfx_bedie2);
P_SpawnMobjFromMobj(mo, 0, 0, 0, MT_CYBRAKDEMON_VILE_EXPLOSION);
mo->z += P_MobjFlip(mo);
P_SetObjectMomZ(mo, 12*FRACUNIT, false);
S_StartSound(mo, sfx_bgxpld);
if (mo->spawnpoint && !(mo->spawnpoint->options & MTF_EXTRA))
{
P_SpawnMobjFromMobj(mo, 0, 0, 0, MT_CYBRAKDEMON_VILE_EXPLOSION);
mo->z += P_MobjFlip(mo);
P_SetObjectMomZ(mo, 12*FRACUNIT, false);
P_InstaThrust(mo, R_PointToAngle2(0, 0, mo->x, mo->y), 14*FRACUNIT);
S_StartSound(mo, sfx_bgxpld);
}
break;
}
case MT_KOOPA:

10
src/p_mobj.c
View file

@ -8200,13 +8200,13 @@ void P_MobjThinker(mobj_t *mobj)
var2 = 0;
A_BossScream(mobj);
}
if (P_CheckDeathPitCollide(mobj))
{
P_RemoveMobj(mobj);
return;
}
if (mobj->momz && mobj->z+mobj->momz <= mobj->floorz)
{
if (P_CheckDeathPitCollide(mobj))
{
P_RemoveMobj(mobj);
return;
}
S_StartSound(mobj, sfx_befall);
if (mobj->state != states+S_CYBRAKDEMON_DIE8)
P_SetMobjState(mobj, S_CYBRAKDEMON_DIE8);