[Scummvm-cvs-logs] SF.net SVN: scummvm: [27049] scummvm/trunk/engines/scumm/imuse_digi

aquadran at users.sourceforge.net aquadran at users.sourceforge.net
Sat Jun 2 11:07:29 CEST 2007


Revision: 27049
          http://scummvm.svn.sourceforge.net/scummvm/?rev=27049&view=rev
Author:   aquadran
Date:     2007-06-02 02:07:29 -0700 (Sat, 02 Jun 2007)

Log Message:
-----------
renamed variable in IMuseDigital music code

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/imuse_digi/dimuse.h
    scummvm/trunk/engines/scumm/imuse_digi/dimuse_music.cpp

Modified: scummvm/trunk/engines/scumm/imuse_digi/dimuse.h
===================================================================
--- scummvm/trunk/engines/scumm/imuse_digi/dimuse.h	2007-06-02 08:21:09 UTC (rev 27048)
+++ scummvm/trunk/engines/scumm/imuse_digi/dimuse.h	2007-06-02 09:07:29 UTC (rev 27049)
@@ -201,7 +201,7 @@
 };
 
 struct imuseDigTable {
-	byte opcode;
+	byte transitionType;
 	int16 soundId;
 	char name[20];
 	byte atribPos;
@@ -210,7 +210,7 @@
 };
 
 struct imuseComiTable {
-	byte opcode;
+	byte transitionType;
 	int16 soundId;
 	char name[20];
 	byte atribPos;
@@ -226,14 +226,14 @@
 
 struct imuseFtStateTable {
 	char audioName[9];
-	byte opcode;
+	byte transitionType;
 	byte volume;
 	char name[21];
 };
 
 struct imuseFtSeqTable {
 	char audioName[9];
-	byte opcode;
+	byte transitionType;
 	byte volume;
 };
 

Modified: scummvm/trunk/engines/scumm/imuse_digi/dimuse_music.cpp
===================================================================
--- scummvm/trunk/engines/scumm/imuse_digi/dimuse_music.cpp	2007-06-02 08:21:09 UTC (rev 27048)
+++ scummvm/trunk/engines/scumm/imuse_digi/dimuse_music.cpp	2007-06-02 09:07:29 UTC (rev 27049)
@@ -110,7 +110,7 @@
 			_nextSeqToPlay = 0;
 			_attributes[DIG_SEQ_OFFSET + num] = 1;
 		} else {
-			if ((_digSeqMusicTable[_curMusicSeq].opcode == 4) || (_digSeqMusicTable[_curMusicSeq].opcode == 6)) {
+			if ((_digSeqMusicTable[_curMusicSeq].transitionType == 4) || (_digSeqMusicTable[_curMusicSeq].transitionType == 6)) {
 				_nextSeqToPlay = num;
 				return;
 			} else {
@@ -174,7 +174,7 @@
 
 	fadeOutMusic(120);
 
-	switch (table->opcode) {
+	switch (table->transitionType) {
 		case 0:
 		case 5:
 		case 6:
@@ -252,7 +252,7 @@
 			playComiMusic(_comiSeqMusicTable[num].name, &_comiSeqMusicTable[num], 0, true);
 			_nextSeqToPlay = 0;
 		} else {
-			if ((_comiSeqMusicTable[_curMusicSeq].opcode == 4) || (_comiSeqMusicTable[_curMusicSeq].opcode == 6)) {
+			if ((_comiSeqMusicTable[_curMusicSeq].transitionType == 4) || (_comiSeqMusicTable[_curMusicSeq].transitionType == 6)) {
 				_nextSeqToPlay = num;
 				return;
 			} else {
@@ -295,7 +295,7 @@
 		}
 	}
 
-	switch (table->opcode) {
+	switch (table->transitionType) {
 		case 0:
 			fadeOutMusic(120);
 			break;
@@ -333,7 +333,7 @@
 				startMusic(table->filename, table->soundId, 0, 127);
 				return;
 			}
-			if (table->opcode == 12) {
+			if (table->transitionType == 12) {
 				startMusic(table->filename, table->soundId, table->hookId, 127);
 			} else {
 				startMusic(table->filename, table->soundId, hookId, 127);
@@ -355,7 +355,7 @@
 		if (stateId == 0)
 			playFtMusic(NULL, 0, 0);
 		else
-			playFtMusic(_ftStateMusicTable[stateId].audioName, _ftStateMusicTable[stateId].opcode, _ftStateMusicTable[stateId].volume);
+			playFtMusic(_ftStateMusicTable[stateId].audioName, _ftStateMusicTable[stateId].transitionType, _ftStateMusicTable[stateId].volume);
 	}
 
 	_curMusicState = stateId;
@@ -374,11 +374,11 @@
 		if (_curMusicState == 0)
 			playFtMusic(NULL, 0, 0);
 		else {
-			playFtMusic(_ftStateMusicTable[_curMusicState].audioName, _ftStateMusicTable[_curMusicState].opcode, _ftStateMusicTable[_curMusicState].volume);
+			playFtMusic(_ftStateMusicTable[_curMusicState].audioName, _ftStateMusicTable[_curMusicState].transitionType, _ftStateMusicTable[_curMusicState].volume);
 		}
 	} else {
 		int seq = (seqId - 1) * 4;
-		playFtMusic(_ftSeqMusicTable[seq].audioName, _ftSeqMusicTable[seq].opcode, _ftSeqMusicTable[seq].volume);
+		playFtMusic(_ftSeqMusicTable[seq].audioName, _ftSeqMusicTable[seq].transitionType, _ftSeqMusicTable[seq].volume);
 	}
 
 	_curMusicSeq = seqId;
@@ -401,7 +401,7 @@
 		playFtMusic(NULL, 0, 0);
 	else {
 		int seq = ((_curMusicSeq - 1) * 4) + cueId;
-		playFtMusic(_ftSeqMusicTable[seq].audioName, _ftSeqMusicTable[seq].opcode, _ftSeqMusicTable[seq].volume);
+		playFtMusic(_ftSeqMusicTable[seq].audioName, _ftSeqMusicTable[seq].transitionType, _ftSeqMusicTable[seq].volume);
 	}
 
 	_curMusicCue = cueId;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list