[Scummvm-cvs-logs] CVS: scummvm/sky intro.cpp,1.20,1.21 musicbase.cpp,1.4,1.5 sound.cpp,1.5,1.6

[Robert G?ffringmann]

Update of /cvsroot/scummvm/scummvm/sky
In directory sc8-pr-cvs1:/tmp/cvs-serv3825/sky

Modified Files:
	intro.cpp musicbase.cpp sound.cpp 
Log Message:
a few small changes

Index: intro.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/intro.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- intro.cpp	16 May 2003 15:33:17 -0000	1.20
+++ intro.cpp	20 May 2003 19:39:32 -0000	1.21
@@ -482,6 +482,6 @@
 
 void SkyState::introVol(uint32 *&cmdPtr) {
 
-	_mixer->setVolume(((cmdPtr[2] & 0x7F) + 1) << 1);
+	_skySound->playSound(1, (uint16)(cmdPtr[2] & 0x7F));
 	cmdPtr += 3;
 }

Index: musicbase.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/musicbase.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- musicbase.cpp	17 May 2003 20:04:05 -0000	1.4
+++ musicbase.cpp	20 May 2003 19:39:32 -0000	1.5
@@ -26,6 +26,7 @@
 	_musicData = NULL;
 	_allowedCommands = 0;
 	_skyDisk = pSkyDisk;
+	_currentMusic = 0;
 }
 
 SkyMusicBase::~SkyMusicBase(void)

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/sound.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- sound.cpp	17 May 2003 00:15:52 -0000	1.5
+++ sound.cpp	20 May 2003 19:39:32 -0000	1.6
@@ -38,7 +38,7 @@
 
 SkySound::~SkySound(void) {
 
-	if (_ingameSound) _mixer->stop(_ingameSound - 1);
+	_mixer->stopAll();
 	if (_soundData) free(_soundData);
 }
 
@@ -102,7 +102,7 @@
 	if (dataSize == dataLoop)
 		flags |= SoundMixer::FLAG_LOOP;
 	
-	if (_ingameSound) _mixer->stop(_ingameSound - 1);
+	_mixer->stopAll();
 	_mixer->setVolume(volume);
 	_mixer->playRaw(&_ingameSound, _soundData + dataOfs, dataSize, sampleRate, flags);
 }