From 082d253553fdd0b6670d12455f40a747b83371e1 Mon Sep 17 00:00:00 2001 From: Sally Coolatta Date: Mon, 16 Nov 2020 17:00:21 -0500 Subject: [PATCH 1/2] Remove bot friction Not convinced this fixes anything anymore --- src/k_bot.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/k_bot.c b/src/k_bot.c index a32a554e1..899a70eb1 100644 --- a/src/k_bot.c +++ b/src/k_bot.c @@ -473,6 +473,10 @@ fixed_t K_BotTopSpeedRubberband(player_t *player) --------------------------------------------------*/ fixed_t K_BotFrictionRubberband(player_t *player, fixed_t frict) { +#if 1 + (void)player; + return frict; +#else fixed_t rubberband = K_BotRubberband(player) - FRACUNIT; fixed_t newfrict; @@ -490,6 +494,7 @@ fixed_t K_BotFrictionRubberband(player_t *player, fixed_t frict) newfrict = FRACUNIT; return newfrict; +#endif } /*-------------------------------------------------- From 6a4eb721bd5798d3150a31e2699efa711a3604bf Mon Sep 17 00:00:00 2001 From: Sally Coolatta Date: Mon, 16 Nov 2020 18:35:07 -0500 Subject: [PATCH 2/2] The real problem --- src/k_bot.c | 5 ----- src/p_user.c | 5 ----- 2 files changed, 10 deletions(-) diff --git a/src/k_bot.c b/src/k_bot.c index 899a70eb1..a32a554e1 100644 --- a/src/k_bot.c +++ b/src/k_bot.c @@ -473,10 +473,6 @@ fixed_t K_BotTopSpeedRubberband(player_t *player) --------------------------------------------------*/ fixed_t K_BotFrictionRubberband(player_t *player, fixed_t frict) { -#if 1 - (void)player; - return frict; -#else fixed_t rubberband = K_BotRubberband(player) - FRACUNIT; fixed_t newfrict; @@ -494,7 +490,6 @@ fixed_t K_BotFrictionRubberband(player_t *player, fixed_t frict) newfrict = FRACUNIT; return newfrict; -#endif } /*-------------------------------------------------- diff --git a/src/p_user.c b/src/p_user.c index 6c6c0578a..8065ae13b 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -1941,11 +1941,6 @@ static void P_3dMovement(player_t *player) totalthrust.x += P_ReturnThrustX(player->mo, movepushangle, movepushforward); totalthrust.y += P_ReturnThrustY(player->mo, movepushangle, movepushforward); - - if (K_PlayerUsesBotMovement(player) == true) - { - K_MomentumToFacing(player); - } } if ((totalthrust.x || totalthrust.y)