From c07f273af0107ef7e38addec1e888579b63e883d Mon Sep 17 00:00:00 2001
From: toasterbabe <rollerorbital@gmail.com>
Date: Tue, 30 Aug 2016 16:41:00 +0100
Subject: [PATCH] Fixed some oversights with the spindash dashspeed changes
---
src/p_mobj.c | 1 -
src/st_stuff.c | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/p_mobj.c b/src/p_mobj.c
index 4aff6d2f9d..6b12bdca61 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -6198,7 +6198,6 @@ void P_SetScale(mobj_t *mobj, fixed_t newscale)
{
G_GhostAddScale(newscale);
player->viewheight = FixedMul(FixedDiv(player->viewheight, oldscale), newscale); // Nonono don't calculate viewheight elsewhere, this is the best place for it!
- player->dashspeed = FixedMul(FixedDiv(player->dashspeed, oldscale), newscale); // Prevents the player from having to re-charge up spindash if the player grew in size
}
}
diff --git a/src/st_stuff.c b/src/st_stuff.c
index 2f569e1ced..340f8a2b2b 100644
--- a/src/st_stuff.c
+++ b/src/st_stuff.c
@@ -565,7 +565,7 @@ static void ST_drawDebugInfo(void)
{
V_DrawRightAlignedString(320, height - 104, V_MONOSPACE, va("SHIELD: %5x", stplyr->powers[pw_shield]));
V_DrawRightAlignedString(320, height - 96, V_MONOSPACE, va("SCALE: %5d%%", (stplyr->mo->scale*100)/FRACUNIT));
- V_DrawRightAlignedString(320, height - 88, V_MONOSPACE, va("DASH: %3d/%3d", stplyr->dashspeed>>FRACBITS, FixedMul(stplyr->maxdash,stplyr->mo->scale)>>FRACBITS));
+ V_DrawRightAlignedString(320, height - 88, V_MONOSPACE, va("DASH: %3d/%3d", stplyr->dashspeed>>FRACBITS, stplyr->maxdash>>FRACBITS));
V_DrawRightAlignedString(320, height - 80, V_MONOSPACE, va("AIR: %4d, %3d", stplyr->powers[pw_underwater], stplyr->powers[pw_spacetime]));
// Flags
--
GitLab