Skip to content

Commit de883aa

Browse files
committed
KYRA: (EOB) - fix regression
(crash when trying to import original saves)
1 parent 4edb3f2 commit de883aa

1 file changed

Lines changed: 4 additions & 0 deletions

File tree

‎engines/kyra/gui/saveload_eob.cpp‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -841,6 +841,8 @@ Common::String EoBCoreEngine::readOriginalSaveFile(const Common::Path &file) {
841841
_itemInHand = in.readSint16();
842842
_hasTempDataFlags = (_flags.gameID == GI_EOB1) ? in.readUint16() : in.readUint32();
843843
_partyEffectFlags = (_flags.gameID == GI_EOB1) ? in.readUint16() : in.readUint32();
844+
_hasTempDataMapFlags = 0;
845+
844846
if (_partyEffectFlags && _flags.gameID == GI_EOB1) {
845847
// Spell effect flags are completely different in EOB I. We only use EOB II style flags in ScummVM.
846848
// Doesn't matter much, since these are only temporary spell effects.
@@ -890,6 +892,7 @@ Common::String EoBCoreEngine::readOriginalSaveFile(const Common::Path &file) {
890892
releaseMonsterTempData(_lvlTempData[i]);
891893
releaseFlyingObjectTempData(_lvlTempData[i]);
892894
releaseWallOfForceTempData(_lvlTempData[i]);
895+
releaseAutoMapTempData(_lvlTempData[i]);
893896
delete _lvlTempData[i];
894897
}
895898

@@ -905,6 +908,7 @@ Common::String EoBCoreEngine::readOriginalSaveFile(const Common::Path &file) {
905908
l->wallsOfForce = lw;
906909
uint8 *d = new uint8[4096];
907910
l->wallsXorData = d;
911+
l->automapExploreState = nullptr;
908912

909913
if (sourcePlatform == Common::kPlatformFMTowns) {
910914
in.read(d, 4096);

0 commit comments

Comments
 (0)