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

[peres001 at users.sourceforge.net]

Revision: 29798
          http://scummvm.svn.sourceforge.net/scummvm/?rev=29798&view=rev
Author:   peres001
Date:     2007-12-09 09:29:41 -0800 (Sun, 09 Dec 2007)

Log Message:
-----------
Going back to uncached mode for graphics resources of Examine zones. This prevents engine to crash when trying to cache a resource out of the currently selected archive.

Modified Paths:
--------------
    scummvm/trunk/engines/parallaction/exec_ns.cpp
    scummvm/trunk/engines/parallaction/parser_ns.cpp

Modified: scummvm/trunk/engines/parallaction/exec_ns.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/exec_ns.cpp	2007-12-09 17:28:29 UTC (rev 29797)
+++ scummvm/trunk/engines/parallaction/exec_ns.cpp	2007-12-09 17:29:41 UTC (rev 29798)
@@ -488,6 +488,10 @@
 	}
 
 	if (data->_filename) {
+        if (data->_cnv == 0) {
+            data->_cnv = _disk->loadStatic(data->_filename);
+        }
+
 		_gfx->setHalfbriteMode(true);
 		_gfx->setDialogueBalloon(data->_description, 0, 90, 130, 0, 0);
 		Common::Rect r;

Modified: scummvm/trunk/engines/parallaction/parser_ns.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/parser_ns.cpp	2007-12-09 17:28:29 UTC (rev 29797)
+++ scummvm/trunk/engines/parallaction/parser_ns.cpp	2007-12-09 17:29:41 UTC (rev 29798)
@@ -1318,7 +1318,6 @@
 
 		if (!scumm_stricmp(_tokens[0], "file")) {
 			data->_filename = strdup(_tokens[1]);
-			data->_cnv = _disk->loadStatic(_tokens[1]);
 		}
 		if (!scumm_stricmp(_tokens[0], "desc")) {
 			data->_description = parseComment(script);


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