[Scummvm-cvs-logs] scummvm master -> a1a63546879927c6316165f86dfe61dfb13cb376

[somaen]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
a1a6354687 WINTERMUTE: Don't scroll as fast as the scripts actually ask for.


Commit: a1a63546879927c6316165f86dfe61dfb13cb376
    https://github.com/scummvm/scummvm/commit/a1a63546879927c6316165f86dfe61dfb13cb376
Author: Einar Johan Trøan Sømåen (einarjohants at gmail.com)
Date: 2013-01-24T07:12:35-08:00

Commit Message:
WINTERMUTE: Don't scroll as fast as the scripts actually ask for.

Changed paths:
    engines/wintermute/ad/ad_scene.cpp



diff --git a/engines/wintermute/ad/ad_scene.cpp b/engines/wintermute/ad/ad_scene.cpp
index 213d556..526e080 100644
--- a/engines/wintermute/ad/ad_scene.cpp
+++ b/engines/wintermute/ad/ad_scene.cpp
@@ -933,6 +933,10 @@ bool AdScene::traverseNodes(bool doUpdate) {
 			// adjust horizontal scroll
 			if (_gameRef->_timer - _lastTimeH >= _scrollTimeH) {
 				int timesMissed = (_gameRef->_timer - _lastTimeH) / _scrollTimeH;
+				// Cap the amount of catch-up to avoid jittery characters.
+				if (timesMissed > 2) {
+					timesMissed = 2;
+				}
 				_lastTimeH = _gameRef->_timer;
 				if (_offsetLeft < _targetOffsetLeft) {
 					_offsetLeft += _scrollPixelsH * timesMissed;
@@ -946,6 +950,10 @@ bool AdScene::traverseNodes(bool doUpdate) {
 			// adjust vertical scroll
 			if (_gameRef->_timer - _lastTimeV >= _scrollTimeV) {
 				int timesMissed = (_gameRef->_timer - _lastTimeV) / _scrollTimeV;
+				// Cap the amount of catch-up to avoid jittery characters.
+				if (timesMissed > 2) {
+					timesMissed = 2;
+				}
 				_lastTimeV = _gameRef->_timer;
 				if (_offsetTop < _targetOffsetTop) {
 					_offsetTop += _scrollPixelsV * timesMissed;