From e829a57762d60623264fa51c52f2f9aceb3b972f Mon Sep 17 00:00:00 2001
From: Einar Johan Trøan Sømåen
Date: Thu, 24 Jan 2013 14:48:36 +0100
Subject: WINTERMUTE: Fix scrollspeed (and break character animation the same
 way WME Lite does)

---
 engines/wintermute/ad/ad_scene.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/engines/wintermute/ad/ad_scene.cpp b/engines/wintermute/ad/ad_scene.cpp
index a985c517e2..213d5564a8 100644
--- a/engines/wintermute/ad/ad_scene.cpp
+++ b/engines/wintermute/ad/ad_scene.cpp
@@ -932,24 +932,26 @@ bool AdScene::traverseNodes(bool doUpdate) {
 		if (_autoScroll) {
 			// adjust horizontal scroll
 			if (_gameRef->_timer - _lastTimeH >= _scrollTimeH) {
+				int timesMissed = (_gameRef->_timer - _lastTimeH) / _scrollTimeH;
 				_lastTimeH = _gameRef->_timer;
 				if (_offsetLeft < _targetOffsetLeft) {
-					_offsetLeft += _scrollPixelsH;
+					_offsetLeft += _scrollPixelsH * timesMissed;
 					_offsetLeft = MIN(_offsetLeft, _targetOffsetLeft);
 				} else if (_offsetLeft > _targetOffsetLeft) {
-					_offsetLeft -= _scrollPixelsH;
+					_offsetLeft -= _scrollPixelsH * timesMissed;
 					_offsetLeft = MAX(_offsetLeft, _targetOffsetLeft);
 				}
 			}
 
 			// adjust vertical scroll
 			if (_gameRef->_timer - _lastTimeV >= _scrollTimeV) {
+				int timesMissed = (_gameRef->_timer - _lastTimeV) / _scrollTimeV;
 				_lastTimeV = _gameRef->_timer;
 				if (_offsetTop < _targetOffsetTop) {
-					_offsetTop += _scrollPixelsV;
+					_offsetTop += _scrollPixelsV * timesMissed;
 					_offsetTop = MIN(_offsetTop, _targetOffsetTop);
 				} else if (_offsetTop > _targetOffsetTop) {
-					_offsetTop -= _scrollPixelsV;
+					_offsetTop -= _scrollPixelsV * timesMissed;
 					_offsetTop = MAX(_offsetTop, _targetOffsetTop);
 				}
 			}
-- 
cgit v1.2.3