[Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.399,1.400

Travis Howell kirben at users.sourceforge.net
Tue Dec 23 02:01:02 CET 2003


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

Modified Files:
	simon.cpp 
Log Message:

Fix inventory flashing when using F10 in Simon1 after conversation.


Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.399
retrieving revision 1.400
diff -u -d -r1.399 -r1.400
--- simon.cpp	23 Dec 2003 09:08:11 -0000	1.399
+++ simon.cpp	23 Dec 2003 10:00:51 -0000	1.400
@@ -1859,6 +1859,7 @@
 	else
 		color = 0xe1;
 
+	uint limit = (_game & GF_SIMON2) ? 200 : 134;
 
 	for (int i = 0; i < 5; i++) {
 		ha = _hit_areas;
@@ -1883,7 +1884,7 @@
 						continue;
 				}
 
-				if (ha->y >= 0xc8 || ha->y >= _vga_var8)
+				if (ha->y >= limit || ha->y >= _vga_var8)
 					continue;
 
 				y_ = (ha->height >> 1) - 4 + ha->y;
@@ -2420,7 +2421,6 @@
 			num_lines = 200;
 		else
 			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