From a57263fa0a456578639d85a4c393e7e19c685b53 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Mon, 28 Jul 2003 11:48:07 +0000
Subject: unification

svn-id: r9242
---
 simon/vga.cpp | 27 ++++++++++-----------------
 1 file changed, 10 insertions(+), 17 deletions(-)

(limited to 'simon')

diff --git a/simon/vga.cpp b/simon/vga.cpp
index 9d9e3d9711..27c417a775 100644
--- a/simon/vga.cpp
+++ b/simon/vga.cpp
@@ -1071,24 +1071,17 @@ void SimonEngine::vc_20_set_code_word() {
 
 /* FIXME: unaligned access */
 void SimonEngine::vc_21_jump_if_code_word() {
-	if (!(_game & GF_SIMON2)) {
-		int16 a = vc_read_next_word();
-		byte *tmp = _vc_ptr + a;
-		uint16 val = read_16_le(tmp + 4);
-
-		if (val != 0) {
-			write_16_le(tmp + 4, val - 1);
-			_vc_ptr = tmp + 6;
-		}
-	} else {
-		int16 a = vc_read_next_word();
-		byte *tmp = _vc_ptr + a;
-		uint16 val = read_16_le(tmp + 3);
+	int16 a = vc_read_next_word();
+	byte *tmp = _vc_ptr + a;
+	if (_game & GF_SIMON2)
+		tmp += 3;
+	else
+		tmp += 4;
 
-		if (val != 0) {
-			write_16_le(tmp + 3, val - 1);
-			_vc_ptr = tmp + 5;
-		}
+	uint16 val = read_16_le(tmp);
+	if (val != 0) {
+		write_16_le(tmp, val - 1);
+		_vc_ptr = tmp + 2;
 	}
 }
 
-- 
cgit v1.2.3