[Scummvm-cvs-logs] SF.net SVN: scummvm: [30103] scummvm/trunk/engines/scumm/imuse_digi/ dimuse_music.cpp
aquadran at users.sourceforge.net
aquadran at users.sourceforge.net
Mon Dec 31 14:26:30 CET 2007
Revision: 30103
http://scummvm.svn.sourceforge.net/scummvm/?rev=30103&view=rev
Author: aquadran
Date: 2007-12-31 05:26:29 -0800 (Mon, 31 Dec 2007)
Log Message:
-----------
verified differences in play music code of the dig and comi
Modified Paths:
--------------
scummvm/trunk/engines/scumm/imuse_digi/dimuse_music.cpp
Modified: scummvm/trunk/engines/scumm/imuse_digi/dimuse_music.cpp
===================================================================
--- scummvm/trunk/engines/scumm/imuse_digi/dimuse_music.cpp 2007-12-31 13:05:32 UTC (rev 30102)
+++ scummvm/trunk/engines/scumm/imuse_digi/dimuse_music.cpp 2007-12-31 13:26:29 UTC (rev 30103)
@@ -98,7 +98,7 @@
}
}
- if (num == -1) // FIXME: setDigMusicSequence vs. setComiMusicSequence
+ if (num == -1)
return;
if (_curMusicSeq == num)
@@ -108,16 +108,16 @@
if (_curMusicSeq && (_digSeqMusicTable[_curMusicSeq].transitionType == 4)
|| (_digSeqMusicTable[_curMusicSeq].transitionType == 6)) {
_nextSeqToPlay = num;
- return; // FIXME: setDigMusicSequence vs. setComiMusicSequence
+ return;
} else {
playDigMusic(_digSeqMusicTable[num].name, &_digSeqMusicTable[num], 0, true);
_nextSeqToPlay = 0;
- _attributes[DIG_SEQ_OFFSET + num] = 1; // FIXME: setDigMusicSequence vs. setComiMusicSequence
+ _attributes[DIG_SEQ_OFFSET + num] = 1; // _attributes[COMI_SEQ_OFFSET] in Comi are not used as it doesn't have 'room' attributes table
}
} else {
if (_nextSeqToPlay != 0) {
playDigMusic(_digSeqMusicTable[_nextSeqToPlay].name, &_digSeqMusicTable[_nextSeqToPlay], 0, true);
- _attributes[DIG_SEQ_OFFSET + _nextSeqToPlay] = 1; // FIXME: setDigMusicSequence vs. setComiMusicSequence
+ _attributes[DIG_SEQ_OFFSET + _nextSeqToPlay] = 1; // _attributes[COMI_SEQ_OFFSET] in Comi are not used as it doesn't have 'room' attributes table
num = _nextSeqToPlay;
_nextSeqToPlay = 0;
} else {
@@ -192,11 +192,7 @@
void IMuseDigital::setComiMusicState(int stateId) {
int l, num = -1;
- // This happens at the beginning of Part II, but should apparently not
- // do anything since the correct music is already playing. A left-over
- // of some kind?
-
- if (stateId == 4)
+ if (stateId == 4) // left-over of deprecated the dig code
return;
if (stateId == 0)
@@ -209,8 +205,10 @@
break;
}
}
- assert(num != -1);
+ if (num == -1)
+ return;
+
if (_curMusicState == num)
return;
@@ -226,10 +224,6 @@
void IMuseDigital::setComiMusicSequence(int seqId) {
int l, num = -1;
-
- // FIXME: It turns out that setDigMusicSequence and setComiMusicSequence are
- // very similiar, with only a few small differences. Question: are those differences
- // really differences, or just caused by a mistake on our side?
if (seqId == 0)
seqId = 2000;
@@ -241,8 +235,10 @@
break;
}
}
- assert(num != -1); // FIXME: setDigMusicSequence vs. setComiMusicSequence
+ if (num == -1)
+ return;
+
if (_curMusicSeq == num)
return;
@@ -250,7 +246,7 @@
if (_curMusicSeq && ((_comiSeqMusicTable[_curMusicSeq].transitionType == 4)
|| (_comiSeqMusicTable[_curMusicSeq].transitionType == 6))) {
_nextSeqToPlay = num;
- //return; // FIXME: setDigMusicSequence vs. setComiMusicSequence
+ return;
} else {
playComiMusic(_comiSeqMusicTable[num].name, &_comiSeqMusicTable[num], 0, true);
_nextSeqToPlay = 0;
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