[Scummvm-cvs-logs] SF.net SVN: scummvm: [26737] scummvm/trunk/engines/saga/script.cpp

[thebluegr at users.sourceforge.net]

Revision: 26737
          http://scummvm.svn.sourceforge.net/scummvm/?rev=26737&view=rev
Author:   thebluegr
Date:     2007-05-02 14:39:56 -0700 (Wed, 02 May 2007)

Log Message:
-----------
SAGA: Modified a workaround made for ITE to work in ITE only

Modified Paths:
--------------
    scummvm/trunk/engines/saga/script.cpp

Modified: scummvm/trunk/engines/saga/script.cpp
===================================================================
--- scummvm/trunk/engines/saga/script.cpp	2007-05-02 20:05:48 UTC (rev 26736)
+++ scummvm/trunk/engines/saga/script.cpp	2007-05-02 21:39:56 UTC (rev 26737)
@@ -480,7 +480,7 @@
 	if (scriptEntrypointNumber > 0) {
 
 		// WORKAROUND: Fixes bug #1690045 "ITE: Item description missing / ScummVM crash"
-		if (!(_vm->_scene->currentSceneNumber() == 278 && (_pendingObject[0] == 16419 || _pendingObject[1] == 16419))) {
+		if (!(_vm->_scene->currentSceneNumber() == 278 && (_pendingObject[0] == 16419 || _pendingObject[1] == 16419) && _vm->getGameType() == GType_ITE)) {
 			event.type = kEvTOneshot;
 			event.code = kScriptEvent;
 			event.op = kEventExecNonBlocking;


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