[Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.41,1.42 verb.cpp,1.4,1.5

[Oliver Kiehl]

Update of /cvsroot/scummvm/scummvm/simon
In directory usw-pr-cvs1:/tmp/cvs-serv16097

Modified Files:
	simon.cpp verb.cpp 
Log Message:
Ludde's fix for simon2 movement problem


Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- simon.cpp	31 Oct 2002 12:11:34 -0000	1.41
+++ simon.cpp	2 Nov 2002 09:23:30 -0000	1.42
@@ -2883,8 +2883,6 @@
 	uint x_diff, y_diff;
 	uint best_i = 0, best_j = 0, best_dist = 0xFFFFFFFF;
 
-/* FIXME */
-/* Causes movement problems in Simon 2 games, often unable to move left */
 	if (_game & GAME_SIMON2) {
 		x += _x_scroll * 8;
 	}

Index: verb.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/verb.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- verb.cpp	31 Oct 2002 01:27:05 -0000	1.4
+++ verb.cpp	2 Nov 2002 09:23:30 -0000	1.5
@@ -319,18 +319,18 @@
 
 void SimonState::setup_hitarea_from_pos(uint x, uint y, uint mode)
 {
-	if (_game & GAME_SIMON2) {
-		if (_bit_array[4] & 0x8000 || y < 134) {
-			x += _x_scroll * 8;
-		}
-	}
-
 	HitArea *best_ha;
 	HitArea *ha = _hit_areas;
 	uint count = ARRAYSIZE(_hit_areas);
 	uint16 layer = 0;
-	const uint16 x_ = x;
+	uint16 x_ = x;
 	const uint16 y_ = y;
+
+	if (_game & GAME_SIMON2) {
+		if (_bit_array[4] & 0x8000 || y < 134) {
+			x += _x_scroll * 8;
+		}
+	}
 
 	best_ha = NULL;