stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-03-20 01:43:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Allow spin button Jump Shield normally.

Browse source 
If you walk off a cliff with a jump shield, you
can now press EITHER the jump or spin buttons to
activate it and double jump.
This commit is contained in:
Yukita Mayako 2015-05-29 02:35:24 -04:00
parent 406d809bc2
commit 2d14173968
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/p_user.c
View file

@ -3832,11 +3832,13 @@ static void P_DoJumpStuff(player_t *player, ticcmd_t *cmd)
if (cmd->buttons & BT_USE && !(player->pflags & PF_JUMPDOWN) && !player->exiting && !P_PlayerInPain(player))
{
if (onground || player->climbing || player->pflags & (PF_CARRIED|PF_ITEMHANG|PF_ROPEHANG))
{}
else if (player->pflags & PF_MACESPIN && player->mo->tracer)
{}
else if (!(player->pflags & PF_SLIDING) && ((gametype != GT_CTF) || (!player->gotflag)))
if (onground || player->climbing || player->pflags & (PF_CARRIED|PF_ITEMHANG|PF_ROPEHANG|PF_SLIDING)
|| (player->pflags & PF_MACESPIN && player->mo->tracer))
;
else if ((player->powers[pw_shield] & SH_NOSTACK) == SH_JUMP
&& !(player->pflags & PF_JUMPED))
P_DoJumpShield(player);
else if (gametype != GT_CTF || !player->gotflag)
{
#ifdef HAVE_BLUA
if (!LUAh_JumpSpinSpecial(player))