diff options
Diffstat (limited to 'engines/mads/screen.cpp')
| -rw-r--r-- | engines/mads/screen.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/mads/screen.cpp b/engines/mads/screen.cpp index 3c27001ae0..c9f5df8b98 100644 --- a/engines/mads/screen.cpp +++ b/engines/mads/screen.cpp @@ -732,7 +732,7 @@ void ScreenSurface::panTransition(MSurface &newScreen, byte *palData, int entryS srcPos.x + xAt + 1, srcPos.y + size.y)); } else { newScreen.copyRectToSurface(*this, xAt, destPos.y, - Common::Rect(srcPos.x + xAt, srcPos.y, + Common::Rect(srcPos.x + xAt, srcPos.y, srcPos.x + xAt + 1, srcPos.y + size.y)); } @@ -778,8 +778,8 @@ void ScreenSurface::swapForeground(byte newPalette[PALETTE_SIZE], byte *paletteM Common::Rect oldClip = _clipBounds; resetClipBounds(); - - copyRectTranslate(*this, oldMap, Common::Point(0, 0), + + copyRectTranslate(*this, oldMap, Common::Point(0, 0), Common::Rect(0, 0, MADS_SCREEN_WIDTH, MADS_SCREEN_HEIGHT)); palette.setFullPalette(oldPalette); @@ -789,9 +789,9 @@ void ScreenSurface::swapForeground(byte newPalette[PALETTE_SIZE], byte *paletteM /** * Translates a given palette into a mapping table. * Palettes consist of 128 RGB entries for the foreground and background - * respectively, with the two interleaved together. So the start + * respectively, with the two interleaved together. So the start */ -void ScreenSurface::swapPalette(const byte *palData, byte swapTable[PALETTE_COUNT], +void ScreenSurface::swapPalette(const byte *palData, byte swapTable[PALETTE_COUNT], bool foreground) { int start = foreground ? 1 : 0; const byte *dynamicList = &palData[start * RGB_SIZE]; @@ -807,7 +807,7 @@ void ScreenSurface::swapPalette(const byte *palData, byte swapTable[PALETTE_COUN // Handle the 128 palette entries for the foreground or background for (int idx = 0; idx < (PALETTE_COUNT / 2); ++idx) { if (start >= PALETTE_START && start <= PALETTE_END) { - swapTable[start] = Palette::closestColor(dynamicList, staticList, + swapTable[start] = Palette::closestColor(dynamicList, staticList, 2 * RGB_SIZE, PALETTE_COUNT / 2) * 2 + staticStart; } |