[Scummvm-git-logs] scummvm master -> 866f7cbf62b2946b589ee2e441172e3c31454b71

[waltervn]

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:
866f7cbf62 ADL: Fix curPicture OB1 bug when restoring


Commit: 866f7cbf62b2946b589ee2e441172e3c31454b71
    https://github.com/scummvm/scummvm/commit/866f7cbf62b2946b589ee2e441172e3c31454b71
Author: Walter van Niftrik (walter at scummvm.org)
Date: 2016-09-16T17:04:28+02:00

Commit Message:
ADL: Fix curPicture OB1 bug when restoring

This is a regression introduced in df838f5. Fixes #9560.

Changed paths:
    engines/adl/adl.cpp



diff --git a/engines/adl/adl.cpp b/engines/adl/adl.cpp
index 9afb2c6..62f07ad 100644
--- a/engines/adl/adl.cpp
+++ b/engines/adl/adl.cpp
@@ -673,7 +673,7 @@ Common::Error AdlEngine::loadGameState(int slot) {
 	// NOTE: _state.curPicture is part of the save state in the original engine. We
 	// reconstruct it instead. This is believed to be safe for at least hires 0-2, but
 	// this may need to be re-evaluated for later games.
-	_state.curPicture = _state.rooms[_state.room].curPicture;
+	_state.curPicture = getCurRoom().curPicture;
 
 	size = inFile->readUint32BE();
 	if (size != _state.items.size())