stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-02-22 11:51:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixed sphere's CA2_MELEE stasis issue

Browse source
This commit is contained in:
toaster 2019-08-02 13:18:57 +01:00
parent 2ae07bdf3b
commit f2349c5ce4
1 changed files with 40 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/p_user.c
View file

@ -2037,7 +2037,9 @@ boolean P_PlayerHitFloor(player_t *player, boolean dorollstuff)
else else
player->pflags &= ~PF_GLIDING; player->pflags &= ~PF_GLIDING;
} }
else if (player->charability2 == CA2_MELEE && player->panim == PA_ABILITY2 && player->mo->state-states != S_PLAY_MELEE_LANDING) else if (player->charability2 == CA2_MELEE && player->panim == PA_ABILITY2)
{
if (player->mo->state-states != S_PLAY_MELEE_LANDING)
{ {
mobjtype_t type = player->revitem; mobjtype_t type = player->revitem;
P_SetPlayerMobjState(player->mo, S_PLAY_MELEE_LANDING); P_SetPlayerMobjState(player->mo, S_PLAY_MELEE_LANDING);
@ -2080,6 +2082,7 @@ boolean P_PlayerHitFloor(player_t *player, boolean dorollstuff)
S_StartSound(missile, missile->info->seesound); S_StartSound(missile, missile->info->seesound);
} }
} }
}
else if (player->charability2 == CA2_GUNSLINGER && player->panim == PA_ABILITY2) else if (player->charability2 == CA2_GUNSLINGER && player->panim == PA_ABILITY2)
; ;
else if (player->pflags & PF_JUMPED || !(player->pflags & PF_SPINNING) else if (player->pflags & PF_JUMPED || !(player->pflags & PF_SPINNING)