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

sev at users.sourceforge.net sev at users.sourceforge.net
Sat Apr 21 23:29:53 CEST 2007


Revision: 26558
          http://scummvm.svn.sourceforge.net/scummvm/?rev=26558&view=rev
Author:   sev
Date:     2007-04-21 14:29:52 -0700 (Sat, 21 Apr 2007)

Log Message:
-----------
Slighty modified patch #1704979: "Fix for #1690045: ITE: Item description missing"

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

Modified: scummvm/trunk/engines/saga/script.cpp
===================================================================
--- scummvm/trunk/engines/saga/script.cpp	2007-04-21 21:23:26 UTC (rev 26557)
+++ scummvm/trunk/engines/saga/script.cpp	2007-04-21 21:29:52 UTC (rev 26558)
@@ -479,18 +479,21 @@
 
 	if (scriptEntrypointNumber > 0) {
 
-		event.type = kEvTOneshot;
-		event.code = kScriptEvent;
-		event.op = kEventExecNonBlocking;
-		event.time = 0;
-		event.param = scriptModuleNumber;
-		event.param2 = scriptEntrypointNumber;
-		event.param3 = _pendingVerb;		// Action
-		event.param4 = _pendingObject[0];	// Object
-		event.param5 = _pendingObject[1];	// With Object
-		event.param6 = (objectType == kGameObjectActor) ? _pendingObject[0] : ID_PROTAG;		// Actor
+		// WORKAROUND: Fixes bug #1690045 "ITE: Item description missing / ScummVM crash"
+		if (!(_vm->_scene->currentSceneNumber() == 278 && (_pendingObject[0] == 16419 || _pendingObject[1] == 16419))) {
+			event.type = kEvTOneshot;
+			event.code = kScriptEvent;
+			event.op = kEventExecNonBlocking;
+			event.time = 0;
+			event.param = scriptModuleNumber;
+			event.param2 = scriptEntrypointNumber;
+			event.param3 = _pendingVerb;		// Action
+			event.param4 = _pendingObject[0];	// Object
+			event.param5 = _pendingObject[1];	// With Object
+			event.param6 = (objectType == kGameObjectActor) ? _pendingObject[0] : ID_PROTAG;		// Actor
 
-		_vm->_events->queue(&event);
+			_vm->_events->queue(&event);
+		}
 
 	} else {
 		_vm->getExcuseInfo(_pendingVerb, excuseText, excuseSampleResourceId);


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




More information about the Scummvm-git-logs mailing list