diff options
| author | Strangerke | 2013-07-20 11:24:54 +0200 |
|---|---|---|
| committer | Strangerke | 2013-07-20 18:59:49 +0200 |
| commit | 0ed03cb73840e11043e51d366345d55a7f079f54 (patch) | |
| tree | 05318035c99677b4c727f02134517030860d0576 | |
| parent | 66de61e812b233f19b23f08af6600ba3b73fb323 (diff) | |
| download | scummvm-rg350-0ed03cb73840e11043e51d366345d55a7f079f54.tar.gz scummvm-rg350-0ed03cb73840e11043e51d366345d55a7f079f54.tar.bz2 scummvm-rg350-0ed03cb73840e11043e51d366345d55a7f079f54.zip | |
MORTEVIELLE: Get rid of magic value 0x5000
| -rw-r--r-- | engines/mortevielle/mortevielle.h | 1 | ||||
| -rw-r--r-- | engines/mortevielle/sound.cpp | 2 | ||||
| -rw-r--r-- | engines/mortevielle/utils.cpp | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/engines/mortevielle/mortevielle.h b/engines/mortevielle/mortevielle.h index 2d2f598548..b5bb74ac1b 100644 --- a/engines/mortevielle/mortevielle.h +++ b/engines/mortevielle/mortevielle.h @@ -63,6 +63,7 @@ namespace Mortevielle { * 7000:2 - 16 words representing palette map * 7000:4138 - width, height, x/y offset of decoded image */ +const int kAdrMusic = 0x5000; const int kAdrPictureDecomp = 0x6000; const int kAdrPictureComp = 0x7000; diff --git a/engines/mortevielle/sound.cpp b/engines/mortevielle/sound.cpp index d54ab71e50..f9b53ffed7 100644 --- a/engines/mortevielle/sound.cpp +++ b/engines/mortevielle/sound.cpp @@ -178,7 +178,7 @@ void SoundManager::playNote(int frequency, int32 length) { void SoundManager::musyc(tablint &tb, int nbseg, int att) { #ifdef DEBUG - const byte *pSrc = &_vm->_mem[0x5000 * 16]; + const byte *pSrc = &_vm->_mem[kAdrMusic * 16]; // Convert the countdown amount to a tempo rate, and then to note length in microseconds int tempo = TIMER_FREQUENCY / att; diff --git a/engines/mortevielle/utils.cpp b/engines/mortevielle/utils.cpp index dafdcbecf5..216bd72337 100644 --- a/engines/mortevielle/utils.cpp +++ b/engines/mortevielle/utils.cpp @@ -2216,7 +2216,7 @@ void MortevielleEngine::music() { fic.read(&_mem[0x47a0 * 16 + 0], 123); fic.close(); - _soundManager.decodeMusic(&_mem[0x3800 * 16], &_mem[0x5000 * 16], 623); + _soundManager.decodeMusic(&_mem[0x3800 * 16], &_mem[kAdrMusic * 16], 623); _addFix = (float)((kTempoMusic - 8)) / 256; _speechManager.cctable(_speechManager._tbi); |