diff options
| author | Martin Kiewitz | 2009-10-15 06:50:42 +0000 |
|---|---|---|
| committer | Martin Kiewitz | 2009-10-15 06:50:42 +0000 |
| commit | 1fe5233c311167804884f93799e68074ab4ae5f3 (patch) | |
| tree | a8a03fcf6e12f62d30d420f56e5a1edb4d6d0f8d /engines | |
| parent | 942dc2ce845fa2fc274b825f71bfefbad8a2b992 (diff) | |
| download | scummvm-rg350-1fe5233c311167804884f93799e68074ab4ae5f3.tar.gz scummvm-rg350-1fe5233c311167804884f93799e68074ab4ae5f3.tar.bz2 scummvm-rg350-1fe5233c311167804884f93799e68074ab4ae5f3.zip | |
SCI/newgui: SciGuiTransitions now doesnt fade in/out color 255 anymore
svn-id: r45103
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/sci/gui/gui_transitions.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/sci/gui/gui_transitions.cpp b/engines/sci/gui/gui_transitions.cpp index bdece3e758..0fcc9cee77 100644 --- a/engines/sci/gui/gui_transitions.cpp +++ b/engines/sci/gui/gui_transitions.cpp @@ -137,12 +137,12 @@ void SciGuiTransitions::fadeOut() { g_system->grabPalette(oldPalette, 0, 256); for (stepNr = 100; stepNr >= 0; stepNr -= 10) { - for (colorNr = 0; colorNr < 256; colorNr++){ + for (colorNr = 1; colorNr < 255; colorNr++){ workPalette[colorNr * 4 + 0] = oldPalette[colorNr * 4] * stepNr / 100; workPalette[colorNr * 4 + 1] = oldPalette[colorNr * 4 + 1] * stepNr / 100; workPalette[colorNr * 4 + 2] = oldPalette[colorNr * 4 + 2] * stepNr / 100; } - g_system->setPalette(workPalette, 0, 256); + g_system->setPalette(workPalette + 4, 1, 254); _gui->wait(2); } } @@ -154,13 +154,13 @@ void SciGuiTransitions::fadeIn() { int16 stepNr, colorNr; for (stepNr = 0; stepNr <= 100; stepNr += 10) { - for (colorNr = 0; colorNr < 256; colorNr++){ + for (colorNr = 1; colorNr < 255; colorNr++){ workPalette[colorNr * 4 + 0] = newPalette->colors[colorNr].r * stepNr / 100; workPalette[colorNr * 4 + 1] = newPalette->colors[colorNr].g * stepNr / 100; workPalette[colorNr * 4 + 2] = newPalette->colors[colorNr].b * stepNr / 100; workPalette[colorNr * 4 + 3] = 100; } - g_system->setPalette(workPalette, 0, 256); + g_system->setPalette(workPalette + 4, 1, 254); _gui->wait(2); } } |