libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-24 13:13:58 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

minor simplification

Browse Source 
svn-id: r26150
This commit is contained in:
Gregory Montoir 2007-03-16 22:34:59 +00:00
parent 00e85d9f57
commit 00bb66d60d
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
engines/queen/music.cpp
View File

@ -43,6 +43,8 @@ MidiMusic::MidiMusic(MidiDriver *driver, QueenEngine *vm)
_musicData = vm->resource()->loadFile(filename, 0, &_musicDataSize);
_numSongs = READ_LE_UINT16(_musicData);
this->open();
_tune = vm->resource()->isDemo() ? Sound::_tuneDemo : Sound::_tune;
}
MidiMusic::~MidiMusic() {
@ -194,7 +196,7 @@ void MidiMusic::queueTuneList(int16 tuneList) {
return;
}
int mode = (_numSongs == 40) ? Sound::_tuneDemo[tuneList].mode : Sound::_tune[tuneList].mode;
int mode = _tune[tuneList].mode;
switch (mode) {
case 0: // random loop
_randomLoop = true;
@ -210,13 +212,8 @@ void MidiMusic::queueTuneList(int16 tuneList) {
}
int i = 0;
if (_numSongs == 40) {
while (Sound::_tuneDemo[tuneList].tuneNum[i])
queueSong(Sound::_tuneDemo[tuneList].tuneNum[i++] - 1);
} else {
while (Sound::_tune[tuneList].tuneNum[i])
queueSong(Sound::_tune[tuneList].tuneNum[i++] - 1);
}
while (_tune[tuneList].tuneNum[i])
queueSong(_tune[tuneList].tuneNum[i++] - 1);
if (_randomLoop)
_queuePos = randomQueuePos();

3
engines/queen/music.h
View File

@ -30,6 +30,8 @@ class MidiParser;
namespace Queen {
struct tuneData;
class QueenEngine;
class MidiMusic : public MidiDriver {
@ -100,6 +102,7 @@ protected:
uint32 _musicDataSize;
bool _vToggle;
byte *_musicData;
const tuneData *_tune;
};
} // End of namespace Queen