diff options
| author | Gregory Montoir | 2004-08-06 17:01:58 +0000 |
|---|---|---|
| committer | Gregory Montoir | 2004-08-06 17:01:58 +0000 |
| commit | 8b0e9502ec706cc82b05c216801ac0fd0a46d7fd (patch) | |
| tree | 201a203c69f6285e8e91d4e00f3790721d5986ee /queen/music.cpp | |
| parent | a7b610b25b5035962e5ee27610e49c1a5d2e5172 (diff) | |
| download | scummvm-rg350-8b0e9502ec706cc82b05c216801ac0fd0a46d7fd.tar.gz scummvm-rg350-8b0e9502ec706cc82b05c216801ac0fd0a46d7fd.tar.bz2 scummvm-rg350-8b0e9502ec706cc82b05c216801ac0fd0a46d7fd.zip | |
cleanup and simplify Resource class a bit more
svn-id: r14488
Diffstat (limited to 'queen/music.cpp')
| -rw-r--r-- | queen/music.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/queen/music.cpp b/queen/music.cpp index 6f783e7916..a265cca85e 100644 --- a/queen/music.cpp +++ b/queen/music.cpp @@ -324,11 +324,9 @@ static const byte mt32_to_gm[128] = { Music::Music(MidiDriver *driver, QueenEngine *vm) : _vToggle(false) { if (vm->resource()->isDemo()) { - _musicData = vm->resource()->loadFile("AQ8.RL", 0, NULL); - _musicDataSize = vm->resource()->fileSize("AQ8.RL"); + _musicData = vm->resource()->loadFile("AQ8.RL", 0, &_musicDataSize); } else { - _musicData = vm->resource()->loadFile("AQ.RL", 0, NULL); - _musicDataSize = vm->resource()->fileSize("AQ.RL"); + _musicData = vm->resource()->loadFile("AQ.RL", 0, &_musicDataSize); } _player = new MusicPlayer(driver, _musicData, _musicDataSize); |