[Scummvm-git-logs] scummvm master -> de883aae4fa94dc4cdc751e5f714d01416be42ff
athrxx
noreply at scummvm.org
Sun Aug 30 21:42:24 UTC 2026
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
de883aae4f KYRA: (EOB) - fix regression
Commit: de883aae4fa94dc4cdc751e5f714d01416be42ff
https://github.com/scummvm/scummvm/commit/de883aae4fa94dc4cdc751e5f714d01416be42ff
Author: athrxx (athrxx at scummvm.org)
Date: 2026-08-30T23:41:20+02:00
Commit Message:
KYRA: (EOB) - fix regression
(crash when trying to import original saves)
Changed paths:
engines/kyra/gui/saveload_eob.cpp
diff --git a/engines/kyra/gui/saveload_eob.cpp b/engines/kyra/gui/saveload_eob.cpp
index 332c70fe8aa..c7f367ccff3 100644
--- a/engines/kyra/gui/saveload_eob.cpp
+++ b/engines/kyra/gui/saveload_eob.cpp
@@ -841,6 +841,8 @@ Common::String EoBCoreEngine::readOriginalSaveFile(const Common::Path &file) {
_itemInHand = in.readSint16();
_hasTempDataFlags = (_flags.gameID == GI_EOB1) ? in.readUint16() : in.readUint32();
_partyEffectFlags = (_flags.gameID == GI_EOB1) ? in.readUint16() : in.readUint32();
+ _hasTempDataMapFlags = 0;
+
if (_partyEffectFlags && _flags.gameID == GI_EOB1) {
// Spell effect flags are completely different in EOB I. We only use EOB II style flags in ScummVM.
// Doesn't matter much, since these are only temporary spell effects.
@@ -890,6 +892,7 @@ Common::String EoBCoreEngine::readOriginalSaveFile(const Common::Path &file) {
releaseMonsterTempData(_lvlTempData[i]);
releaseFlyingObjectTempData(_lvlTempData[i]);
releaseWallOfForceTempData(_lvlTempData[i]);
+ releaseAutoMapTempData(_lvlTempData[i]);
delete _lvlTempData[i];
}
@@ -905,6 +908,7 @@ Common::String EoBCoreEngine::readOriginalSaveFile(const Common::Path &file) {
l->wallsOfForce = lw;
uint8 *d = new uint8[4096];
l->wallsXorData = d;
+ l->automapExploreState = nullptr;
if (sourcePlatform == Common::kPlatformFMTowns) {
in.read(d, 4096);
More information about the Scummvm-git-logs
mailing list