From 459f526e60de8e16bcc8fa779741d4e98511b376 Mon Sep 17 00:00:00 2001
From: Marisa Kirisame <marisa@sayachan.org>
Date: Sat, 29 Dec 2018 10:41:23 +0100
Subject: [PATCH] Fix: NOFRICTION was set unconditionally.

---
 zscript/utcommon.zsc | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/zscript/utcommon.zsc b/zscript/utcommon.zsc
index 17fd548..fdd8ff0 100644
--- a/zscript/utcommon.zsc
+++ b/zscript/utcommon.zsc
@@ -45,8 +45,6 @@ Class UTPlayer : DoomPlayer
 		Player.GruntSpeed 20;
 		MaxDropoffHeight 18;
 		MaxStepHeight 18;
-		+NOFRICTION;
-		+NOFRICTIONBOUNCE;
 		+NOMENU;
 		UTPlayer.DollType DOLL_Male;
 	}
@@ -205,6 +203,16 @@ Class UTPlayer : DoomPlayer
 	{
 		Super.Tick();
 		if ( !player || (player.mo != self) ) return;
+		if ( flak_utmovement )
+		{
+			bNOFRICTION = true;
+			bNOFRICTIONBOUNCE = true;
+		}
+		else
+		{
+			bNOFRICTION = false;
+			bNOFRICTIONBOUNCE = false;
+		}
 		if ( !footsteps ) footsteps = CVar.GetCVar('flak_footsteps',players[consoleplayer]);
 		if ( !footsteps.GetBool() ) return;
 		double ang = level.time/(20*TICRATE/35.)*360.;