From f5bfe8eb1160a84199fb0ba1b3c4c8cb02008c5b Mon Sep 17 00:00:00 2001
From: Gregory Montoir
Date: Sat, 19 Feb 2011 17:14:59 +0100
Subject: QUEEN: fix #1858081 - Jetty: "sign" at wrong position

Off by one error in original object trigger ; since this is
minor glitch, this patch only fixes new game state (ie. existing
savegames are still affected).
---
 engines/queen/command.cpp | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'engines')

diff --git a/engines/queen/command.cpp b/engines/queen/command.cpp
index 543cd15772..356856e940 100644
--- a/engines/queen/command.cpp
+++ b/engines/queen/command.cpp
@@ -367,6 +367,17 @@ void Command::readCommandsFrom(byte *&ptr) {
 		memset(&_cmdObject[0], 0, sizeof(CmdObject));
 		for (i = 1; i <= _numCmdObject; i++) {
 			_cmdObject[i].readFromBE(ptr);
+
+			// WORKAROUND bug #1858081: Fix an off by one error in the object
+			// command 175. Object 309 should be copied to 308 (disabled).
+			//
+			// _objectData[307].name = -195
+			// _objectData[308].name = 50
+			// _objectData[309].name = -50
+
+			if (i == 175 && _cmdObject[i].id == 320 && _cmdObject[i].dstObj == 307 && _cmdObject[i].srcObj == 309) {
+				_cmdObject[i].dstObj = 308;
+			}
 		}
 	}
 
-- 
cgit v1.2.3