lifning
/
SRB2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixes shield ability usage when pressing spin on ACZ ropes (and also changes flame shield angling)

This commit is contained in:
lachwright 2019-09-25 22:36:48 +08:00
parent 77613018f8
commit c1750d9359
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/p_mobj.c
View File

@ -7311,7 +7311,8 @@ void P_MobjThinker(mobj_t *mobj)
case MT_FLAMEAURA_ORB:
if (!(mobj->flags2 & MF2_SHIELD))
return;
mobj->angle = mobj->target->angle; // implicitly okay because of P_AddShield
if (mobj->state-states < mobj->info->painstate)
mobj->angle = mobj->target->angle; // implicitly okay because of P_AddShield
if (mobj->tracer
/* && mobj->target -- the following is implicit by P_AddShield
&& mobj->target->player

1
src/p_user.c
View File

@ -8663,6 +8663,7 @@ static void P_DoRopeHang(player_t *player)
if (player->cmd.buttons & BT_USE && !(player->pflags & PF_STASIS)) // Drop off of the rope
{
player->pflags |= P_GetJumpFlags(player);
player->pflags |= PF_USEDOWN;
P_SetPlayerMobjState(player->mo, S_PLAY_JUMP);
P_SetTarget(&player->mo->tracer, NULL);