Merge branch 'bugglebop' into 'master'

Make Buggles spawn immediately breathable bubbles

See merge request STJr/SRB2Internal!613
This commit is contained in:
MascaraSnake 2019-12-06 04:21:39 -05:00
commit 0672db9e44
2 changed files with 2 additions and 1 deletions

View File

@ -17667,7 +17667,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
0, // damage
sfx_None, // activesound
MF_SPECIAL|MF_NOGRAVITY|MF_SCENERY, // flags
S_NULL // raisestate
S_EXTRALARGEBUBBLE // raisestate
},
{ // MT_WATERZAP

View File

@ -2643,6 +2643,7 @@ void P_KillMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, UINT8 damaget
mo = P_SpawnMobj(target->x, target->y, target->z, MT_EXTRALARGEBUBBLE);
mo->destscale = target->scale;
P_SetScale(mo, mo->destscale);
P_SetMobjState(mo, mo->info->raisestate);
break;
case MT_YELLOWSHELL: