libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-14 05:30:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

MORTEVIELLE: Get rid of the last remaining magic values used with _mem

Browse Source
This commit is contained in:
Strangerke 2013-07-21 19:59:58 +02:00
parent d5ad25316c
commit 88f5fe7329
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
engines/mortevielle/mortevielle.h
View File

@ -67,6 +67,9 @@ const int kAdrMusic = 0x5000;
const int kAdrPictureDecomp = 0x6000;
const int kAdrPictureComp = 0x7000;
const int kAdrCompMusicBuf1 = 0x7414;
const int kAdrCompMusicBuf2 = 0x3800;
const int kAdrUnknownBuf = 0x47a0;
const int kAdrDecBuffer = 0x73A2;
#define ord(v) ((int) v)

4
engines/mortevielle/speech.cpp
View File

@ -161,9 +161,9 @@ void SpeechManager::loadMusicSound() {
if (!f.open("sonmus.mor"))
error("Missing file - sonmus.mor");
f.read(&_vm->_mem[0x7414 * 16], 273);
f.read(&_vm->_mem[kAdrCompMusicBuf1 * 16], 273);
_vm->_soundManager.decodeMusic(&_vm->_mem[0x7414 * 16], &_vm->_mem[kAdrNoise * 16], 273);
_vm->_soundManager.decodeMusic(&_vm->_mem[kAdrCompMusicBuf1 * 16], &_vm->_mem[kAdrNoise * 16], 273);
f.close();
}

6
engines/mortevielle/utils.cpp
View File

@ -2212,11 +2212,11 @@ void MortevielleEngine::music() {
if (!fic.open("mort.img"))
error("Missing file - mort.img");
fic.read(&_mem[0x3800 * 16], 500);
fic.read(&_mem[0x47a0 * 16], 123);
fic.read(&_mem[kAdrCompMusicBuf2 * 16], 500);
fic.read(&_mem[kAdrUnknownBuf * 16], 123);
fic.close();
_soundManager.decodeMusic(&_mem[0x3800 * 16], &_mem[kAdrMusic * 16], 623);
_soundManager.decodeMusic(&_mem[kAdrCompMusicBuf2 * 16], &_mem[kAdrMusic * 16], 623);
_addFix = (float)((kTempoMusic - 8)) / 256;
_speechManager.cctable(_speechManager._tbi);