[Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.288,1.289

Travis Howell kirben at users.sourceforge.net
Sun Aug 10 08:50:01 CEST 2003


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

Modified Files:
	simon.cpp 
Log Message:

Fix for f10 key in simon1


Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.288
retrieving revision 1.289
diff -u -d -r1.288 -r1.289
--- simon.cpp	8 Aug 2003 09:48:42 -0000	1.288
+++ simon.cpp	10 Aug 2003 15:49:06 -0000	1.289
@@ -1763,10 +1763,8 @@
 		do {
 			if (ha->id != 0 && ha->flags & 0x20 && !(ha->flags & 0x40)) {
 
-				/* XXX: add code to skip inventory and verbs area */
-
-				if (ha->y >= 0xc8)
-						continue;
+				 if (ha->y >= 0xc8 || ha->y >= _vga_var8)
+					continue;
 
 				y_ = (ha->height >> 1) - 4 + ha->y;
 
@@ -2321,6 +2319,7 @@
 		_dx_use_3_or_4_for_lock = false;
 	} else {
 		uint num_lines = _video_palette_mode == 4 ? 134 : 200;
+		_vga_var8 = num_lines;
 		dx_copy_from_attached_to_2(0, 0, 320, num_lines);
 		dx_copy_from_attached_to_3(num_lines);
 		_sync_flag_2 = 1;





More information about the Scummvm-git-logs mailing list