MORTEVIELLE: Get rid of magic value 0x5000

scummvm · Jul 20, 2013 · 590edf7 · 590edf7
1 parent 7d26f5c
commit 590edf7
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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);