Merge branch 'elemental-tweak' into 'next'
Don't uncurl from spin if Elemental Stomp is used See merge request STJr/SRB2!555
This commit is contained in:
commit
70336933bd
|
@ -5128,11 +5128,7 @@ static void P_DoJumpStuff(player_t *player, ticcmd_t *cmd)
|
||||||
boolean elem = ((player->powers[pw_shield] & SH_NOSTACK) == SH_ELEMENTAL);
|
boolean elem = ((player->powers[pw_shield] & SH_NOSTACK) == SH_ELEMENTAL);
|
||||||
player->pflags |= PF_THOKKED|PF_SHIELDABILITY;
|
player->pflags |= PF_THOKKED|PF_SHIELDABILITY;
|
||||||
if (elem)
|
if (elem)
|
||||||
{
|
|
||||||
player->pflags |= PF_NOJUMPDAMAGE;
|
|
||||||
P_SetPlayerMobjState(player->mo, S_PLAY_FALL);
|
|
||||||
S_StartSound(player->mo, sfx_s3k43);
|
S_StartSound(player->mo, sfx_s3k43);
|
||||||
}
|
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
player->pflags &= ~PF_NOJUMPDAMAGE;
|
player->pflags &= ~PF_NOJUMPDAMAGE;
|
||||||
|
|
Loading…
Reference in a new issue