From 3dc02a4eb480ed95a4327a9a296167be22bfe820 Mon Sep 17 00:00:00 2001 From: TehRealSalt Date: Mon, 22 Oct 2018 17:24:58 -0400 Subject: [PATCH] Minor mistakes on my part --- src/k_kart.c | 12 ++++++------ src/m_menu.c | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/k_kart.c b/src/k_kart.c index 04534568..ecba2026 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -1109,16 +1109,16 @@ void K_KartBouncing(mobj_t *mobj1, mobj_t *mobj2, boolean bounce, boolean solid) fixed_t nx = FixedDiv(distx, dist); fixed_t ny = FixedDiv(disty, dist); - if (P_AproxDistance(distx, disty) < 3*mobj1->radius/4) + if (P_AproxDistance(distx, disty) < (3*mobj1->radius)/4) { - distx = FixedMul(mobj1->radius/2, nx); - disty = FixedMul(mobj1->radius/2, ny); + distx = FixedMul((3*mobj1->radius)/4, nx); + disty = FixedMul((3*mobj1->radius)/4, ny); } - if (P_AproxDistance(distx, disty) < 3*mobj2->radius/4) + if (P_AproxDistance(distx, disty) < (3*mobj2->radius)/4) { - distx = FixedMul(mobj2->radius/2, nx); - disty = FixedMul(mobj2->radius/2, ny); + distx = FixedMul((3*mobj2->radius)/4, nx); + disty = FixedMul((3*mobj2->radius)/4, ny); } } diff --git a/src/m_menu.c b/src/m_menu.c index 7f71a7c7..144ed58c 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -314,7 +314,7 @@ menu_t OP_SoundOptionsDef; static void M_ToggleSFX(INT32 choice); static void M_ToggleDigital(INT32 choice); //static void M_ToggleMIDI(INT32 choice); -static void M_RestartAudio(void); +//static void M_RestartAudio(void); //Misc menu_t /*OP_DataOptionsDef,*/ OP_ScreenshotOptionsDef, OP_EraseDataDef; @@ -9041,10 +9041,10 @@ static void M_ToggleDigital(INT32 choice) } }*/ -static void M_RestartAudio(void) +/*static void M_RestartAudio(void) { COM_ImmedExecute("restartaudio"); -} +}*/ // =============== // VIDEO MODE MENU