[Scummvm-cvs-logs] scummvm master -> 131dcb0aad42359a78db75d383c2cc6fc550c55f

bgK bastien.bouclet at gmail.com
Tue Jul 8 20:27:33 CEST 2014


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:
131dcb0aad MOHAWK: Reset some Myst state variables as per the original


Commit: 131dcb0aad42359a78db75d383c2cc6fc550c55f
    https://github.com/scummvm/scummvm/commit/131dcb0aad42359a78db75d383c2cc6fc550c55f
Author: Bastien Bouclet (bastien.bouclet at gmail.com)
Date: 2014-07-08T20:13:29+02:00

Commit Message:
MOHAWK: Reset some Myst state variables as per the original

This fixes a bug where the player could be stuck on Channelwood's
lower level with the elevator on the upper level.

This also turns the light off on Stoneship when entering the age,
since the battery is depleted.

Thanks to dtungsten for submitting this fix in PR#478.

Changed paths:
    engines/mohawk/myst_stacks/stoneship.cpp
    engines/mohawk/myst_state.cpp



diff --git a/engines/mohawk/myst_stacks/stoneship.cpp b/engines/mohawk/myst_stacks/stoneship.cpp
index 710c36a..d8dbeef 100644
--- a/engines/mohawk/myst_stacks/stoneship.cpp
+++ b/engines/mohawk/myst_stacks/stoneship.cpp
@@ -42,6 +42,7 @@ Stoneship::Stoneship(MohawkEngine_Myst *vm) :
 
 	_tunnelRunning = false;
 
+	_state.lightState = 0;
 	_state.generatorDepletionTime = 0;
 	_state.generatorDuration = 0;
 	_cabinMystBookPresent = 0;
diff --git a/engines/mohawk/myst_state.cpp b/engines/mohawk/myst_state.cpp
index d07aa9d..3e54017 100644
--- a/engines/mohawk/myst_state.cpp
+++ b/engines/mohawk/myst_state.cpp
@@ -100,6 +100,9 @@ bool MystGameState::load(const Common::String &filename) {
 	syncGameState(s, size == 664);
 	delete loadFile;
 
+	// Set Channelwood elevator state to down, because we start on the lower level
+	_channelwood.elevatorState = 0;
+
 	// Switch us back to the intro stack, to the linking book
 	_vm->changeToStack(kIntroStack, 5, 0, 0);
 






More information about the Scummvm-git-logs mailing list