[Scummvm-cvs-logs] CVS: scummvm/simon vga.cpp,1.72,1.73

[Max Horn]

Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1:/tmp/cvs-serv25542/simon

Modified Files:
	vga.cpp 
Log Message:
unification

Index: vga.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/vga.cpp,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -d -r1.72 -r1.73
--- vga.cpp	21 Jul 2003 04:00:04 -0000	1.72
+++ vga.cpp	28 Jul 2003 11:48:07 -0000	1.73
@@ -1071,24 +1071,17 @@
 
 /* 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;
 	}
 }