[Scummvm-cvs-logs] CVS: scummvm/simon charset.cpp,1.6,1.7 simon.cpp,1.220,1.221

Travis Howell kirben at users.sourceforge.net
Mon May 26 03:22:02 CEST 2003


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

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

Add / remove warning


Index: charset.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/charset.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- charset.cpp	26 May 2003 08:45:30 -0000	1.6
+++ charset.cpp	26 May 2003 10:21:22 -0000	1.7
@@ -100,9 +100,10 @@
 			if (_game == GAME_SIMON1AMIGA) {
 				// FIXME Really bad hack to allow simon1amiga to work for now
 				// simon1amiga needs to be decoded a different way
-				warning("img_height is %d and img_width is %d", img_height, img_width);
-				img_height = 9;
-				img_width = 7;
+				if (img_width < 1 || img_width > 49)
+					img_width = 7;
+				if (img_height < 1 || img_height > 49)
+					img_height = 9;
 			}
 
 			assert(img_width > 0 && img_width < 50 && img_height > 0 && img_height < 50);

Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.220
retrieving revision 1.221
diff -u -d -r1.220 -r1.221
--- simon.cpp	26 May 2003 08:45:31 -0000	1.220
+++ simon.cpp	26 May 2003 10:21:22 -0000	1.221
@@ -4743,6 +4743,7 @@
 		if (_game & GF_AMIGAS) {
 			if (_game != GAME_SIMON1CD32) {
 				// TODO Add support for decruncher
+				warning("playMusic - Decrunch %dtune attempt", music);
 			}
 			// TODO Add Protracker support for simon1amiga/cd32
 			warning("playMusic - Load %dtune attempt", music);





More information about the Scummvm-git-logs mailing list