lifning
/
SRB2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* CA_BOUNCE is now more pleasant to control. 

* CA_MELEE can now break downwards like CA_BOUNCE, and CA_TWINSPIN can break both up and downwards.
This commit is contained in:
toasterbabe 2017-02-04 18:25:16 +00:00
parent ba652864a6
commit 5170fafcac
2 changed files with 21 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/p_mobj.c
View File

@ -4200,14 +4200,7 @@ static void P_PlayerMobjThinker(mobj_t *mobj)
mobj->eflags &= ~MFE_JUSTSTEPPEDDOWN;
if (mobj->state-states == S_PLAY_BOUNCE_LANDING)
{
if (mobj->player->cmd.forwardmove || mobj->player->cmd.sidemove)
P_InstaThrust(
mobj,
mobj->angle + R_PointToAngle2(0, 0, mobj->player->cmd.forwardmove<<FRACBITS, -mobj->player->cmd.sidemove<<FRACBITS),
mobj->player->speed);
goto animonly; // no need for checkposition - doesn't move at ALL
}
// Zoom tube
if (mobj->tracer)

42
src/p_user.c
View File

@ -1812,22 +1812,11 @@ static void P_CheckBustableBlocks(player_t *player)
topheight = P_GetFOFTopZ(player->mo, node->m_sector, rover, player->mo->x, player->mo->y, NULL);
bottomheight = P_GetFOFBottomZ(player->mo, node->m_sector, rover, player->mo->x, player->mo->y, NULL);
if (player->pflags & PF_BOUNCING)
if (((player->charability == CA_TWINSPIN) && (player->panim == PA_ABILITY))
|| ((P_MobjFlip(player->mo)*player->mo->momz < 0) && (player->pflags & PF_BOUNCING || ((player->charability2 == CA2_MELEE) && (player->panim == PA_ABILITY2)))))
{
if (player->mo->eflags & MFE_VERTICALFLIP)
{
if (player->mo->momz <= 0)
continue;
topheight += player->mo->momz;
bottomheight += player->mo->momz;
}
else
{
if (player->mo->momz >= 0)
continue;
topheight -= player->mo->momz;
bottomheight -= player->mo->momz;
}
topheight -= player->mo->momz;
bottomheight -= player->mo->momz;
}
// Height checks
@ -4850,14 +4839,25 @@ static void P_3dMovement(player_t *player)
thrustfactor = player->thrustfactor*2;
acceleration = player->accelstart + (FixedDiv(player->speed, player->mo->scale)>>FRACBITS) * player->acceleration;
}
else if (player->pflags & PF_BOUNCING)
else
{
thrustfactor = player->thrustfactor/2;
acceleration = player->accelstart + (FixedDiv(player->speed, player->mo->scale)>>FRACBITS) * player->acceleration;
}
if (player->pflags & PF_BOUNCING)
{
if (player->mo->state-states == S_PLAY_BOUNCE_LANDING)
{
thrustfactor = player->thrustfactor/2;
acceleration = player->accelstart + (FixedDiv(player->speed, player->mo->scale)>>FRACBITS) * player->acceleration;
}
else
{
thrustfactor = player->thrustfactor*2;
acceleration = player->accelstart/2 + (FixedDiv(player->speed, player->mo->scale)>>FRACBITS) * player->acceleration/2;
}
}
if (player->mo->movefactor != FRACUNIT) // Friction-scaled acceleration...
acceleration = FixedMul(acceleration<<FRACBITS, player->mo->movefactor)>>FRACBITS;
if (player->mo->movefactor != FRACUNIT) // Friction-scaled acceleration...
acceleration = FixedMul(acceleration<<FRACBITS, player->mo->movefactor)>>FRACBITS;
}
// Forward movement
if (player->climbing)