[Scummvm-cvs-logs] CVS: scummvm/scumm/imuse_digi dimuse.cpp,1.61,1.62 dimuse.h,1.37,1.38 dimuse_music.cpp,1.25,1.26

[Pawel Kolodziejski]

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

Modified Files:
	dimuse.cpp dimuse.h dimuse_music.cpp 
Log Message:
rename to _nextSeqToPlay

Index: dimuse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse.cpp,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- dimuse.cpp	8 Apr 2004 21:13:24 -0000	1.61
+++ dimuse.cpp	9 Apr 2004 03:57:18 -0000	1.62
@@ -68,7 +68,7 @@
 	_curMusicSeq = 0;
 	_curMusicCue = 0;
 	memset(_attributes, 0, sizeof(_attributes));
-	_curSeqAtribPos = 0;
+	_nextSeqToPlay = 0;
 }
 
 void IMuseDigital::callback() {

Index: dimuse.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse.h,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- dimuse.h	6 Apr 2004 19:46:43 -0000	1.37
+++ dimuse.h	9 Apr 2004 03:57:18 -0000	1.38
@@ -84,8 +84,7 @@
 	bool _pause;
 
 	int _attributes[188];
-	int _curSeqAtribPos;
-
+	int _nextSeqToPlay;
 	int _curMusicState;
 	int _curMusicSeq;
 	int _curMusicCue;

Index: dimuse_music.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse_music.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- dimuse_music.cpp	8 Apr 2004 22:46:22 -0000	1.25
+++ dimuse_music.cpp	9 Apr 2004 03:57:18 -0000	1.26
@@ -120,24 +120,24 @@
 	if (num != 0) {
 		if (_curMusicSeq == 0) {
 			playDigMusic(_digSeqMusicTable[num].name, &_digSeqMusicTable[num], 0, true);
-			_curSeqAtribPos = 0;
+			_nextSeqToPlay = 0;
 			_attributes[DIG_SEQ_OFFSET + num] = 1;
 		} else {
 			if ((_digSeqMusicTable[_curMusicSeq].opcode == 4) || (_digSeqMusicTable[_curMusicSeq].opcode == 6)) {
-				_curSeqAtribPos = num;
+				_nextSeqToPlay = num;
 				return;
 			} else {
 				playDigMusic(_digSeqMusicTable[num].name, &_digSeqMusicTable[num], 0, true);
-				_curSeqAtribPos = 0;
+				_nextSeqToPlay = 0;
 				_attributes[DIG_SEQ_OFFSET + num] = 1;
 			}
 		}
 	} else {
-		if (_curSeqAtribPos != 0) {
-			playDigMusic(_digSeqMusicTable[_curSeqAtribPos].name, &_digSeqMusicTable[_curSeqAtribPos], 0, true);
-			_attributes[DIG_SEQ_OFFSET + _curSeqAtribPos] = 1;
-			num = _curSeqAtribPos;
-			_curSeqAtribPos = 0;
+		if (_nextSeqToPlay != 0) {
+			playDigMusic(_digSeqMusicTable[_nextSeqToPlay].name, &_digSeqMusicTable[_nextSeqToPlay], 0, true);
+			_attributes[DIG_SEQ_OFFSET + _nextSeqToPlay] = 1;
+			num = _nextSeqToPlay;
+			_nextSeqToPlay = 0;
 		} else {
 			if (_curMusicState != 0) {
 				playDigMusic(_digStateMusicTable[_curMusicState].name, &_digStateMusicTable[_curMusicState], _curMusicState, true);
@@ -257,24 +257,24 @@
 	if (num != 0) {
 		if (_curMusicSeq == 0) {
 			playComiMusic(_comiSeqMusicTable[num].name, &_comiSeqMusicTable[num], 0, true);
-			_curSeqAtribPos = 0;
+			_nextSeqToPlay = 0;
 			_attributes[COMI_SEQ_OFFSET + num] = 1;
 		} else {
 			if ((_comiSeqMusicTable[_curMusicSeq].opcode == 4) || (_comiSeqMusicTable[_curMusicSeq].opcode == 6)) {
-				_curSeqAtribPos = num;
+				_nextSeqToPlay = num;
 				return;
 			} else {
 				playComiMusic(_comiSeqMusicTable[num].name, &_comiSeqMusicTable[num], 0, true);
-				_curSeqAtribPos = 0;
+				_nextSeqToPlay = 0;
 				_attributes[COMI_SEQ_OFFSET + num] = 1;
 			}
 		}
 	} else {
-		if (_curSeqAtribPos != 0) {
-			playComiMusic(_comiSeqMusicTable[_curSeqAtribPos].name, &_comiSeqMusicTable[_curSeqAtribPos], 0, true);
-			_attributes[COMI_SEQ_OFFSET + _curSeqAtribPos] = 1;
-			num = _curSeqAtribPos;
-			_curSeqAtribPos = 0;
+		if (_nextSeqToPlay != 0) {
+			playComiMusic(_comiSeqMusicTable[_nextSeqToPlay].name, &_comiSeqMusicTable[_nextSeqToPlay], 0, true);
+			_attributes[COMI_SEQ_OFFSET + _nextSeqToPlay] = 1;
+			num = _nextSeqToPlay;
+			_nextSeqToPlay = 0;
 		} else {
 			if (_curMusicState != 0) {
 				playComiMusic(_comiStateMusicTable[_curMusicState].name, &_comiStateMusicTable[_curMusicState], _curMusicState, true);