[Scummvm-cvs-logs] scummvm master -> 284b2670025d038c51a10a902b9f5d0833bcc6f0

[dreammaster]

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:
284b267002 ACCESS: Workaround Floppy room establishment reshown when loading saves


Commit: 284b2670025d038c51a10a902b9f5d0833bcc6f0
    https://github.com/scummvm/scummvm/commit/284b2670025d038c51a10a902b9f5d0833bcc6f0
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-02-03T21:21:55-05:00

Commit Message:
ACCESS: Workaround Floppy room establishment reshown when loading saves

Changed paths:
    engines/access/scripts.cpp



diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index bb28750..7c354e7 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -771,6 +771,11 @@ void Scripts::cmdSpecial() {
 	if (_specialFunction == 1) {
 		_vm->_screen->restorePalette();
 		_vm->_room->_function = FN_RELOAD;
+
+		// WORKAROUND: This fixes scene establishment being re-shown
+		// when restoring savegames in rooms which have one
+		if (_vm->getGameID() == GType_Amazon && !_vm->isCD())
+			_vm->_establishTable[p2] = true;
 	}
 }