[Scummvm-cvs-logs] CVS: scummvm/scumm imuse_digi.cpp,1.27,1.28 sound.cpp,1.142,1.143 sound.h,1.32,1.33

[Pawel Kolodziejski]

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

Modified Files:
	imuse_digi.cpp sound.cpp sound.h 
Log Message:
this should prevent changing music in some room in the DIG

Index: imuse_digi.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- imuse_digi.cpp	22 Jun 2003 22:09:00 -0000	1.27
+++ imuse_digi.cpp	23 Jun 2003 21:23:09 -0000	1.28
@@ -1134,7 +1134,8 @@
 					if (_digStateMusicMap[l].room == b) {
 						int16 music = _digStateMusicMap[l].table_index;
 						debug(5, "Play imuse music: %s, %s, %s", _digStateMusicTable[music].name, _digStateMusicTable[music].title, _digStateMusicTable[music].filename);
-						if (_digStateMusicTable[music].filename[0] != 0) {
+						if ((_digStateMusicTable[music].filename[0] != 0) && 
+							(strcmp(_digStateMusicTable[_digStateMusicTable[music].unk3].filename, _scumm->_sound->_nameBundleMusic) != 0) ) {
 							_scumm->_sound->playBundleMusic((const char *)_digStateMusicTable[music].filename);
 						}
 						return 0;

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -d -r1.142 -r1.143
--- sound.cpp	22 Jun 2003 11:47:03 -0000	1.142
+++ sound.cpp	23 Jun 2003 21:23:09 -0000	1.143
@@ -87,7 +87,7 @@
 	memset(this,0,sizeof(Sound));	// palmos
 	
 	_scumm = parent;
-	_nameBundleMusic = NULL;
+	_nameBundleMusic = "";
 	_musicBundleBufFinal = NULL;
 	_musicBundleBufOutput = NULL;
 	_musicDisk = 0;
@@ -1001,7 +1001,7 @@
 		return;
 	}
 
-	if (_nameBundleMusic == NULL) {
+	if (_nameBundleMusic[0] == 0) {
 		_outputMixerSize = 66150; // ((22050 * 2 * 2) / 4) * 3
 		if (_scumm->_gameId == GID_CMI) {
 			char bunfile[20];
@@ -1063,7 +1063,7 @@
 
 	if (_musicBundleToBeRemoved == true) {
 		_scumm->_timer->releaseProcedure(&music_handler);
-		_nameBundleMusic = NULL;
+		_nameBundleMusic = "";
 		if (_bundleMusicTrack != -1) {
 			_scumm->_mixer->stop(_bundleMusicTrack);
 		}

Index: sound.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.h,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- sound.h	15 Jun 2003 01:56:47 -0000	1.32
+++ sound.h	23 Jun 2003 21:23:10 -0000	1.33
@@ -41,7 +41,10 @@
 	bool _soundsPaused2;
 	bool _soundVolumePreset;
 
+public:
 	const char *_nameBundleMusic;
+
+protected:
 	const char *_newNameBundleMusic;
 	byte _musicDisk;
 	byte _voiceDisk;