diff options
| author | Strangerke | 2013-07-26 13:10:54 +0200 |
|---|---|---|
| committer | Strangerke | 2013-07-26 13:10:54 +0200 |
| commit | 8009b2ebd87ca546741a391e399f3633576b255b (patch) | |
| tree | 23c2313a1812dcb4320c1bb32757cdb15a896b13 /engines/mortevielle/utils.cpp | |
| parent | db10ddace466522062a18a0c9079292225fb53d0 (diff) | |
| download | scummvm-rg350-8009b2ebd87ca546741a391e399f3633576b255b.tar.gz scummvm-rg350-8009b2ebd87ca546741a391e399f3633576b255b.tar.bz2 scummvm-rg350-8009b2ebd87ca546741a391e399f3633576b255b.zip | |
MORTEVIELLE: Remove another use of _mem
Diffstat (limited to 'engines/mortevielle/utils.cpp')
| -rw-r--r-- | engines/mortevielle/utils.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/engines/mortevielle/utils.cpp b/engines/mortevielle/utils.cpp index 2211a6d569..7a8306067d 100644 --- a/engines/mortevielle/utils.cpp +++ b/engines/mortevielle/utils.cpp @@ -2193,14 +2193,17 @@ void MortevielleEngine::music() { _reloadCFIEC = true; - Common::File fic; - if (!fic.open("mort.img")) + Common::File f; + if (!f.open("mort.img")) error("Missing file - mort.img"); - fic.read(&_mem[kAdrCompMusicBuf2 * 16], 623 * 128); - fic.close(); + free(_compMusicBuf2); + int size = f.size(); + _compMusicBuf2 = (byte *)malloc(sizeof(byte) * size); + f.read(_compMusicBuf2, size); + f.close(); - _soundManager.decodeMusic(&_mem[kAdrCompMusicBuf2 * 16], &_mem[kAdrMusic * 16], 623); + _soundManager.decodeMusic(_compMusicBuf2, &_mem[kAdrMusic * 16], size / 128); _addFix = (float)((kTempoMusic - 8)) / 256; _speechManager.cctable(_speechManager._tbi); |