From 7bef63537d385f0f8f7c80a5c9152eea7d539f24 Mon Sep 17 00:00:00 2001
From: Nicola Mettifogo
Date: Sun, 9 Dec 2007 17:29:41 +0000
Subject: 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.

svn-id: r29798
---
 engines/parallaction/exec_ns.cpp   | 4 ++++
 engines/parallaction/parser_ns.cpp | 1 -
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/parallaction/exec_ns.cpp b/engines/parallaction/exec_ns.cpp
index 1c63d78ac3..11f2209c5f 100644
--- a/engines/parallaction/exec_ns.cpp
+++ b/engines/parallaction/exec_ns.cpp
@@ -488,6 +488,10 @@ void Parallaction::displayComment(ExamineData *data) {
 	}
 
 	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;
diff --git a/engines/parallaction/parser_ns.cpp b/engines/parallaction/parser_ns.cpp
index 038a75162b..8fb01a089f 100644
--- a/engines/parallaction/parser_ns.cpp
+++ b/engines/parallaction/parser_ns.cpp
@@ -1318,7 +1318,6 @@ void Parallaction_ns::parseExamineData(Script &script, Zone *z) {
 
 		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);
-- 
cgit v1.2.3