From 6ed43e7505ba452c0991a40dd3185be83768487b Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Thu, 3 Jan 2008 07:29:13 +0000
Subject: Fix for bug #1861863 - "ITE: Crash when using Eeah with Eeah"

svn-id: r30181
---
 engines/saga/sfuncs.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'engines/saga')

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;
-- 
cgit v1.2.3