[Scummvm-cvs-logs] CVS: scummvm/scumm gfx.cpp,2.51,2.52 script_v5.cpp,1.32,1.33 scummvm.cpp,2.92,2.93

[Pawel Kolodziejski]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv13173

Modified Files:
	gfx.cpp script_v5.cpp scummvm.cpp 
Log Message:
loom ega: build custom cursor, op_wait() has more then one subopcodes(revert changes), disabled adlib_default

Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 2.51
retrieving revision 2.52
diff -u -d -r2.51 -r2.52
--- gfx.cpp	12 Apr 2003 18:43:23 -0000	2.51
+++ gfx.cpp	18 Apr 2003 20:16:30 -0000	2.52
@@ -3275,7 +3275,7 @@
 
 	// FIXME: None of the stock cursors are right for Loom. Why is that?
 
-	if (_gameId == GID_LOOM256) {
+	if ((_gameId == GID_LOOM256) || (_gameId == GID_LOOM)) {
 		int w;
 
 		_cursor.width = 8;

Index: script_v5.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v5.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- script_v5.cpp	13 Apr 2003 21:29:44 -0000	1.32
+++ script_v5.cpp	18 Apr 2003 20:16:31 -0000	1.33
@@ -2252,7 +2252,7 @@
 
 	oldaddr = _scriptPointer - 1;
 
-	if ((_gameId == GID_INDY3_256) || (_features & GF_OLD_BUNDLE)) {
+	if ((_gameId == GID_INDY3_256) || (_gameId == GID_INDY3)) {
 		_opcode = 2;
 	} else
 		_opcode = fetchScriptByte();

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.92
retrieving revision 2.93
diff -u -d -r2.92 -r2.93
--- scummvm.cpp	13 Apr 2003 01:51:24 -0000	2.92
+++ scummvm.cpp	18 Apr 2003 20:16:32 -0000	2.93
@@ -73,7 +73,7 @@
 	{"zak256", "Zak McKracken and the Alien Mindbenders (256)", GID_ZAK256, 3, 0, 0,
 	 GF_AFTER_V3 | GF_SMALL_HEADER | GF_SMALL_NAMES | GF_NO_SCALLING | GF_OLD256 | GF_AUDIOTRACKS, "00.LFL"},
 	{"loom", "Loom", GID_LOOM, 3, 5, 40,
-	 GF_AFTER_V3 | GF_SMALL_HEADER | GF_SMALL_NAMES | GF_NO_SCALLING | GF_USE_KEY | GF_OLD_BUNDLE | GF_16COLOR | GF_ADLIB_DEFAULT, "00.LFL"},
+	 GF_AFTER_V3 | GF_SMALL_HEADER | GF_SMALL_NAMES | GF_NO_SCALLING | GF_USE_KEY | GF_16COLOR | GF_OLD_BUNDLE, "00.LFL"},
 
 	/* Scumm Version 4 */
 	{"monkeyEGA", "Monkey Island 1 (EGA)", GID_MONKEY_EGA, 4, 0, 62,