[Scummvm-cvs-logs] scummvm master -> a38377c226c21a7746b8427058cfc8cf57d79bba

[bluegr]

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:
a38377c226 TSAGE: Fixed assert after loading a game in scene 5000 and changing scene


Commit: a38377c226c21a7746b8427058cfc8cf57d79bba
    https://github.com/scummvm/scummvm/commit/a38377c226c21a7746b8427058cfc8cf57d79bba
Author: md5 (md5 at scummvm.org)
Date: 2011-04-27T14:20:01-07:00

Commit Message:
TSAGE: Fixed assert after loading a game in scene 5000 and changing scene

Changed paths:
    engines/tsage/saveload.cpp



diff --git a/engines/tsage/saveload.cpp b/engines/tsage/saveload.cpp
index b1c66f9..3c9af87 100644
--- a/engines/tsage/saveload.cpp
+++ b/engines/tsage/saveload.cpp
@@ -181,8 +181,11 @@ Common::Error Saver::restore(int slot) {
 		// Fixes loading in scene 5000.
 		// TODO/FIXME: Add a more proper handling for these objects
 		if ((*i)->getClassName() == "PlayerMover") {
-			warning("HACK: PlayerMover object found, skipping synchronization");
-			continue;
+			warning("HACK: PlayerMover object found, removing it");
+			// Remove that object from the list
+			i = _objList.erase(i);
+			assert(i ==  _objList.end());
+			break;
 		}
 		serialiser.validate((*i)->getClassName());
 		(*i)->synchronise(serialiser);