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

Do dashmode thok speed adjustments at thok instead of modifying actionspd

Browse source
This commit is contained in:
RedEnchilada 2016-01-02 22:34:55 -06:00
parent ebd2bdd1c8
commit a15a4ace7e
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/p_user.c
View file

@ -4079,13 +4079,19 @@ static void P_DoJumpStuff(player_t *player, ticcmd_t *cmd)
{ {
// Catapult the player // Catapult the player
fixed_t actionspd = player->actionspd; fixed_t actionspd = player->actionspd;
if (player->charability == CA_DASHMODE)
actionspd = max(player->normalspeed, FixedDiv(player->speed, player->mo->scale));
if (player->mo->eflags & MFE_UNDERWATER) if (player->mo->eflags & MFE_UNDERWATER)
actionspd >>= 1; actionspd >>= 1;
if ((player->charability == CA_JUMPTHOK) && !(player->pflags & PF_THOKKED)) if ((player->charability == CA_JUMPTHOK) && !(player->pflags & PF_THOKKED))
{ {
player->pflags &= ~PF_JUMPED; player->pflags &= ~PF_JUMPED;
P_DoJump(player, false); P_DoJump(player, false);
} }
P_InstaThrust(player->mo, player->mo->angle, FixedMul(actionspd, player->mo->scale)); P_InstaThrust(player->mo, player->mo->angle, FixedMul(actionspd, player->mo->scale));
if (maptol & TOL_2D) if (maptol & TOL_2D)