aboutsummaryrefslogtreecommitdiff
path: root/engines/sci
diff options
context:
space:
mode:
authorFilippos Karapetis2010-08-07 00:22:57 +0000
committerFilippos Karapetis2010-08-07 00:22:57 +0000
commit7935ebf4a32fe340de2220c2c90f76f06c9c7472 (patch)
tree4521c1a7f3efad5bbb4edff3c1931b8bb78fabf5 /engines/sci
parentcb0aa8679828709b4a7fb8756f1d9d6685cc6b54 (diff)
downloadscummvm-rg350-7935ebf4a32fe340de2220c2c90f76f06c9c7472.tar.gz
scummvm-rg350-7935ebf4a32fe340de2220c2c90f76f06c9c7472.tar.bz2
scummvm-rg350-7935ebf4a32fe340de2220c2c90f76f06c9c7472.zip
SCI: Converted an error back into a warning when loading games
svn-id: r51816
Diffstat (limited to 'engines/sci')
-rw-r--r--engines/sci/engine/savegame.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/engines/sci/engine/savegame.cpp b/engines/sci/engine/savegame.cpp
index a7716516e7..dfc41cc56a 100644
--- a/engines/sci/engine/savegame.cpp
+++ b/engines/sci/engine/savegame.cpp
@@ -659,8 +659,10 @@ void SegManager::reconstructClones() {
CloneTable::Entry &seeker = ct->_table[j];
const Object *baseObj = getObject(seeker.getSpeciesSelector());
seeker.cloneFromObject(baseObj);
- if (!baseObj)
- error("Clone entry without a base class: %d", j);
+ if (!baseObj) {
+ // Can happen when loading some KQ6 savegames
+ warning("Clone entry without a base class: %d", j);
+ }
} // end for
} // end if
} // end for