[Scummvm-cvs-logs] CVS: scummvm/simon charset.cpp,1.5,1.6 items.cpp,1.74,1.75 simon.cpp,1.219,1.220

Travis Howell kirben at users.sourceforge.net
Mon May 26 01:46:04 CEST 2003


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

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

Commit hack to allow simon1amiga to run, for experimenting


Index: charset.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/charset.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- charset.cpp	26 May 2003 04:25:29 -0000	1.5
+++ charset.cpp	26 May 2003 08:45:30 -0000	1.6
@@ -97,6 +97,14 @@
 			byte *img = src + READ_LE_UINT16(img_hdr);
 			byte *cur_dst = dst;
 
+			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;
+			}
+
 			assert(img_width > 0 && img_width < 50 && img_height > 0 && img_height < 50);
 
 			do {

Index: items.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/items.cpp,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -d -r1.74 -r1.75
--- items.cpp	24 May 2003 12:26:27 -0000	1.74
+++ items.cpp	26 May 2003 08:45:30 -0000	1.75
@@ -274,7 +274,12 @@
 				uint var = getVarOrByte();
 				uint value = (uint16)getVarOrWord();
 
-				writeVariable(var, _rnd.getRandomNumber(value - 1));
+				// Disable random in simon1amiga for now
+				// Since copy protection screen is currently unreadable
+				if (_game == GAME_SIMON1AMIGA)
+					writeVariable(var, 4);
+				else
+					writeVariable(var, _rnd.getRandomNumber(value - 1));
 			}
 			break;
 

Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.219
retrieving revision 1.220
diff -u -d -r1.219 -r1.220
--- simon.cpp	26 May 2003 07:35:33 -0000	1.219
+++ simon.cpp	26 May 2003 08:45:31 -0000	1.220
@@ -39,7 +39,7 @@
 static const VersionSettings simon_settings[] = {
 	// Simon the Sorcerer 1 & 2 (not SCUMM games)
 	{"simon1dos", "Simon the Sorcerer 1 for DOS", GID_SIMON_FIRST, 99, 99, 99, GAME_SIMON1DOS, "GAMEPC"},
-//	{"simon1amiga", "Simon the Sorcerer 1 for Amiga", GID_SIMON_FIRST, 99, 99, 99, GAME_SIMON1AMIGA, "gameamiga"},
+	{"simon1amiga", "Simon the Sorcerer 1 for Amiga", GID_SIMON_FIRST, 99, 99, 99, GAME_SIMON1AMIGA, "gameamiga"},
 	{"simon2dos", "Simon the Sorcerer 2 for DOS", GID_SIMON_FIRST, 99, 99, 99, GAME_SIMON2DOS, "GAME32"},
 	{"simon1talkie", "Simon the Sorcerer 1 Talkie for DOS", GID_SIMON_FIRST, 99, 99, 99, GAME_SIMON1TALKIE, "SIMON.GME"},
 	{"simon2talkie", "Simon the Sorcerer 2 Talkie for DOS", GID_SIMON_FIRST, 99, 99, 99, GAME_SIMON2TALKIE, "GSPTR30"},
@@ -4081,7 +4081,7 @@
 			sprintf(buf, "0%d.out", vga_id); 
 		} else if (_game == GAME_SIMON1AMIGA) {
 			// TODO Add support for decruncher
-			sprintf(buf, "0%d.pkd", vga_id); 
+			sprintf(buf, "0%d.pkd.out", vga_id); 
 		} else {
 			sprintf(buf, "0%d.VGA", vga_id); 
 		}
@@ -4115,7 +4115,7 @@
 			sprintf(buf, "%.3d%d.out", id >> 1, (id & 1) + 1);
 		} else if (_game == GAME_SIMON1AMIGA) {
 			// TODO Add support for decruncher
-			sprintf(buf, "%.3d%d.pkd", id >> 1, (id & 1) + 1);
+			sprintf(buf, "%.3d%d.pkd.out", id >> 1, (id & 1) + 1);
 		} else {
 			sprintf(buf, "%.3d%d.VGA", id >> 1, (id & 1) + 1);
 		}





More information about the Scummvm-git-logs mailing list