From a38377c226c21a7746b8427058cfc8cf57d79bba Mon Sep 17 00:00:00 2001
From: md5
Date: Thu, 28 Apr 2011 00:20:01 +0300
Subject: TSAGE: Fixed assert after loading a game in scene 5000 and changing
 scene

---
 engines/tsage/saveload.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/engines/tsage/saveload.cpp b/engines/tsage/saveload.cpp
index b1c66f944c..3c9af877ad 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);
-- 
cgit v1.2.3