From cd2c0f2e4781e99d1521c442b674624eb9efe6e2 Mon Sep 17 00:00:00 2001
From: Travis Howell
Date: Wed, 12 Oct 2005 05:58:57 +0000
Subject: Revert last change and add a safe work around for bug.

svn-id: r19031
---
 scumm/script_v5.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'scumm')

diff --git a/scumm/script_v5.cpp b/scumm/script_v5.cpp
index 6d40de6bc9..f72d37a9ee 100644
--- a/scumm/script_v5.cpp
+++ b/scumm/script_v5.cpp
@@ -1820,9 +1820,7 @@ void ScummEngine_v5::o5_resourceRoutines() {
 		break;
 
 	default:
-		// FIXME: Reverted to a warning from an error, as per
-		// zak256 bug #1290485. This is not a proper fix. :)
-		warning("o5_resourceRoutines: default case %d", op);
+		error("o5_resourceRoutines: default case %d", op);
 	}
 }
 
@@ -2265,6 +2263,11 @@ void ScummEngine_v5::o5_startScript() {
 
 	getWordVararg(data);
 
+	// FIXME: Script 171 loads a complete room resource, instead of the actual script.
+	// Causing invalid opcode cases, see bug #1290485
+	if (_gameId == GID_ZAK256 && script == 171)
+		return;
+
 	if (!_copyProtection) {
 		// Method used by original games to skip copy protection scheme
 		if (_gameId == GID_LOOM && _currentRoom == 69 && script == 201)
-- 
cgit v1.2.3