From a15a4ace7e8bac122a90ddc6645f76f76de1ff87 Mon Sep 17 00:00:00 2001
From: RedEnchilada <red@lyrawearspants.com>
Date: Sat, 2 Jan 2016 22:34:55 -0600
Subject: [PATCH] Do dashmode thok speed adjustments at thok instead of
 modifying actionspd

---
 src/p_user.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/p_user.c b/src/p_user.c
index 4b307fecaf..034bab4988 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -4079,13 +4079,19 @@ static void P_DoJumpStuff(player_t *player, ticcmd_t *cmd)
 					{
 						// Catapult the player
 						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)
 							actionspd >>= 1;
+						
 						if ((player->charability == CA_JUMPTHOK) && !(player->pflags & PF_THOKKED))
 						{
 							player->pflags &= ~PF_JUMPED;
 							P_DoJump(player, false);
 						}
+						
 						P_InstaThrust(player->mo, player->mo->angle, FixedMul(actionspd, player->mo->scale));
 
 						if (maptol & TOL_2D)
-- 
GitLab