[Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.209,1.210

[Travis Howell]

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

Modified Files:
	simon.cpp 
Log Message:

Small cleanup


Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -d -r1.209 -r1.210
--- simon.cpp	24 May 2003 03:51:33 -0000	1.209
+++ simon.cpp	24 May 2003 07:55:53 -0000	1.210
@@ -3631,10 +3631,10 @@
 	byte *dst;
 	byte *src;
 
-	if (!(_game & GF_SIMON2)) {
-		_lock_word |= 0x8000;
+	_lock_word |= 0x8000;
+	dst = dx_lock_2();
 
-		dst = dx_lock_2();
+	if (!(_game & GF_SIMON2)) {
 		dst += (x + fcs->x) * 8;
 		dst += (y * 25 + fcs->y) * _dx_surface_pitch;
 
@@ -3642,13 +3642,7 @@
 		src += READ_LE_UINT16(&((uint16 *)src)[icon]);
 
 		decompress_icon(dst, src, 24, 12, 0xE0, _dx_surface_pitch);
-
-		dx_unlock_2();
-		_lock_word &= ~0x8000;
 	} else {
-		_lock_word |= 0x8000;
-		dst = dx_lock_2();
-
 		dst += 110;
 		dst += x;
 		dst += (y + fcs->y) * _dx_surface_pitch;
@@ -3660,10 +3654,10 @@
 		src = _icon_file_ptr;
 		src += READ_LE_UINT16(&((uint16 *)src)[icon * 2 + 1]);
 		decompress_icon(dst, src, 20, 10, 0xD0, _dx_surface_pitch);
-
-		dx_unlock_2();
-		_lock_word &= ~0x8000;
 	}
+
+	dx_unlock_2();
+	_lock_word &= ~0x8000;
 }
 
 void SimonState::video_toggle_colors(HitArea * ha, byte a, byte b, byte c, byte d) {