[Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.45,1.46 simonitems.cpp,1.4,1.5

[James Brown]

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

Modified Files:
	simon.cpp simonitems.cpp 
Log Message:
Apply three patches:

593567 [painelf]: Fix SNM inventory icon centering, it's an actor
593444 [wjp and eriktorbjorn]: Simon2 lockup fix
593455 [wjp]: Simon2 map fix




Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- simon.cpp	4 Aug 2002 13:25:06 -0000	1.45
+++ simon.cpp	11 Aug 2002 09:05:30 -0000	1.46
@@ -3432,8 +3432,10 @@
 
 	_lock_word |= 0x40;
 
-	if (has_vgastruct_with_id(vga_struct_id, vga_res))
+	if (has_vgastruct_with_id(vga_struct_id, vga_res)) {
+		_lock_word &= ~0x40;
 		return;
+	}
 
 	vsp = _vga_sprites;
 	while (vsp->id != 0)

Index: simonitems.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simonitems.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- simonitems.cpp	4 Aug 2002 13:25:06 -0000	1.4
+++ simonitems.cpp	11 Aug 2002 09:05:30 -0000	1.5
@@ -1601,7 +1601,7 @@
 	uint16 items[2];
 
 	items[0] = TO_BE_16(a);
-	items[1] = TO_BE_16(a);
+	items[1] = TO_BE_16(b);
 
 	_lock_word |= 0x4000;
 	_vc_ptr = (byte *)&items;