[Scummvm-cvs-logs] scummvm master -> 4e9e2f4feadebbe34b54bbd56b2d34f5a2e165ac

[clone2727]

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:
4e9e2f4fea PEGASUS: Fix possible timer "skip" when resuming


Commit: 4e9e2f4feadebbe34b54bbd56b2d34f5a2e165ac
    https://github.com/scummvm/scummvm/commit/4e9e2f4feadebbe34b54bbd56b2d34f5a2e165ac
Author: Matthew Hoops (clone2727 at gmail.com)
Date: 2013-07-20T20:06:36-07:00

Commit Message:
PEGASUS: Fix possible timer "skip" when resuming

pause/resume need to treat things a bit differently from the normal setRate function. This caused a jump in a timer when resuming from the pause menu in certain cases, though not all the time.

Regression from b50cac637ece07c87e39232a1e8fe7262ace06f2, which was part of the fix for the lid animations.

Changed paths:
    engines/pegasus/timers.cpp



diff --git a/engines/pegasus/timers.cpp b/engines/pegasus/timers.cpp
index 50cc9bc..8463d86 100644
--- a/engines/pegasus/timers.cpp
+++ b/engines/pegasus/timers.cpp
@@ -115,7 +115,7 @@ void TimeBase::stop() {
 void TimeBase::pause() {
 	if (isRunning() && !_paused) {
 		_pausedRate = getRate();
-		stop();
+		_rate = 0;
 		_paused = true;
 		_pauseStart = g_system->getMillis();
 	}
@@ -123,7 +123,7 @@ void TimeBase::pause() {
 
 void TimeBase::resume() {
 	if (_paused) {
-		setRate(_pausedRate);
+		_rate = _pausedRate;
 		_paused = false;
 
 		if (isRunning())