From b52836e5f1ae8ccfd8f5a262be09f313d692030c Mon Sep 17 00:00:00 2001
From: katsy <205-katsy@users.noreply.git.do.srb2.org>
Date: Mon, 1 Jan 2024 03:10:09 +0000
Subject: [PATCH] Move player friction reset after movement code for lua qol

---
 src/p_mobj.c | 2 --
 src/p_user.c | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/p_mobj.c b/src/p_mobj.c
index ec7455a3c..2605f6777 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -1676,8 +1676,6 @@ static void P_XYFriction(mobj_t *mo, fixed_t oldx, fixed_t oldy)
 				mo->momx = FixedMul(mo->momx, mo->friction);
 				mo->momy = FixedMul(mo->momy, mo->friction);
 			}
-
-			mo->friction = ORIG_FRICTION;
 		}
 	}
 	else
diff --git a/src/p_user.c b/src/p_user.c
index 5cb1d9d5a..f6e12ecfa 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -6000,6 +6000,7 @@ static void P_2dMovement(player_t *player)
 		else if (player->rmomx > -topspeed && cmd->sidemove < 0)
 			P_Thrust(player->mo, movepushangle, movepushforward);
 	}
+	player->mo->friction = ORIG_FRICTION; //katsy: reset player friction AFTER movement code
 }
 
 //#define OLD_MOVEMENT_CODE 1
@@ -6321,6 +6322,7 @@ static void P_3dMovement(player_t *player)
 			player->mo->momy = tempmomy + player->cmomy;
 		}
 	}
+	player->mo->friction = ORIG_FRICTION; //katsy: reset player friction AFTER movement code
 }
 
 //