diff options
| author | Filippos Karapetis | 2016-01-15 01:33:24 +0200 |
|---|---|---|
| committer | Filippos Karapetis | 2016-01-15 01:33:24 +0200 |
| commit | d44c150d16b2d1d3b1aec4181fe6328db36cd8fd (patch) | |
| tree | d97024e5ae5e04c17939769b9e7dd6d91682d0b0 /engines/sci/graphics/frameout.cpp | |
| parent | 6269075ad67de618722e1c9e1e712950a749002b (diff) | |
| parent | 40f6d74d97618adc80d10244a77c444bf7e613eb (diff) | |
| download | scummvm-rg350-d44c150d16b2d1d3b1aec4181fe6328db36cd8fd.tar.gz scummvm-rg350-d44c150d16b2d1d3b1aec4181fe6328db36cd8fd.tar.bz2 scummvm-rg350-d44c150d16b2d1d3b1aec4181fe6328db36cd8fd.zip | |
Merge pull request #649 from csnover/sci32-kPalette
SCI32: kPalVary, kPalette fade support, kPalette findColor support, improvements to game time management
Diffstat (limited to 'engines/sci/graphics/frameout.cpp')
| -rw-r--r-- | engines/sci/graphics/frameout.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/engines/sci/graphics/frameout.cpp b/engines/sci/graphics/frameout.cpp index 9512ec2ed1..90bd798a1b 100644 --- a/engines/sci/graphics/frameout.cpp +++ b/engines/sci/graphics/frameout.cpp @@ -748,12 +748,11 @@ void GfxFrameout::kernelFrameout() { return; } - _palette->palVaryUpdate(); - _palette->applyCycles(); - _palette->applyFade(); - // TODO: This should probably not require screen pic invalidation - _screen->_picNotValid = 1; - _palette->setOnScreen(); + _palette->updateForFrame(); + + // TODO: Tons of drawing stuff should be here, see commented out implementation above + + _palette->updateHardware(); for (PlaneList::iterator it = _planes.begin(); it != _planes.end(); it++) { reg_t planeObject = it->object; |