diff options
author | Matthew Hoops | 2011-05-11 00:30:02 -0400 |
---|---|---|
committer | Matthew Hoops | 2011-05-11 00:30:28 -0400 |
commit | a1d41da096c0bcf502a85919cb1cb1ee471719c5 (patch) | |
tree | 8c51419daa486f1d4833757db4715dadab6c3497 /engines/sci/graphics/screen.cpp | |
parent | accb0c2a5d0c9e7b353cda4b74f511a498ed8073 (diff) | |
parent | 33c3e19cea2a08fbf26ecbe940763e8ee1c37d28 (diff) | |
download | scummvm-rg350-a1d41da096c0bcf502a85919cb1cb1ee471719c5.tar.gz scummvm-rg350-a1d41da096c0bcf502a85919cb1cb1ee471719c5.tar.bz2 scummvm-rg350-a1d41da096c0bcf502a85919cb1cb1ee471719c5.zip |
Merge remote branch 'upstream/master' into t7g-ios
Conflicts:
audio/decoders/qdm2.h
common/util.cpp
engines/groovie/music.cpp
engines/groovie/resource.h
video/qt_decoder.cpp
video/qt_decoder.h
Diffstat (limited to 'engines/sci/graphics/screen.cpp')
-rw-r--r-- | engines/sci/graphics/screen.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/sci/graphics/screen.cpp b/engines/sci/graphics/screen.cpp index f619780c7c..56e6759fac 100644 --- a/engines/sci/graphics/screen.cpp +++ b/engines/sci/graphics/screen.cpp @@ -111,7 +111,7 @@ GfxScreen::GfxScreen(ResourceManager *resMan) : _resMan(resMan) { _picNotValid = 0; _picNotValidSci11 = 0; - _unditherState = true; + _unditheringEnabled = true; _fontIsUpscaled = false; if (_resMan->getViewType() != kViewEga) { @@ -560,7 +560,7 @@ void GfxScreen::dither(bool addToFlag) { byte *visualPtr = _visualScreen; byte *displayPtr = _displayScreen; - if (!_unditherState) { + if (!_unditheringEnabled) { // Do dithering on visual and display-screen for (y = 0; y < _height; y++) { for (x = 0; x < _width; x++) { @@ -624,13 +624,13 @@ void GfxScreen::ditherForceDitheredColor(byte color) { _ditheredPicColors[color] = 256; } -void GfxScreen::debugUnditherSetState(bool flag) { - _unditherState = flag; +void GfxScreen::enableUndithering(bool flag) { + _unditheringEnabled = flag; } int16 *GfxScreen::unditherGetDitheredBgColors() { - if (_unditherState) - return (int16 *)&_ditheredPicColors; + if (_unditheringEnabled) + return _ditheredPicColors; else return NULL; } |