From 06e57dd53b94fa7e952a4aebf90420bff2f09d46 Mon Sep 17 00:00:00 2001 From: Strangerke Date: Wed, 24 Jul 2013 12:30:58 +0200 Subject: MORTEVIELLE: Remove useless constant, rename another one --- engines/mortevielle/graphics.cpp | 2 +- engines/mortevielle/mortevielle.h | 3 +-- engines/mortevielle/outtext.cpp | 6 +++--- engines/mortevielle/utils.cpp | 22 +++++++++++----------- 4 files changed, 16 insertions(+), 17 deletions(-) (limited to 'engines/mortevielle') diff --git a/engines/mortevielle/graphics.cpp b/engines/mortevielle/graphics.cpp index f967ad9c6a..cb674a2317 100644 --- a/engines/mortevielle/graphics.cpp +++ b/engines/mortevielle/graphics.cpp @@ -937,7 +937,7 @@ void ScreenSurface::drawPicture(GfxSurface &surface, int x, int y) { (x + surface.w) * 2, (y + surface.h) * 2)); // Get a lookup for the palette mapping - const byte *paletteMap = &_vm->_mem[(kAdrPictureComp * 16) + 2]; + const byte *paletteMap = &_vm->_mem[(kAdrCurrentPicture * 16) + 2]; // Loop through writing for (int yp = 0; yp < surface.h; ++yp) { diff --git a/engines/mortevielle/mortevielle.h b/engines/mortevielle/mortevielle.h index 6f77643186..347b921efc 100644 --- a/engines/mortevielle/mortevielle.h +++ b/engines/mortevielle/mortevielle.h @@ -64,8 +64,7 @@ namespace Mortevielle { * 7000:4138 - width, height, x/y offset of decoded image */ const int kAdrMusic = 0x5000; -const int kAdrPictureDecomp = 0x6000; -const int kAdrPictureComp = 0x7000; +const int kAdrCurrentPicture = 0x7000; const int kAdrCompMusicBuf1 = 0x7414; const int kAdrCompMusicBuf2 = 0x3800; diff --git a/engines/mortevielle/outtext.cpp b/engines/mortevielle/outtext.cpp index 3afab7c80b..311a4c2ee4 100644 --- a/engines/mortevielle/outtext.cpp +++ b/engines/mortevielle/outtext.cpp @@ -135,7 +135,7 @@ void TextHandler::loadDesFile(Common::String filename, int32 skipSize, int lengt assert(skipSize + length <= f.size()); f.seek(skipSize); - f.read(&_vm->_mem[(kAdrPictureComp * 16)], length); + f.read(&_vm->_mem[(kAdrCurrentPicture * 16)], length); f.close(); } @@ -260,7 +260,7 @@ void TextHandler::taffich() { loadDesFile(filename, drawingStartPos, drawingSize); if (_vm->_currGraphicalDevice == MODE_HERCULES) { for (int i = 0; i <= 15; ++i) { - int palh = READ_LE_UINT16(&_vm->_mem[(kAdrPictureComp * 16) + 2 + (i << 1)]); + int palh = READ_LE_UINT16(&_vm->_mem[(kAdrCurrentPicture * 16) + 2 + (i << 1)]); alllum[i] = (palh & 15) + (((uint)palh >> 12) & 15) + (((uint)palh >> 8) & 15); } for (int i = 0; i <= 15; ++i) { @@ -269,7 +269,7 @@ void TextHandler::taffich() { if (alllum[j] > alllum[k]) k = j; } - _vm->_mem[(kAdrPictureComp * 16) + 2 + (k << 1)] = rang[i]; + _vm->_mem[(kAdrCurrentPicture * 16) + 2 + (k << 1)] = rang[i]; alllum[k] = -1; } } diff --git a/engines/mortevielle/utils.cpp b/engines/mortevielle/utils.cpp index 0cad1636d9..87bcc874b4 100644 --- a/engines/mortevielle/utils.cpp +++ b/engines/mortevielle/utils.cpp @@ -1979,8 +1979,8 @@ void MortevielleEngine::setPal(int n) { case MODE_EGA: case MODE_AMSTRAD1512: for (int i = 1; i <= 16; ++i) { - _mem[(kAdrPictureComp * 16) + (2 * i)] = _stdPal[n][i].x; - _mem[(kAdrPictureComp * 16) + (2 * i) + 1] = _stdPal[n][i].y; + _mem[(kAdrCurrentPicture * 16) + (2 * i)] = _stdPal[n][i].x; + _mem[(kAdrCurrentPicture * 16) + (2 * i) + 1] = _stdPal[n][i].y; } break; case MODE_CGA: { @@ -2008,12 +2008,12 @@ void MortevielleEngine::setPal(int n) { void MortevielleEngine::displayCGAPattern(int n, Pattern p, nhom *pal) { int addr = n * 404 + 0xd700; - WRITE_LE_UINT16(&_mem[(kAdrPictureComp * 16) + addr], p._tax); - WRITE_LE_UINT16(&_mem[(kAdrPictureComp * 16) + addr + 2], p._tay); + WRITE_LE_UINT16(&_mem[(kAdrCurrentPicture * 16) + addr], p._tax); + WRITE_LE_UINT16(&_mem[(kAdrCurrentPicture * 16) + addr + 2], p._tay); addr += 4; for (int i = 0; i < p._tax; ++i) { for (int j = 0; j < p._tay; ++j) - _mem[(kAdrPictureComp * 16) + addr + j * p._tax + i] = pal[n]._hom[p._des[i + 1][j + 1]]; + _mem[(kAdrCurrentPicture * 16) + addr + j * p._tax + i] = pal[n]._hom[p._des[i + 1][j + 1]]; } } @@ -2240,7 +2240,7 @@ void MortevielleEngine::showTitleScreen() { void MortevielleEngine::draw(int x, int y) { _mouse.hideMouse(); setPal(_numpal); - pictout(kAdrPictureComp, 0, x, y); + pictout(kAdrCurrentPicture, 0, x, y); _mouse.showMouse(); } @@ -2251,7 +2251,7 @@ void MortevielleEngine::draw(int x, int y) { void MortevielleEngine::drawRightFrame() { setPal(89); if (_currGraphicalDevice == MODE_HERCULES) { - _mem[(kAdrPictureComp * 16) + 14] = 15; + _mem[(kAdrCurrentPicture * 16) + 14] = 15; } _mouse.hideMouse(); pictout(kAdrRightFramePic, 0, 0, 0); @@ -2540,12 +2540,12 @@ void MortevielleEngine::pictout(int seg, int dep, int x, int y) { surface.decode(&_mem[(seg * 16) + dep]); if (_currGraphicalDevice == MODE_HERCULES) { - _mem[(kAdrPictureComp * 16) + 2] = 0; - _mem[(kAdrPictureComp * 16) + 32] = 15; + _mem[(kAdrCurrentPicture * 16) + 2] = 0; + _mem[(kAdrCurrentPicture * 16) + 32] = 15; } - if ((_caff != 51) && (READ_LE_UINT16(&_mem[(kAdrPictureComp * 16) + 0x4138]) > 0x100)) - WRITE_LE_UINT16(&_mem[(kAdrPictureComp * 16) + 0x4138], 0x100); + if ((_caff != 51) && (READ_LE_UINT16(&_mem[(kAdrCurrentPicture * 16) + 0x4138]) > 0x100)) + WRITE_LE_UINT16(&_mem[(kAdrCurrentPicture * 16) + 0x4138], 0x100); _screenSurface.drawPicture(surface, x, y); } -- cgit v1.2.3