[Scummvm-cvs-logs] CVS: scummvm/scumm sound.cpp,1.448,1.449

[kirben]

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

Modified Files:
	sound.cpp 
Log Message:

No music file in lost/smaller.


Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.448
retrieving revision 1.449
diff -u -d -r1.448 -r1.449
--- sound.cpp	25 Apr 2005 05:44:11 -0000	1.448
+++ sound.cpp	25 Apr 2005 05:59:01 -0000	1.449
@@ -174,7 +174,7 @@
 		strcpy(buf, buf1);
 	}
 	if (musicFile.open(buf) == false) {
-		warning("getHEMusicDetails: Music file is not open");
+		warning("setupHEMusicFile: Can't open music file %s", buf);
 		return;
 	}
 	musicFile.seek(4, SEEK_SET);
@@ -214,7 +214,6 @@
 	}
 
 	error("getHEMusicDetails: musicID %d not found", id);
-
 }
 
 void Sound::playSound(int soundID, int heOffset, int heChannel, int heFlags) {
@@ -243,7 +242,7 @@
 			strcpy(buf, buf1);
 		}
 		if (musicFile.open(buf) == false) {
-			warning("playSound: Music file is not open");
+			warning("playSound: Can't open music file %s", buf);
 			return;
 		}
 
@@ -1062,7 +1061,8 @@
 	delete _sfxFile;
 	_sfxFile = openSfxFile();
 
-	if (_vm->_heversion >= 70) {
+	// No music file in lost/smaller
+	if (_vm->_heversion >= 70 && !(_vm->_features & GF_HE_CURSORLESS)) {
 		setupHEMusicFile();
 	}