[Scummvm-git-logs] scummvm master -> 55dd09980419cef2ce03ec6a2587fb783a503a4a

[neuromancer]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
eda940cc3e FREESCAPE: fixed save/load crash affecting driller amiga/atari releases
55dd099804 FREESCAPE: removed mouse locking when save/load games


Commit: eda940cc3e691e92b0238968775c05b033fdc5fc
    https://github.com/scummvm/scummvm/commit/eda940cc3e691e92b0238968775c05b033fdc5fc
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2022-12-16T08:14:33-03:00

Commit Message:
FREESCAPE: fixed save/load crash affecting driller amiga/atari releases

Changed paths:
    engines/freescape/games/driller.cpp


diff --git a/engines/freescape/games/driller.cpp b/engines/freescape/games/driller.cpp
index c843e89aef1..365aa913ec0 100644
--- a/engines/freescape/games/driller.cpp
+++ b/engines/freescape/games/driller.cpp
@@ -933,7 +933,9 @@ bool DrillerEngine::checkIfGameEnded() {
 }
 
 Common::Error DrillerEngine::saveGameStreamExtended(Common::WriteStream *stream, bool isAutosave) {
-	for (auto &it : _areaMap) {
+	for (auto &it : _areaMap) { // All but skip area 255
+		if (it._key == 255)
+			continue;
 		stream->writeUint16LE(it._key);
 		stream->writeUint32LE(_drilledAreas[it._key]);
 	}
@@ -942,10 +944,9 @@ Common::Error DrillerEngine::saveGameStreamExtended(Common::WriteStream *stream,
 }
 
 Common::Error DrillerEngine::loadGameStreamExtended(Common::SeekableReadStream *stream) {
-	for (uint i = 0; i < _areaMap.size(); i++) {
+	for (uint i = 0; i < _areaMap.size() - 1; i++) { // All except area 255
 		uint16 key = stream->readUint16LE();
-		if (key == 255)
-			continue;
+		assert(key != 255);
 		assert(_areaMap.contains(key));
 		_drilledAreas[key] = stream->readUint32LE();
 		if (_drilledAreas[key] == kDrillerNoRig)


Commit: 55dd09980419cef2ce03ec6a2587fb783a503a4a
    https://github.com/scummvm/scummvm/commit/55dd09980419cef2ce03ec6a2587fb783a503a4a
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2022-12-16T08:14:33-03:00

Commit Message:
FREESCAPE: removed mouse locking when save/load games

Changed paths:
    engines/freescape/freescape.cpp


diff --git a/engines/freescape/freescape.cpp b/engines/freescape/freescape.cpp
index 3824c72f5ea..00dd9748c6d 100644
--- a/engines/freescape/freescape.cpp
+++ b/engines/freescape/freescape.cpp
@@ -393,9 +393,7 @@ void FreescapeEngine::processInput() {
 			case Common::KEYCODE_ESCAPE:
 				_savedScreen = _gfx->getScreenshot();
 				_gfx->setViewport(_fullscreenViewArea);
-				_system->lockMouse(false);
 				openMainMenuDialog();
-				_system->lockMouse(true);
 				_gfx->setViewport(_viewArea);
 				_savedScreen->free();
 				delete _savedScreen;