[Scummvm-cvs-logs] SF.net SVN: scummvm:[51816] scummvm/trunk/engines/sci/engine/savegame.cpp

[thebluegr at users.sourceforge.net]

Revision: 51816
          http://scummvm.svn.sourceforge.net/scummvm/?rev=51816&view=rev
Author:   thebluegr
Date:     2010-08-07 00:22:57 +0000 (Sat, 07 Aug 2010)

Log Message:
-----------
SCI: Converted an error back into a warning when loading games

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/savegame.cpp

Modified: scummvm/trunk/engines/sci/engine/savegame.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/savegame.cpp	2010-08-06 23:56:19 UTC (rev 51815)
+++ scummvm/trunk/engines/sci/engine/savegame.cpp	2010-08-07 00:22:57 UTC (rev 51816)
@@ -659,8 +659,10 @@
 				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


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.