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

Merge branch 'walltransfermovev2' into 'master'

Browse source 
Let players roll AND move after spinning off a wall transfer

Closes #274

See merge request STJr/SRB2Internal!456
This commit is contained in:
MascaraSnake 2019-11-11 11:17:32 -05:00
commit f79da2fb3f
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/p_mobj.c
View file

@ -1991,7 +1991,7 @@ void P_XYMovement(mobj_t *mo)
mo->momz = transfermomz; mo->momz = transfermomz;
mo->standingslope = NULL; mo->standingslope = NULL;
if (player->pflags & PF_SPINNING) if (player->pflags & PF_SPINNING)
player->pflags = (player->pflags & ~PF_SPINNING) | (PF_JUMPED | PF_THOKKED); player->pflags |= PF_THOKKED;
} }
} }
#endif #endif

16
src/p_user.c
View file

@ -2225,8 +2225,8 @@ boolean P_PlayerHitFloor(player_t *player, boolean dorollstuff)
{ {
if (dorollstuff) if (dorollstuff)
{ {
if ((player->charability2 == CA2_SPINDASH) && !(player->pflags & PF_THOKKED) && (player->cmd.buttons & BT_USE) && (FixedHypot(player->mo->momx, player->mo->momy) > (5*player->mo->scale))) if ((player->charability2 == CA2_SPINDASH) && !((player->pflags & (PF_SPINNING|PF_THOKKED)) == PF_THOKKED) && (player->cmd.buttons & BT_USE) && (FixedHypot(player->mo->momx, player->mo->momy) > (5*player->mo->scale)))
player->pflags |= PF_SPINNING; player->pflags = (player->pflags|PF_SPINNING) & ~PF_THOKKED;
else if (!(player->pflags & PF_STARTDASH)) else if (!(player->pflags & PF_STARTDASH))
player->pflags &= ~PF_SPINNING; player->pflags &= ~PF_SPINNING;
} }
@ -5767,7 +5767,7 @@ static void P_2dMovement(player_t *player)
movepushforward >>= 1; // Proper air movement movepushforward >>= 1; // Proper air movement
// Allow a bit of movement while spinning // Allow a bit of movement while spinning
if (player->pflags & PF_SPINNING) if ((player->pflags & (PF_SPINNING|PF_THOKKED)) == PF_SPINNING)
{ {
if (!(player->pflags & PF_STARTDASH)) if (!(player->pflags & PF_STARTDASH))
movepushforward = movepushforward/48; movepushforward = movepushforward/48;
@ -5794,7 +5794,7 @@ static void P_3dMovement(player_t *player)
angle_t dangle; // replaces old quadrants bits angle_t dangle; // replaces old quadrants bits
fixed_t normalspd = FixedMul(player->normalspeed, player->mo->scale); fixed_t normalspd = FixedMul(player->normalspeed, player->mo->scale);
boolean analogmove = false; boolean analogmove = false;
boolean spin = ((onground = P_IsObjectOnGround(player->mo)) && player->pflags & PF_SPINNING && (player->rmomx || player->rmomy) && !(player->pflags & PF_STARTDASH)); boolean spin = ((onground = P_IsObjectOnGround(player->mo)) && (player->pflags & (PF_SPINNING|PF_THOKKED)) == PF_SPINNING && (player->rmomx || player->rmomy) && !(player->pflags & PF_STARTDASH));
fixed_t oldMagnitude, newMagnitude; fixed_t oldMagnitude, newMagnitude;
#ifdef ESLOPE #ifdef ESLOPE
vector3_t totalthrust; vector3_t totalthrust;
@ -5979,7 +5979,7 @@ static void P_3dMovement(player_t *player)
movepushforward = cmd->forwardmove * (thrustfactor * acceleration); movepushforward = cmd->forwardmove * (thrustfactor * acceleration);
// Allow a bit of movement while spinning // Allow a bit of movement while spinning
if (player->pflags & PF_SPINNING) if ((player->pflags & (PF_SPINNING|PF_THOKKED)) == PF_SPINNING)
{ {
if ((mforward && cmd->forwardmove > 0) || (mbackward && cmd->forwardmove < 0) if ((mforward && cmd->forwardmove > 0) || (mbackward && cmd->forwardmove < 0)
|| (player->pflags & PF_STARTDASH)) || (player->pflags & PF_STARTDASH))
@ -6020,7 +6020,7 @@ static void P_3dMovement(player_t *player)
movepushforward = max(abs(cmd->sidemove), abs(cmd->forwardmove)) * (thrustfactor * acceleration); movepushforward = max(abs(cmd->sidemove), abs(cmd->forwardmove)) * (thrustfactor * acceleration);
// Allow a bit of movement while spinning // Allow a bit of movement while spinning
if (player->pflags & PF_SPINNING) if ((player->pflags & (PF_SPINNING|PF_THOKKED)) == PF_SPINNING)
{ {
if ((mforward && cmd->forwardmove > 0) || (mbackward && cmd->forwardmove < 0) if ((mforward && cmd->forwardmove > 0) || (mbackward && cmd->forwardmove < 0)
|| (player->pflags & PF_STARTDASH)) || (player->pflags & PF_STARTDASH))
@ -6055,11 +6055,11 @@ static void P_3dMovement(player_t *player)
{ {
movepushside >>= 2; // proper air movement movepushside >>= 2; // proper air movement
// Reduce movepushslide even more if over "max" flight speed // Reduce movepushslide even more if over "max" flight speed
if ((player->pflags & PF_SPINNING) || (player->powers[pw_tailsfly] && player->speed > topspeed)) if (((player->pflags & (PF_SPINNING|PF_THOKKED)) == PF_SPINNING) || (player->powers[pw_tailsfly] && player->speed > topspeed))
movepushside >>= 2; movepushside >>= 2;
} }
// Allow a bit of movement while spinning // Allow a bit of movement while spinning
else if (player->pflags & PF_SPINNING) else if ((player->pflags & (PF_SPINNING|PF_THOKKED)) == PF_SPINNING)
{ {
if (player->pflags & PF_STARTDASH) if (player->pflags & PF_STARTDASH)
movepushside = 0; movepushside = 0;