thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-27 12:31:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'jumphood' into 'master'

Browse source 
Jumphood

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

2
src/info.c
View file

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

1
src/p_enemy.c
View file

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