Merge branch 'brakyeet2' into 'master'
Brakyeet2 See merge request STJr/SRB2Internal!578
This commit is contained in:
commit
cfe8166998
|
@ -4059,14 +4059,12 @@ bossjustdie:
|
||||||
mo->flags &= ~(MF_SPECIAL|MF_NOGRAVITY|MF_NOCLIPHEIGHT);
|
mo->flags &= ~(MF_SPECIAL|MF_NOGRAVITY|MF_NOCLIPHEIGHT);
|
||||||
|
|
||||||
S_StartSound(NULL, sfx_bedie2);
|
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))
|
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);
|
P_InstaThrust(mo, R_PointToAngle2(0, 0, mo->x, mo->y), 14*FRACUNIT);
|
||||||
S_StartSound(mo, sfx_bgxpld);
|
|
||||||
}
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case MT_KOOPA:
|
case MT_KOOPA:
|
||||||
|
|
10
src/p_mobj.c
10
src/p_mobj.c
|
@ -8200,13 +8200,13 @@ void P_MobjThinker(mobj_t *mobj)
|
||||||
var2 = 0;
|
var2 = 0;
|
||||||
A_BossScream(mobj);
|
A_BossScream(mobj);
|
||||||
}
|
}
|
||||||
|
if (P_CheckDeathPitCollide(mobj))
|
||||||
|
{
|
||||||
|
P_RemoveMobj(mobj);
|
||||||
|
return;
|
||||||
|
}
|
||||||
if (mobj->momz && mobj->z+mobj->momz <= mobj->floorz)
|
if (mobj->momz && mobj->z+mobj->momz <= mobj->floorz)
|
||||||
{
|
{
|
||||||
if (P_CheckDeathPitCollide(mobj))
|
|
||||||
{
|
|
||||||
P_RemoveMobj(mobj);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
S_StartSound(mobj, sfx_befall);
|
S_StartSound(mobj, sfx_befall);
|
||||||
if (mobj->state != states+S_CYBRAKDEMON_DIE8)
|
if (mobj->state != states+S_CYBRAKDEMON_DIE8)
|
||||||
P_SetMobjState(mobj, S_CYBRAKDEMON_DIE8);
|
P_SetMobjState(mobj, S_CYBRAKDEMON_DIE8);
|
||||||
|
|
Loading…
Reference in a new issue