diff options
| author | Paul Gilbert | 2018-03-05 21:46:46 -0500 |
|---|---|---|
| committer | Paul Gilbert | 2018-03-05 21:46:46 -0500 |
| commit | a461a39e4a864a0e850e72322e8771db188b7d4a (patch) | |
| tree | 2b6e986048b327fa87e1b2e0429f433257fe11b3 | |
| parent | 82c8d93f3a51f9e0f1625d3bdd2d334fe5b79ae8 (diff) | |
| download | scummvm-rg350-a461a39e4a864a0e850e72322e8771db188b7d4a.tar.gz scummvm-rg350-a461a39e4a864a0e850e72322e8771db188b7d4a.tar.bz2 scummvm-rg350-a461a39e4a864a0e850e72322e8771db188b7d4a.zip | |
XEEN: Fix shadowed field warning
| -rw-r--r-- | engines/xeen/screen.cpp | 8 | ||||
| -rw-r--r-- | engines/xeen/screen.h | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/engines/xeen/screen.cpp b/engines/xeen/screen.cpp index 8dc7ec82dd..c9781b3cf1 100644 --- a/engines/xeen/screen.cpp +++ b/engines/xeen/screen.cpp @@ -163,14 +163,14 @@ void Screen::restoreBackground(int slot) { blitFrom(_savedScreens[slot - 1]); } -bool Screen::doScroll(bool rollUp, bool fadeIn) { +bool Screen::doScroll(bool rollUp, bool fadeInFlag) { Screen &screen = *_vm->_screen; EventsManager &events = *_vm->_events; const int SCROLL_L[8] = { 29, 23, 15, -5, -11, -23, -49, -71 }; const int SCROLL_R[8] = { 165, 171, 198, 218, 228, 245, 264, 281 }; if (_vm->_files->_isDarkCc) { - if (fadeIn) + if (fadeInFlag) screen.fadeIn(2); return _vm->shouldExit(); } @@ -212,7 +212,7 @@ bool Screen::doScroll(bool rollUp, bool fadeIn) { while (!_vm->shouldExit() && events.timeElapsed() == 0) events.pollEventsAndWait(); - if (i == 0 && fadeIn) + if (i == 0 && fadeInFlag) screen.fadeIn(2); } } else { @@ -237,7 +237,7 @@ bool Screen::doScroll(bool rollUp, bool fadeIn) { while (!_vm->shouldExit() && events.timeElapsed() == 0) events.pollEventsAndWait(); - if (i == 0 && fadeIn) + if (i == 0 && fadeInFlag) screen.fadeIn(2); } } diff --git a/engines/xeen/screen.h b/engines/xeen/screen.h index 3e7f23e19e..40b6958d9c 100644 --- a/engines/xeen/screen.h +++ b/engines/xeen/screen.h @@ -115,11 +115,11 @@ public: /** * Draws the scroll in the background - * @param rollUp If true, rolls up the scroll. If false, unrolls. - * @param fadeIn If true, does an initial fade in + * @param rollUp If true, rolls up the scroll. If false, unrolls. + * @param fadeInFlag If true, does an initial fade in * @returns True if key or mouse pressed */ - bool doScroll(bool rollUp, bool fadeIn); + bool doScroll(bool rollUp, bool fadeInFlag); }; } // End of namespace Xeen |