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

Merge branch 'amytweaks' into 'master'

Browse source 
Amy tweaks

See merge request STJr/SRB2Internal!366
This commit is contained in:
MascaraSnake 2019-10-12 09:52:44 -04:00
commit d401862714
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/p_user.c
View file

@ -2260,7 +2260,7 @@ boolean P_PlayerHitFloor(player_t *player, boolean dorollstuff)
else if (!player->skidtime) else if (!player->skidtime)
player->pflags &= ~PF_GLIDING; player->pflags &= ~PF_GLIDING;
} }
else if (player->charability2 == CA2_MELEE && player->panim == PA_ABILITY2) else if (player->charability2 == CA2_MELEE && ((player->panim == PA_ABILITY2) || (player->charability == CA_TWINSPIN && player->panim == PA_ABILITY)))
{ {
if (player->mo->state-states != S_PLAY_MELEE_LANDING) if (player->mo->state-states != S_PLAY_MELEE_LANDING)
{ {
@ -4674,8 +4674,9 @@ static void P_DoSpinAbility(player_t *player, ticcmd_t *cmd)
if (player->speed < FixedMul(player->maxdash, player->mo->scale)) if (player->speed < FixedMul(player->maxdash, player->mo->scale))
#endif #endif
{ {
if (player->panim == PA_IDLE)
player->drawangle = player->mo->angle; player->drawangle = player->mo->angle;
P_InstaThrust(player->mo, player->mo->angle, FixedMul(player->maxdash, player->mo->scale)); P_InstaThrust(player->mo, player->drawangle, FixedMul(player->maxdash, player->mo->scale));
} }
player->mo->momx += player->cmomx; player->mo->momx += player->cmomx;
player->mo->momy += player->cmomy; player->mo->momy += player->cmomy;