MORTEVIELLE: Get rid of magic value 0x6000

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

Hide file tree

Showing 3 changed files with 8 additions and 7 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 kAdrPictureDecomp = 0x6000;
 const int kAdrPictureComp = 0x7000;
 
 #define ord(v) ((int) v)

diff --git a/engines/mortevielle/outtext.cpp b/engines/mortevielle/outtext.cpp
@@ -141,7 +141,7 @@ void TextHandler::loadDesFile(Common::String filename, int32 skipSize, int lengt
 
 	int remainingSkipSize = abs(skipSize);
 	int totalLength = length + remainingSkipSize;
-	int memIndx = 0x6000 * 16;
+	int memIndx = kAdrPictureDecomp * 16;
 	while (totalLength > 0) {
 		f.read(&_vm->_mem[memIndx], 128);
 		totalLength -= 128;
@@ -150,7 +150,7 @@ void TextHandler::loadDesFile(Common::String filename, int32 skipSize, int lengt
 	f.close();
 
 	for (int i = remainingSkipSize; i <= length + remainingSkipSize; ++i)
-		_vm->_mem[(kAdrPictureComp * 16) + i - remainingSkipSize] = _vm->_mem[0x6000 * 16 + i];
+		_vm->_mem[(kAdrPictureComp * 16) + i - remainingSkipSize] = _vm->_mem[(kAdrPictureDecomp * 16) + i];
 }
 
 /**
@@ -172,7 +172,7 @@ void TextHandler::loadAniFile(Common::String filename, int32 skipSize, int lengt
 
 	int remainingSkipSize = abs(skipSize);
 	int fullLength = length + remainingSkipSize;
-	int memIndx = 0x6000 * 16;
+	int memIndx = kAdrPictureDecomp * 16;
 	while (fullLength > 0) {
 		f.read(&_vm->_mem[memIndx], 128);
 		fullLength -= 128;
@@ -181,7 +181,7 @@ void TextHandler::loadAniFile(Common::String filename, int32 skipSize, int lengt
 	f.close();
 
 	for (int i = remainingSkipSize; i <= length + remainingSkipSize; ++i)
-		_vm->_mem[kAdrAni * 16 + i - remainingSkipSize] = _vm->_mem[0x6000 * 16 + i];
+		_vm->_mem[kAdrAni * 16 + i - remainingSkipSize] = _vm->_mem[(kAdrPictureDecomp * 16) + i];
 }
 
 void TextHandler::taffich() {

diff --git a/engines/mortevielle/utils.cpp b/engines/mortevielle/utils.cpp
@@ -2026,12 +2026,12 @@ void MortevielleEngine::setPal(int n) {
 void MortevielleEngine::displayCGAPattern(int n, Pattern p, nhom *pal) {
 	int addr = n * 404 + 0xd700;
 
-	WRITE_LE_UINT16(&_mem[0x6000 * 16 + addr], p._tax);
-	WRITE_LE_UINT16(&_mem[0x6000 * 16 + addr + 2], p._tay);
+	WRITE_LE_UINT16(&_mem[(kAdrPictureDecomp * 16) + addr], p._tax);
+	WRITE_LE_UINT16(&_mem[(kAdrPictureDecomp * 16) + addr + 2], p._tay);
 	addr += 4;
 	for (int i = 0; i < p._tax; ++i) {
 		for (int j = 0; j < p._tay; ++j)
-			_mem[(0x6000 * 16) + addr + j * p._tax + i] = pal[n]._hom[p._des[i + 1][j + 1]];
+			_mem[(kAdrPictureDecomp * 16) + addr + j * p._tax + i] = pal[n]._hom[p._des[i + 1][j + 1]];
 	}
 }