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

[digitall]

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:
d335b78003 DREAMWEB: Fix minor regression with Ryan's watch.


Commit: d335b78003f3d28d1c9c9aeddf6a46ad1c5f4888
    https://github.com/scummvm/scummvm/commit/d335b78003f3d28d1c9c9aeddf6a46ad1c5f4888
Author: D G Turner (digitall at scummvm.org)
Date: 2012-06-30T22:20:53-07:00

Commit Message:
DREAMWEB: Fix minor regression with Ryan's watch.

Using Ryan's watch within the game, the watch time always started at
19.30 from point of use, which did not seem correct.

Checking with the original CD and Floppy interpreters under DOSBox
showed they used the current system time, so this was incorrect.

Bisection shows that this regression was introduced by commit
57e940f67896e0f085de23088754fe1682cd49db i.e. "DREAMWEB: Move all saved
variables to a GameVars struct" and was probably a side effect of a
minor call ordering change in the equivalent of setupInitialVars()
with respect to the getTime() call.

However, to ensure no further regressions, it was easier to fix this
by replacing the initial value setting by a getTime() call.

Changed paths:
    engines/dreamweb/stubs.cpp



diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 4515939..f235f7c 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -2920,9 +2920,7 @@ void DreamWebEngine::setupInitialVars() {
 	_vars._progressPoints = 0;
 	_vars._watchOn = 0;
 	_vars._shadesOn = 0;
-	_vars._secondCount = 0;
-	_vars._minuteCount = 30;
-	_vars._hourCount = 19;
+	getTime();
 	_vars._zoomOn = 1;
 	_vars._location = 0;
 	_vars._exPos = 0;