[Scummvm-git-logs] scummvm master -> 6a79a23a6765e7c3c54fbefe60cec42fa337196a

[eriktorbjorn]

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:
33e4c56521 SCUMM: Don't try to apply workarounds to unloaded resources...
6a79a23a67 NEWS: Mention fix for HE games crashing when loading savegames


Commit: 33e4c565214d42cd7ddfe26e02aaef65aaa4d470
    https://github.com/scummvm/scummvm/commit/33e4c565214d42cd7ddfe26e02aaef65aaa4d470
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2021-11-29T07:25:33+01:00

Commit Message:
SCUMM: Don't try to apply workarounds to unloaded resources...

...because ScummVM will crash trying to do so.

This was discovered in bugs #13111 and #13113, where loading a HE
savegame does not load sound resource 1 but still tried to apply
workarounds to it. I don't know if this is the only case.

Changed paths:
    engines/scumm/resource.cpp


diff --git a/engines/scumm/resource.cpp b/engines/scumm/resource.cpp
index 9f1b4dd4e8..6823a2bb7e 100644
--- a/engines/scumm/resource.cpp
+++ b/engines/scumm/resource.cpp
@@ -1651,6 +1651,12 @@ const char *nameOfResType(ResType type) {
 }
 
 void ScummEngine::applyWorkaroundIfNeeded(ResType type, int idx) {
+	// The resource isn't always loaded into memory, in which case no
+	// workaround is needed. This happens when loading some HE savegames
+	// where sound resource 1 isn't loaded. Possibly other cases as well.
+	if (!_res->isResourceLoaded(type, idx))
+		return;
+
 	int size = getResourceSize(type, idx);
 
 	// WORKAROUND: FM-TOWNS Zak used the extra 40 pixels at the bottom to increase the inventory to 10 items


Commit: 6a79a23a6765e7c3c54fbefe60cec42fa337196a
    https://github.com/scummvm/scummvm/commit/6a79a23a6765e7c3c54fbefe60cec42fa337196a
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2021-11-29T07:30:55+01:00

Commit Message:
NEWS: Mention fix for HE games crashing when loading savegames

Changed paths:
    NEWS.md


diff --git a/NEWS.md b/NEWS.md
index 9ff36495d9..2f9dcadc94 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -36,6 +36,7 @@ For a more comprehensive changelog of the latest experimental code, see:
    - New Digital iMUSE engine.
    - Improved support for the high-resolution text in the 16-color Macintosh
      versions of Loom and Indiana Jones and the Last Crusade.
+   - Fixed crash when loading savegames from Humongous Entertainment games.
 
  Xeen:
    - Fix crash on startup loading constants from xeen.ccs.