diff options
| -rw-r--r-- | engines/pegasus/graphics.cpp | 8 | ||||
| -rw-r--r-- | engines/pegasus/graphics.h | 4 | ||||
| -rw-r--r-- | engines/pegasus/neighborhood/caldoria/caldoria.cpp | 5 |
3 files changed, 8 insertions, 9 deletions
diff --git a/engines/pegasus/graphics.cpp b/engines/pegasus/graphics.cpp index 8d0347ebc4..1712ed5f1a 100644 --- a/engines/pegasus/graphics.cpp +++ b/engines/pegasus/graphics.cpp @@ -204,13 +204,13 @@ DisplayElement *GraphicsManager::findDisplayElement(const DisplayElementID id) { return 0; } -void GraphicsManager::doFadeOutSync(const TimeValue time, const TimeScale scale, uint32 color) { +void GraphicsManager::doFadeOutSync(const TimeValue time, const TimeScale scale, bool isBlack) { _updatesEnabled = false; - _screenFader->doFadeOutSync(time, scale, color == 0); + _screenFader->doFadeOutSync(time, scale, isBlack); } -void GraphicsManager::doFadeInSync(const TimeValue time, const TimeScale scale, uint32 color) { - _screenFader->doFadeInSync(time, scale, color == 0); +void GraphicsManager::doFadeInSync(const TimeValue time, const TimeScale scale, bool isBlack) { + _screenFader->doFadeInSync(time, scale, isBlack); _updatesEnabled = true; } diff --git a/engines/pegasus/graphics.h b/engines/pegasus/graphics.h index 2d66cd9aaa..799f996e16 100644 --- a/engines/pegasus/graphics.h +++ b/engines/pegasus/graphics.h @@ -66,8 +66,8 @@ public: void disableUpdates(); // These default to black - void doFadeOutSync(const TimeValue = kOneSecondPerThirtyTicks, const TimeScale = kThirtyTicksPerSecond, uint32 color = 0); - void doFadeInSync(const TimeValue = kOneSecondPerThirtyTicks, const TimeScale = kThirtyTicksPerSecond, uint32 color = 0); + void doFadeOutSync(const TimeValue = kOneSecondPerThirtyTicks, const TimeScale = kThirtyTicksPerSecond, bool isBlack = true); + void doFadeInSync(const TimeValue = kOneSecondPerThirtyTicks, const TimeScale = kThirtyTicksPerSecond, bool isBlack = true); protected: void markCursorAsDirty(); diff --git a/engines/pegasus/neighborhood/caldoria/caldoria.cpp b/engines/pegasus/neighborhood/caldoria/caldoria.cpp index 817a24a162..ce62b17265 100644 --- a/engines/pegasus/neighborhood/caldoria/caldoria.cpp +++ b/engines/pegasus/neighborhood/caldoria/caldoria.cpp @@ -249,15 +249,14 @@ void Caldoria::start() { ExtraTable::Entry entry; if (!skipped) { - uint32 white = g_system->getScreenFormat().RGBToColor(0xff, 0xff, 0xff); - _vm->_gfx->doFadeOutSync(kThreeSeconds * kFifteenTicksPerSecond, kFifteenTicksPerSecond, white); + _vm->_gfx->doFadeOutSync(kThreeSeconds * kFifteenTicksPerSecond, kFifteenTicksPerSecond, false); g_system->delayMillis(3 * 1000 / 2); getExtraEntry(kCaldoria00WakeUp1, entry); _navMovie.setTime(entry.movieStart); _navMovie.redrawMovieWorld(); _navMovie.show(); _vm->refreshDisplay(); - _vm->_gfx->doFadeInSync(kOneSecond * kFifteenTicksPerSecond, kFifteenTicksPerSecond, white); + _vm->_gfx->doFadeInSync(kOneSecond * kFifteenTicksPerSecond, kFifteenTicksPerSecond, false); } else { getExtraEntry(kCaldoria00WakeUp1, entry); _navMovie.setTime(entry.movieStart); |