Merge branch 'jumphood' into 'master'

Jumphood

See merge request STJr/SRB2Internal!573
This commit is contained in:
MascaraSnake 2019-11-30 06:53:15 -05:00
commit e664e8b7f3
2 changed files with 2 additions and 1 deletions

View file

@ -4692,7 +4692,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_ROBOHOOD_STAND, // seestate
sfx_None, // seesound
TICRATE, // reactiontime
sfx_None, // attacksound
sfx_ngjump, // attacksound
S_NULL, // painstate
0, // painchance
sfx_None, // painsound

View file

@ -1731,6 +1731,7 @@ void A_HoodThink(mobj_t *actor)
// Target dangerously close to robohood, retreat then.
if ((dm < 256<<FRACBITS) && (abs(dz) < 128<<FRACBITS))
{
S_StartSound(actor, actor->info->attacksound);
P_SetMobjState(actor, actor->info->raisestate);
return;
}