diff options
| -rw-r--r-- | engines/sci/graphics/transitions.cpp | 6 | ||||
| -rw-r--r-- | engines/sci/graphics/transitions.h | 3 | ||||
| -rw-r--r-- | engines/sci/sci.cpp | 2 |
3 files changed, 5 insertions, 6 deletions
diff --git a/engines/sci/graphics/transitions.cpp b/engines/sci/graphics/transitions.cpp index 7643812331..fac9a97efe 100644 --- a/engines/sci/graphics/transitions.cpp +++ b/engines/sci/graphics/transitions.cpp @@ -39,8 +39,8 @@ namespace Sci { //#define DISABLE_TRANSITIONS // uncomment to disable room transitions (for development only! helps in testing games quickly) -GfxTransitions::GfxTransitions(GfxScreen *screen, GfxPalette *palette, bool isVGA) - : _screen(screen), _palette(palette), _isVGA(isVGA) { +GfxTransitions::GfxTransitions(GfxScreen *screen, GfxPalette *palette) + : _screen(screen), _palette(palette) { init(); } @@ -272,7 +272,7 @@ void GfxTransitions::doTransition(int16 number, bool blackoutFlag) { } void GfxTransitions::setNewPalette(bool blackoutFlag) { - if (!blackoutFlag && _isVGA) + if (!blackoutFlag) _palette->setOnScreen(); } diff --git a/engines/sci/graphics/transitions.h b/engines/sci/graphics/transitions.h index 674b7a8173..a8f0ca6f07 100644 --- a/engines/sci/graphics/transitions.h +++ b/engines/sci/graphics/transitions.h @@ -65,7 +65,7 @@ class Screen; */ class GfxTransitions { public: - GfxTransitions(GfxScreen *screen, GfxPalette *palette, bool isVGA); + GfxTransitions(GfxScreen *screen, GfxPalette *palette); ~GfxTransitions(); void setup(int16 number, bool blackoutFlag); @@ -97,7 +97,6 @@ private: GfxScreen *_screen; GfxPalette *_palette; - bool _isVGA; const GfxTransitionTranslateEntry *_translationTable; int16 _number; bool _blackoutFlag; diff --git a/engines/sci/sci.cpp b/engines/sci/sci.cpp index b590103874..89a81dc441 100644 --- a/engines/sci/sci.cpp +++ b/engines/sci/sci.cpp @@ -642,7 +642,7 @@ void SciEngine::initGraphics() { _gfxCoordAdjuster = new GfxCoordAdjuster16(_gfxPorts); _gfxCursor->init(_gfxCoordAdjuster, _eventMan); _gfxCompare = new GfxCompare(_gamestate->_segMan, _kernel, _gfxCache, _gfxScreen, _gfxCoordAdjuster); - _gfxTransitions = new GfxTransitions(_gfxScreen, _gfxPalette, _resMan->isVGA()); + _gfxTransitions = new GfxTransitions(_gfxScreen, _gfxPalette); _gfxPaint16 = new GfxPaint16(_resMan, _gamestate->_segMan, _kernel, _gfxCache, _gfxPorts, _gfxCoordAdjuster, _gfxScreen, _gfxPalette, _gfxTransitions, _audio); _gfxPaint = _gfxPaint16; _gfxAnimate = new GfxAnimate(_gamestate, _gfxCache, _gfxPorts, _gfxPaint16, _gfxScreen, _gfxPalette, _gfxCursor, _gfxTransitions); |