[Scummvm-cvs-logs] SF.net SVN: scummvm:[50363] scummvm/trunk/engines/parallaction/exec_br.cpp

[peres001 at users.sourceforge.net]

Revision: 50363
          http://scummvm.svn.sourceforge.net/scummvm/?rev=50363&view=rev
Author:   peres001
Date:     2010-06-27 04:58:48 +0000 (Sun, 27 Jun 2010)

Log Message:
-----------
Prevent execution of the STOP script command when its Zone does not exist. Patch #3021744 by fuzzie with some comments.

Modified Paths:
--------------
    scummvm/trunk/engines/parallaction/exec_br.cpp

Modified: scummvm/trunk/engines/parallaction/exec_br.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/exec_br.cpp	2010-06-27 04:32:31 UTC (rev 50362)
+++ scummvm/trunk/engines/parallaction/exec_br.cpp	2010-06-27 04:58:48 UTC (rev 50363)
@@ -527,6 +527,11 @@
 
 DECLARE_INSTRUCTION_OPCODE(stop) {
 	ZonePtr z = ctxt._inst->_z;
+	
+	// Prevent execution if zone is missing. The known case is "PART2/insegui.scr", which has 
+	// "STOP insegui", which doesn't exist (see ticket #3021744 for the gory details)
+	if (!z) return;
+	
 	if (ACTIONTYPE(z) == kZoneHear) {
 		warning("Parallaction_br::instOp_stop not yet implemented for HEAR zones");
 		// TODO: stop music or sound effects generated by a zone.


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