[Scummvm-cvs-logs] CVS: scummvm/scumm script_v90he.cpp,2.242,2.243 sound.cpp,1.451,1.452 wiz_he.cpp,2.69,2.70

[kirben]

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

Modified Files:
	script_v90he.cpp sound.cpp wiz_he.cpp 
Log Message:

Add extra cases for readdemo.


Index: script_v90he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v90he.cpp,v
retrieving revision 2.242
retrieving revision 2.243
diff -u -d -r2.242 -r2.243
--- script_v90he.cpp	1 May 2005 01:30:19 -0000	2.242
+++ script_v90he.cpp	1 May 2005 03:17:44 -0000	2.243
@@ -2537,6 +2537,9 @@
 		_skipProcessActors = 0;
 		redrawAllActors();
 		break;
+	case 27:
+		// Used in readdemo
+		break;
 	case 42:
 		_wiz._rectOverrideEnabled = true;
 		_wiz._rectOverride.left = args[1];

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.451
retrieving revision 1.452
diff -u -d -r1.451 -r1.452
--- sound.cpp	29 Apr 2005 15:33:07 -0000	1.451
+++ sound.cpp	1 May 2005 03:17:44 -0000	1.452
@@ -231,6 +231,11 @@
 	if (_vm->_heversion >= 70 && soundID > _vm->_numSounds) {
 		debug(1, "playSound #%d", soundID);
 
+		if (soundID >= 10000) {
+			// Special codes, used in pjgames
+			return;
+		}
+
 		int music_offs;
 		char buf[32], buf1[128];
 		File musicFile;

Index: wiz_he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/wiz_he.cpp,v
retrieving revision 2.69
retrieving revision 2.70
diff -u -d -r2.69 -r2.70
--- wiz_he.cpp	30 Apr 2005 20:48:59 -0000	2.69
+++ wiz_he.cpp	1 May 2005 03:17:45 -0000	2.70
@@ -1016,10 +1016,11 @@
 		case 1:
 			// TODO Adding masking for flags 0x80 and 0x100
 			if (flags & 0x80) {
+				// Used in maze
 				warning("drawWizImage: Unhandled flag 0x80");
-			}
-			if (flags & 0x100) {
-				error("drawWizImage: Unhandled flag 0x100");
+			} else if (flags & 0x100) {
+				// Used in readdemo
+				warning("drawWizImage: Unhandled flag 0x100");
 			}
 			_wiz.copyWizImage(dst, wizd, cw, ch, x1, y1, width, height, &rScreen, palPtr);
 			break;