From d058820c65368db5de692ca34059cb80b3aea911 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <c.oelckers@zdoom.fake>
Date: Tue, 24 May 2016 10:01:57 +0200
Subject: [PATCH] - fixed scroll speed calculation for Heretic.

---
 src/p_mobj.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/p_mobj.cpp b/src/p_mobj.cpp
index fe049bdb4..97167f245 100644
--- a/src/p_mobj.cpp
+++ b/src/p_mobj.cpp
@@ -3560,10 +3560,10 @@ void AActor::Tick ()
 						scrolltype -= Carry_East5;
 						BYTE dir = HereticScrollDirs[scrolltype / 5];
 						double carryspeed = HereticSpeedMuls[scrolltype % 5] * (1. / (32 * CARRYFACTOR));
-						if (scrolltype<=Carry_East35 && !(i_compatflags&COMPATF_RAVENSCROLL)) 
+						if (scrolltype < 5 && !(i_compatflags&COMPATF_RAVENSCROLL)) 
 						{
 							// Use speeds that actually match the scrolling textures!
-							carryspeed = (1 << ((scrolltype%5) - 1));
+							carryspeed = (1 << ((scrolltype % 5) + 15)) / 65536.;
 						}
 						scrollv.X += carryspeed * ((dir & 3) - 1);
 						scrollv.Y += carryspeed * (((dir & 12) >> 2) - 1);