diff options
| author | Eugene Sandulenko | 2016-07-29 05:47:31 +0300 |
|---|---|---|
| committer | Eugene Sandulenko | 2016-07-29 05:47:31 +0300 |
| commit | 0182a8a2300d7e536a6d11ed71233a12c1d54e54 (patch) | |
| tree | 009752a09fc4d0fbe3822680b38071201a4e89da /engines | |
| parent | 0943555e8bf7527dfa411514b529bcc020f199b6 (diff) | |
| download | scummvm-rg350-0182a8a2300d7e536a6d11ed71233a12c1d54e54.tar.gz scummvm-rg350-0182a8a2300d7e536a6d11ed71233a12c1d54e54.tar.bz2 scummvm-rg350-0182a8a2300d7e536a6d11ed71233a12c1d54e54.zip | |
MADS: Fix warning
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/mads/screen.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/mads/screen.cpp b/engines/mads/screen.cpp index b17b6e93b8..79d5256c1c 100644 --- a/engines/mads/screen.cpp +++ b/engines/mads/screen.cpp @@ -671,7 +671,7 @@ void Screen::transition(ScreenTransition transitionType, bool surfaceFlag) { void Screen::panTransition(MSurface &newScreen, byte *palData, int entrySide, const Common::Point &srcPos, const Common::Point &destPos, - ThroughBlack throughBlack, bool setPalette, int numTicks) { + ThroughBlack throughBlack, bool setPalette_, int numTicks) { EventsManager &events = *_vm->_events; Palette &palette = *_vm->_palette; Common::Point size; @@ -693,7 +693,7 @@ void Screen::panTransition(MSurface &newScreen, byte *palData, int entrySide, startX = size.x - 1; deltaX = startX ? -1 : 1; - if (setPalette & !throughBlack) + if (setPalette_ & !throughBlack) palette.setFullPalette(palData); // TODO: Original uses a different frequency ticks counter. Need to @@ -731,7 +731,7 @@ void Screen::panTransition(MSurface &newScreen, byte *palData, int entrySide, g_system->delayMillis(1); } - if ((setPalette && !loop) || throughBlack == THROUGH_BLACK2) + if ((setPalette_ && !loop) || throughBlack == THROUGH_BLACK2) palette.setFullPalette(palData); } |