[Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.414,1.415 vga.cpp,1.111,1.112

Travis Howell kirben at users.sourceforge.net
Tue Jan 27 09:43:11 CET 2004


Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7616/simon

Modified Files:
	simon.cpp vga.cpp 
Log Message:

Avoid glitch if Simon1 introduction is skipped when showing Simon' room segment.


Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.414
retrieving revision 1.415
diff -u -d -r1.414 -r1.415
--- simon.cpp	26 Jan 2004 07:42:58 -0000	1.414
+++ simon.cpp	27 Jan 2004 13:33:17 -0000	1.415
@@ -2423,7 +2423,7 @@
 	} else {
 		// Allow one section of Simon the Sorcerer 1 introduction to be displayed
 		// in lower half of screen
-		if (_subroutine == 2926)
+		if (_subroutine == 2923 || _subroutine == 2926)
 			num_lines = 200;
 		else
 			num_lines = _video_palette_mode == 4 ? 134 : 200;

Index: vga.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/vga.cpp,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -d -r1.111 -r1.112
--- vga.cpp	6 Jan 2004 12:45:31 -0000	1.111
+++ vga.cpp	27 Jan 2004 13:33:21 -0000	1.112
@@ -1776,7 +1776,7 @@
 
 		// Allow one section of Simon the Sorcerer 1 introduction to be displayed
 		// in lower half of screen
-		if (!(_game & GF_SIMON2) && _subroutine == 2926)
+		if (!(_game & GF_SIMON2) && (_subroutine == 2923 || _subroutine == 2926))
 			dx_clear_surfaces(200);
 		else
 			dx_clear_surfaces(_video_palette_mode == 4 ? 134 : 200);





More information about the Scummvm-git-logs mailing list