[Scummvm-cvs-logs] scummvm master -> 0223742a5a0e834700b3434a47eacac0be49c6fb

[athrxx]

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:
0223742a5a KYRA: (EOB) - fix original savefile import


Commit: 0223742a5a0e834700b3434a47eacac0be49c6fb
    https://github.com/scummvm/scummvm/commit/0223742a5a0e834700b3434a47eacac0be49c6fb
Author: athrxx (athrxx at scummvm.org)
Date: 2013-04-23T14:55:31-07:00

Commit Message:
KYRA: (EOB) - fix original savefile import

(some monsters were not properly assigned to their spots)

Changed paths:
    engines/kyra/saveload_eob.cpp



diff --git a/engines/kyra/saveload_eob.cpp b/engines/kyra/saveload_eob.cpp
index 1e5b40a..aa22341 100644
--- a/engines/kyra/saveload_eob.cpp
+++ b/engines/kyra/saveload_eob.cpp
@@ -768,6 +768,7 @@ Common::String EoBCoreEngine::readOriginalSaveFile(Common::String &file) {
 		l->flags = new uint16[1024];
 		memset(l->flags, 0, 1024 * sizeof(uint16));
 		EoBMonsterInPlay *lm = new EoBMonsterInPlay[30];
+		memset(lm, 0, 30 * sizeof(EoBMonsterInPlay));
 		l->monsters = lm;
 		EoBFlyingObject *lf = new EoBFlyingObject[_numFlyingObjects];
 		memset(lf, 0, _numFlyingObjects * sizeof(EoBFlyingObject));
@@ -826,7 +827,7 @@ Common::String EoBCoreEngine::readOriginalSaveFile(Common::String &file) {
 				m->sub = in.readByte();
 			}
 
-			_levelBlockProperties[m->block].flags++;
+			l->flags[m->block]++;
 		}
 
 		if (_flags.gameID == GI_EOB1)