From 0392f86001ef84963fb950068f53b114e1d62a7e Mon Sep 17 00:00:00 2001
From: Travis Howell
Date: Thu, 1 Jan 2004 05:13:17 +0000
Subject: Add hack to stop invalid opcode in French version of Simon the
 Sorcerer 1. This was a bug in original game and causes several bad effects.

svn-id: r12063
---
 simon/vga.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'simon')

diff --git a/simon/vga.cpp b/simon/vga.cpp
index 1f66a58e45..62fcadb702 100644
--- a/simon/vga.cpp
+++ b/simon/vga.cpp
@@ -128,6 +128,14 @@ void SimonEngine::run_vga_script() {
 			opcode = *_vc_ptr++;
 		}
 
+		// HACK Stop ScummVM error when Simon talks to Golum about Stew
+		// in French version of Simon the Sorcerer 1. This was a bug in
+		// the original game, which just ignored the invalid opcodes.
+		// Unfortunately causes no subtitles and a stack of wait timeouts,
+		// which also occured in original game.
+		if (!(_game & GF_SIMON2) && (_language == 2) && opcode == 207)
+			return;
+
 		if (opcode >= NUM_VIDEO_OP_CODES)
 			error("Invalid VGA opcode '%d' encountered", opcode);
 
-- 
cgit v1.2.3