From eed32ee285fe240bf127ce322c0d42b4c1804a32 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <c.oelckers@zdoom.fake>
Date: Sun, 22 May 2016 12:11:39 +0200
Subject: [PATCH] - fixed: The friction calculations for terrain based friction
 had some fixed/float mixups.

---
 src/p_terrain.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/p_terrain.cpp b/src/p_terrain.cpp
index 1b3226780..ca5a8b998 100644
--- a/src/p_terrain.cpp
+++ b/src/p_terrain.cpp
@@ -497,7 +497,7 @@ static void ParseFriction (FScanner &sc, int keyword, void *fields)
 	friction = (0x1EB8*(sc.Float*100))/0x80 + 0xD001;
 	friction = clamp<double> (friction, 0, 65536.);
 
-	if (friction > ORIG_FRICTION)	// ice
+	if (friction > ORIG_FRICTION * 65536.)	// ice
 		movefactor = ((0x10092 - friction) * 1024) / 4352 + 568;
 	else
 		movefactor = ((friction - 0xDB34)*(0xA))/0x80;