[Scummvm-cvs-logs] SF.net SVN: scummvm: [30182] scummvm/branches/branch-0-11-0/engines/saga/ sfuncs.cpp

[thebluegr at users.sourceforge.net]

Revision: 30182
          http://scummvm.svn.sourceforge.net/scummvm/?rev=30182&view=rev
Author:   thebluegr
Date:     2008-01-02 23:30:35 -0800 (Wed, 02 Jan 2008)

Log Message:
-----------
(backport) Fix for bug #1861863 - "ITE: Crash when using Eeah with Eeah"

Modified Paths:
--------------
    scummvm/branches/branch-0-11-0/engines/saga/sfuncs.cpp

Modified: scummvm/branches/branch-0-11-0/engines/saga/sfuncs.cpp
===================================================================
--- scummvm/branches/branch-0-11-0/engines/saga/sfuncs.cpp	2008-01-03 07:29:13 UTC (rev 30181)
+++ scummvm/branches/branch-0-11-0/engines/saga/sfuncs.cpp	2008-01-03 07:30:35 UTC (rev 30182)
@@ -435,7 +435,11 @@
 			moduleNumber = _vm->_scene->getScriptModuleNumber();
 			break;
 		default:
-			error("Script::sfScriptDoAction wrong object type 0x%X", objectId);
+			// Unknown case, do nothing
+			// Changing this from an error to a warning should fix bug
+			// #1861863 - "ITE: Crash when using Eeah with Eeah"
+			warning("Script::sfScriptDoAction wrong object type 0x%X", objectId);
+			return;
 	}
 
 	event.type = kEvTOneshot;


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