aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormd52011-04-28 00:20:01 +0300
committermd52011-04-28 00:20:01 +0300
commita38377c226c21a7746b8427058cfc8cf57d79bba (patch)
tree5ed1c5035661bbe2b63a77886cf5875a4dec0a51
parent801c27bd224f20370e152372941510964a85a6c3 (diff)
downloadscummvm-rg350-a38377c226c21a7746b8427058cfc8cf57d79bba.tar.gz
scummvm-rg350-a38377c226c21a7746b8427058cfc8cf57d79bba.tar.bz2
scummvm-rg350-a38377c226c21a7746b8427058cfc8cf57d79bba.zip
TSAGE: Fixed assert after loading a game in scene 5000 and changing scene
-rw-r--r--engines/tsage/saveload.cpp7
1 files 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);