ZVISION: Change _pausedTime to be a reference to when time was paused, instead of accumulation of time

1 files changed, 8 insertions, 7 deletions

diff --git a/engines/zvision/clock.cpp b/engines/zvision/clock.cpp
index 2324d395c3..fe322525f8 100644
--- a/engines/zvision/clock.cpp
+++ b/engines/zvision/clock.cpp
@@ -39,15 +39,14 @@ Clock::Clock(OSystem *system)
 
 void Clock::update() {
 	uint32 currentTime = _system->getMillis();
-	_deltaTime = currentTime - _lastTime - _pausedTime;
-	if (_deltaTime < 0) {
-		_deltaTime = 0;
-	}
 
+	_deltaTime = (currentTime - _lastTime);
 	if (_paused) {
-		_pausedTime += _deltaTime;
-	} else if (_pausedTime > 0) {
-		_pausedTime = 0;
+		_deltaTime -= (currentTime - _pausedTime);
+	}
+
+	if (_deltaTime < 0) {
+		_deltaTime = 0;
 	}
 
 	_lastTime = currentTime;
@@ -55,12 +54,14 @@ void Clock::update() {
 
 void Clock::start() {
 	if (_paused) {
+		_lastTime = _system->getMillis();
 		_paused = false;
 	}
 }
 
 void Clock::stop() {
 	if (!_paused) {
+		_pausedTime = _system->getMillis();
 		_paused = true;
 	}
 }