diff options
author | Florian Kagerer | 2009-03-08 02:17:14 +0000 |
---|---|---|
committer | Florian Kagerer | 2009-03-08 02:17:14 +0000 |
commit | e23fd08dfbdac9d6eedb78813d3504eeccba31a5 (patch) | |
tree | ba0a0c81477f8327a2b8275e27cf17fecc12b3da /engines/kyra/screen_lol.cpp | |
parent | cc89a46a0ef8b9bd62e69ab0d6a8c1e28bc46781 (diff) | |
download | scummvm-rg350-e23fd08dfbdac9d6eedb78813d3504eeccba31a5.tar.gz scummvm-rg350-e23fd08dfbdac9d6eedb78813d3504eeccba31a5.tar.bz2 scummvm-rg350-e23fd08dfbdac9d6eedb78813d3504eeccba31a5.zip |
LOL: fixed bug reported by MD5 (crashes and freezes caused by calls to non-existent sub scripts)
svn-id: r39209
Diffstat (limited to 'engines/kyra/screen_lol.cpp')
-rw-r--r-- | engines/kyra/screen_lol.cpp | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/engines/kyra/screen_lol.cpp b/engines/kyra/screen_lol.cpp index 19f2d16d8b..615dd0c4b3 100644 --- a/engines/kyra/screen_lol.cpp +++ b/engines/kyra/screen_lol.cpp @@ -45,7 +45,6 @@ Screen_LoL::Screen_LoL(LoLEngine *vm, OSystem *system) : Screen_v2(vm, system), _levelOverlays[i] = new uint8[256]; _fadeFlag = 2; - _drawGuiFlag = 0; _curDimIndex = 0; _dimLineCount = 0; } @@ -535,28 +534,6 @@ void Screen_LoL::fadeToBlack(int delay, const UpdateFunctor *upFunc) { _fadeFlag = 2; } -void Screen_LoL::setPaletteBrightness(uint8 *palette, int brightness, int modifier) { - generateBrightnessPalette(palette, getPalette(1), brightness, modifier); - fadePalette(getPalette(1), 5, 0); - _fadeFlag = 0; -} - -void Screen_LoL::generateBrightnessPalette(uint8 *src, uint8 *dst, int brightness, int modifier) { - memcpy(dst, src, 0x300); - loadSpecialColours(dst); - brightness = (8 - brightness) << 5; - if (modifier >= 0 && modifier < 8 && _drawGuiFlag & 0x800) { - brightness = 256 - ((((modifier & 0xfffe) << 5) * (256 - brightness)) >> 8); - if (brightness < 0) - brightness = 0; - } - - for (int i = 0; i < 384; i++) { - uint16 c = (dst[i] * brightness) >> 8; - dst[i] = c & 0xff; - } -} - void Screen_LoL::loadSpecialColours(uint8 *destPalette) { memcpy(destPalette + 0x240, _screenPalette + 0x240, 12); } |