[Scummvm-cvs-logs] scummvm master -> 0182a8a2300d7e536a6d11ed71233a12c1d54e54
sev-
sev at scummvm.org
Fri Jul 29 04:47:46 CEST 2016
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
0182a8a230 MADS: Fix warning
Commit: 0182a8a2300d7e536a6d11ed71233a12c1d54e54
https://github.com/scummvm/scummvm/commit/0182a8a2300d7e536a6d11ed71233a12c1d54e54
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-07-29T05:47:31+03:00
Commit Message:
MADS: Fix warning
Changed paths:
engines/mads/screen.cpp
diff --git a/engines/mads/screen.cpp b/engines/mads/screen.cpp
index b17b6e9..79d5256 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);
}
More information about the Scummvm-git-logs
mailing list