aboutsummaryrefslogtreecommitdiff
path: root/engines/saga
diff options
context:
space:
mode:
authorFilippos Karapetis2008-01-03 07:29:13 +0000
committerFilippos Karapetis2008-01-03 07:29:13 +0000
commit6ed43e7505ba452c0991a40dd3185be83768487b (patch)
tree7dd2e4afad7068ec10b7fdf6e297482180c3bca8 /engines/saga
parent6c6a2a57b512189daf9a95be3f3a363c9170f62c (diff)
downloadscummvm-rg350-6ed43e7505ba452c0991a40dd3185be83768487b.tar.gz
scummvm-rg350-6ed43e7505ba452c0991a40dd3185be83768487b.tar.bz2
scummvm-rg350-6ed43e7505ba452c0991a40dd3185be83768487b.zip
Fix for bug #1861863 - "ITE: Crash when using Eeah with Eeah"
svn-id: r30181
Diffstat (limited to 'engines/saga')
-rw-r--r--engines/saga/sfuncs.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/engines/saga/sfuncs.cpp b/engines/saga/sfuncs.cpp
index 7d6a8da403..b4bc551316 100644
--- a/engines/saga/sfuncs.cpp
+++ b/engines/saga/sfuncs.cpp
@@ -435,7 +435,11 @@ void Script::sfScriptDoAction(SCRIPTFUNC_PARAMS) {
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;