diff options
| author | Norbert Lange | 2009-08-02 00:03:42 +0000 |
|---|---|---|
| committer | Norbert Lange | 2009-08-02 00:03:42 +0000 |
| commit | 92d292a3f66fa6b0e85ae5a870d44b4d9762f946 (patch) | |
| tree | 93515cab0714fd6e6a4ccfbd235b8319e3ec2eed /engines | |
| parent | 59395eb6b61aff29fe438ab4a56b10c94fdd9fc8 (diff) | |
| download | scummvm-rg350-92d292a3f66fa6b0e85ae5a870d44b4d9762f946.tar.gz scummvm-rg350-92d292a3f66fa6b0e85ae5a870d44b4d9762f946.tar.bz2 scummvm-rg350-92d292a3f66fa6b0e85ae5a870d44b4d9762f946.zip | |
made MdatResource struct private and changed the signatures of functions which load the resources.
svn-id: r42982
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/scumm/player_v4a.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/engines/scumm/player_v4a.cpp b/engines/scumm/player_v4a.cpp index 3866775f33..48e466cd38 100644 --- a/engines/scumm/player_v4a.cpp +++ b/engines/scumm/player_v4a.cpp @@ -54,11 +54,11 @@ bool Player_V4A::init() { if (_vm->_game.id != GID_MONKEY_VGA) error("player_v4a - unknown game"); - Common::File fileMdat; - Common::File fileSample; + Common::File fileMdat, fileSample; if (fileMdat.open("music.dat") && fileSample.open("sample.dat")) { - if (_tfmxMusic.load(fileMdat, fileSample)) { + // explicitly request that no instance delets the resources automatically + if (_tfmxMusic.load(fileMdat, fileSample, false)) { _tfmxSfx.setModuleData(_tfmxMusic); return true; } @@ -69,6 +69,7 @@ bool Player_V4A::init() { Player_V4A::~Player_V4A() { _mixer->stopHandle(_musicHandle); _mixer->stopHandle(_sfxHandle); + _tfmxMusic.freeResources(); } void Player_V4A::setMusicVolume(int vol) { |