[Scummvm-cvs-logs] CVS: residual/imuse imuse.h,1.14,1.15 imuse_music.cpp,1.11,1.12

[Pawel Kolodziejski]

Update of /cvsroot/scummvm/residual/imuse
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14062/imuse

Modified Files:
	imuse.h imuse_music.cpp 
Log Message:
changed resturn value from setSequence as should be

Index: imuse.h
===================================================================
RCS file: /cvsroot/scummvm/residual/imuse/imuse.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- imuse.h	13 Jan 2005 21:25:39 -0000	1.14
+++ imuse.h	14 Jan 2005 09:25:42 -0000	1.15
@@ -146,14 +146,13 @@
 	void stopAllSounds();
 	void pause(bool pause);
 	void setMusicState(int stateId);
-	void setMusicSequence(int seqId);
+	int setMusicSequence(int seqId);
 	void refreshScripts();
 	void flushTracks();
 	bool isVoicePlaying();
 	char *getCurMusicSoundName();
 	bool getSoundStatus(const char *soundName) const;
 	int32 getPosIn60HzTicks(const char *soundName);
-	int getCurMusicSeqId() { return _curMusicSeq; }
 };
 
 extern Imuse *g_imuse;

Index: imuse_music.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/imuse/imuse_music.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- imuse_music.cpp	13 Jan 2005 22:59:06 -0000	1.11
+++ imuse_music.cpp	14 Jan 2005 09:25:42 -0000	1.12
@@ -45,9 +45,12 @@
 	_curMusicState = num;
 }
 
-void Imuse::setMusicSequence(int seqId) {
+int Imuse::setMusicSequence(int seqId) {
 	int l, num = -1;
 
+	if (seqId == -1)
+		return _seqMusicTable[_curMusicSeq].soundId;
+
 	if (seqId == 0)
 		seqId = 2000;
 
@@ -61,7 +64,7 @@
 	assert(num != -1);
 
 	if (_curMusicSeq == num)
-		return;
+		return _seqMusicTable[_curMusicSeq].soundId;
 
 	if (num != 0) {
 		playMusic(&_seqMusicTable[num], 0, true);
@@ -71,6 +74,7 @@
 	}
 
 	_curMusicSeq = num;
+	return _seqMusicTable[_curMusicSeq].soundId;
 }
 
 void Imuse::playMusic(const ImuseTable *table, int atribPos, bool sequence) {