stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-01-18 07:22:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Fixed issue where CA_BOUNCE users can harmlessly bounce on deathpits (and not Cakewalk style!)

Browse source 
* Minor quality-of-life improvements to CA_BOUNCE handling.
This commit is contained in:
toasterbabe 2016-12-23 23:13:31 +00:00
parent 10a137620a
commit 0a7fe9569d
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/p_mobj.c
View file

@ -3316,7 +3316,7 @@ static void P_PlayerZMovement(mobj_t *mo)
} }
} }
if (mo->player->pflags & PF_BOUNCING) if (mo->player->pflags & PF_BOUNCING && !P_CheckDeathPitCollide(mo))
{ {
fixed_t prevmomz = P_MobjFlip(mo)*abs(mo->momz); fixed_t prevmomz = P_MobjFlip(mo)*abs(mo->momz);
if (mo->eflags & MFE_UNDERWATER) if (mo->eflags & MFE_UNDERWATER)
@ -3326,7 +3326,7 @@ static void P_PlayerZMovement(mobj_t *mo)
S_StartSound(mo, sfx_boingf); S_StartSound(mo, sfx_boingf);
P_DoJump(mo->player, false); P_DoJump(mo->player, false);
P_SetPlayerMobjState(mo, S_PLAY_BOUNCE_LANDING); P_SetPlayerMobjState(mo, S_PLAY_BOUNCE_LANDING);
mo->player->pflags |= PF_BOUNCING; mo->player->pflags |= PF_BOUNCING|PF_THOKKED;
mo->player->jumping = 0; mo->player->jumping = 0;
mo->momz = (FixedMul(mo->momz, 3*FRACUNIT/2) + prevmomz)/2; mo->momz = (FixedMul(mo->momz, 3*FRACUNIT/2) + prevmomz)/2;
clipmomz = false; clipmomz = false;
@ -4153,7 +4153,7 @@ static void P_PlayerMobjThinker(mobj_t *mobj)
mobj->eflags &= ~MFE_JUSTSTEPPEDDOWN; mobj->eflags &= ~MFE_JUSTSTEPPEDDOWN;
if (mobj->state-states == S_PLAY_BOUNCE_LANDING) if (mobj->state-states == S_PLAY_BOUNCE_LANDING)
goto animonly; goto animonly; // no need for checkposition - doesn't move at ALL
// Zoom tube // Zoom tube
if (mobj->tracer) if (mobj->tracer)

5
src/p_user.c
View file

@ -4283,9 +4283,10 @@ static void P_DoJumpStuff(player_t *player, ticcmd_t *cmd)
{ {
P_SetPlayerMobjState(player->mo, S_PLAY_BOUNCE); P_SetPlayerMobjState(player->mo, S_PLAY_BOUNCE);
player->pflags &= ~PF_JUMPED; player->pflags &= ~PF_JUMPED;
player->pflags |= PF_BOUNCING; player->pflags |= PF_THOKKED|PF_BOUNCING;
player->mo->momx >>= 1; player->mo->momx >>= 1;
player->mo->momy >>= 1; player->mo->momy >>= 1;
player->mo->momz >>= 1;
} }
break; break;
case CA_TWINSPIN: case CA_TWINSPIN:
@ -6746,9 +6747,9 @@ static void P_MovePlayer(player_t *player)
} }
else else
{ {
player->pflags |= PF_THOKKED;
player->mo->momx >>= 1; player->mo->momx >>= 1;
player->mo->momy >>= 1; player->mo->momy >>= 1;
player->mo->momz >>= 1;
P_SetPlayerMobjState(player->mo, S_PLAY_FALL); P_SetPlayerMobjState(player->mo, S_PLAY_FALL);
} }
} }