diff options
| author | Strangerke | 2014-12-01 08:46:32 +0100 |
|---|---|---|
| committer | Paul Gilbert | 2014-12-12 22:54:42 -0500 |
| commit | f364782d05cf0772bf2eaa71ea418650e0d9bf27 (patch) | |
| tree | 9a9de01d1563d7c3d1cff2a2487b30ee1df0807a /engines/access/room.cpp | |
| parent | 6e8f29c15b433e517b06c17fc63d082e7c5069d9 (diff) | |
| download | scummvm-rg350-f364782d05cf0772bf2eaa71ea418650e0d9bf27.tar.gz scummvm-rg350-f364782d05cf0772bf2eaa71ea418650e0d9bf27.tar.bz2 scummvm-rg350-f364782d05cf0772bf2eaa71ea418650e0d9bf27.zip | |
ACCESS: Some rework in MusicManager
Diffstat (limited to 'engines/access/room.cpp')
| -rw-r--r-- | engines/access/room.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/engines/access/room.cpp b/engines/access/room.cpp index 7ef3d6937d..8ef61a9d68 100644 --- a/engines/access/room.cpp +++ b/engines/access/room.cpp @@ -152,8 +152,7 @@ void Room::doRoom() { void Room::clearRoom() { if (_vm->_midi->_music) { _vm->_midi->stopSong(); - delete _vm->_midi->_music; - _vm->_midi->_music = nullptr; + _vm->_midi->freeMusic(); } _vm->_sound->freeSounds(); @@ -183,7 +182,7 @@ void Room::loadRoomData(const byte *roomData) { _vm->_midi->freeMusic(); if (roomInfo._musicFile._fileNum != -1) { - _vm->_midi->_music = _vm->_files->loadFile(roomInfo._musicFile); + _vm->_midi->loadMusic(roomInfo._musicFile); _vm->_midi->midiPlay(); _vm->_midi->_musicRepeat = true; } |