From e4a1193d22142be750e20ab0a32f03f8c11cf950 Mon Sep 17 00:00:00 2001
From: Jussi Pitkanen
Date: Fri, 17 Jun 2011 16:07:43 +0300
Subject: AGI: Add last undefined V1 test command that tests if a bit of var is
 set

Also fix skipInstruction() for V1.
---
 engines/agi/op_test.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'engines/agi/op_test.cpp')

diff --git a/engines/agi/op_test.cpp b/engines/agi/op_test.cpp
index 70d0cc0483..a99a4eafc4 100644
--- a/engines/agi/op_test.cpp
+++ b/engines/agi/op_test.cpp
@@ -155,6 +155,10 @@ void condSaid3(AgiGame *state, uint8 *p) {
 		state->testResult = true;
 }
 
+void condBit(AgiGame *state, uint8 *p) {
+	state->testResult = (getvar(p[1]) >> p[0]) & 1;
+}
+
 void condCompareStrings(AgiGame *state, uint8 *p) {
 	debugC(7, kDebugLevelScripts, "comparing [%s], [%s]", state->strings[p[0]], state->strings[p[1]]);
 	state->testResult = state->_vm->testCompareStrings(p[0], p[1]);
@@ -446,7 +450,7 @@ void AgiEngine::skipInstruction(byte op) {
 	AgiGame *state = &_game;
 	if (op >= 0xFC)
 		return;
-	if (op == 0x0E) // said
+	if (op == 0x0E && state->_vm->getVersion() >= 0x2000) // said
 		ip += *(code + ip) * 2 + 1;
 	else
 		ip += logicNamesTest[op].argumentsLength();
-- 
cgit v1.2.3