[Scummvm-cvs-logs] CVS: scummvm/scumm gfx.cpp,2.386,2.387 resource.cpp,1.289,1.290 script_v7he.cpp,2.124,2.125 scumm.cpp,1.313,1.314

[Eugene Sandulenko]

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

Modified Files:
	gfx.cpp resource.cpp script_v7he.cpp scumm.cpp 
Log Message:
o Added few targets
  * baseball2003 and Soccer2004 use Bink videos but just for intro movies and
    logos, so we may add them.
  * artdemo and readdemo also use Bink, but seems that additionally it uses
    them in cutscenes, but since there are just few of them, not like in
    full games, we may try to look at them too
  * SoccerMLS is (alsmost) working. It runs the intro, shows menu, lets
    to select from it but then fails at some Wiz stuff and there is no
    hotspots to choose. I think it may be related to overall HE99 problem
    with inventory where there is a bug preventing from item selection
o baseball2003 and Soccer2004 featured new LECF index block. Add stub for it
o SoccerMLS used kernelSetFunction 2001 in intro. add stub for it
o Alternative russian freddi3 uses badly formatted logo substitution in intro,
  so error() in default case in Gdi::drawBMAPBg() was replaced with warning().


Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 2.386
retrieving revision 2.387
diff -u -d -r2.386 -r2.387
--- gfx.cpp	1 Jan 2005 16:09:13 -0000	2.386
+++ gfx.cpp	2 Feb 2005 00:30:50 -0000	2.387
@@ -1405,7 +1405,8 @@
 		fill((byte *)vs->backBuf, vs->pitch, *bmap_ptr, vs->w, vs->h);
 		break;
 	default:
-		error("Gdi::drawBMAPBg: default case %d", code);
+		// Alternayive russian freddi3 uses badly formatted bitmaps
+		warning("Gdi::drawBMAPBg: default case %d", code);
 	}
 
 	copyVirtScreenBuffers(Common::Rect(vs->w, vs->h));

Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource.cpp,v
retrieving revision 1.289
retrieving revision 1.290
diff -u -d -r1.289 -r1.290
--- resource.cpp	29 Jan 2005 17:57:57 -0000	1.289
+++ resource.cpp	2 Feb 2005 00:31:42 -0000	1.290
@@ -476,6 +476,11 @@
 			readArrayFromIndexFile();
 			break;
 
+		case MKID('LECF'):
+			_fileHandle.seek(itemsize - 8, SEEK_CUR);
+			debug(2, "LECF index block not yet handled, skipping");
+			break;
+
 		default:
 			error("Bad ID %04X('%s') found in index file directory!", blocktype,
 					tag2str(blocktype));

Index: script_v7he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v7he.cpp,v
retrieving revision 2.124
retrieving revision 2.125
diff -u -d -r2.124 -r2.125
--- script_v7he.cpp	1 Jan 2005 16:09:16 -0000	2.124
+++ script_v7he.cpp	2 Feb 2005 00:31:56 -0000	2.125
@@ -790,6 +790,10 @@
 		break;
 	case 714:
 		break;
+	case 2001:
+		// Used in SoccerMLS
+		warning("o70_kernelSetFunctions: unhandled case 2001");
+		break;
 	default:
 		error("o70_kernelSetFunctions: default case %d (param count %d)", args[0], num);
 	}

Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.313
retrieving revision 1.314
diff -u -d -r1.313 -r1.314
--- scumm.cpp	1 Feb 2005 04:58:14 -0000	1.313
+++ scumm.cpp	2 Feb 2005 00:32:02 -0000	1.314
@@ -366,6 +366,13 @@
 	 GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0, 0},
 	{"footdemo", "Backyard Football 2002 (Demo)", GID_HEGAME, 6, 99, 61, MDT_NONE,
 	 GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0, 0},
+	{"SoccerMLS", "Backyard Soccer MLS Edition", GID_HEGAME, 6, 99, 61, MDT_NONE,
+	 GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0, 0},
+
+	{"artdemo", "Blue's Art Time Activities (Demo)", GID_HEGAME, 6, 99, 61, MDT_NONE,
+	 GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0, 0},
+	{"readdemo", "Blue's Reading Time Activities (Demo)", GID_HEGAME, 6, 99, 61, MDT_NONE,
+	 GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0, 0},
 
 	// Humongous Entertainment Scumm Version ?
 	{"Football2002", "Backyard Football 2002 (Demo)", GID_HEGAME, 6, 100, 61, MDT_NONE,
@@ -381,6 +388,11 @@
 	{"PuttTTT", "Putt-Putt Travels Through Time *updated)", GID_HEGAME, 6, 100, 31, MDT_NONE,
 	 GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0, 0},
 
+	// Uses bink in external files for logos
+	{"baseball2003", "Backyard Baseball 2003", GID_HEGAME, 6, 100, 61, MDT_NONE,
+	 GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0, 0},
+	{"Soccer2004", "Backyard Soccer 2004", GID_HEGAME, 6, 100, 61, MDT_NONE,
+	 GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0, 0},
 
 #endif
 	{NULL, NULL, 0, 0, 0, 0, MDT_NONE, 0, 0, 0}