diff options
author | Sven Hesse | 2014-03-16 15:15:07 +0100 |
---|---|---|
committer | Sven Hesse | 2014-03-16 15:35:35 +0100 |
commit | 0f9b1364cf0f4e15abd4c11519f4cbbcda44789f (patch) | |
tree | a6d3c828ebe83ce7671ea1748c2042a17cd66951 /engines/gob/minigames | |
parent | 175cc60a0fff5cf20351020dcc246cb0ce396d38 (diff) | |
download | scummvm-rg350-0f9b1364cf0f4e15abd4c11519f4cbbcda44789f.tar.gz scummvm-rg350-0f9b1364cf0f4e15abd4c11519f4cbbcda44789f.tar.bz2 scummvm-rg350-0f9b1364cf0f4e15abd4c11519f4cbbcda44789f.zip |
GOB: Remove the last remnants of Draw::_vgaSmallPalette
Draw::_vgaSmallPalette was supposed to be a 16-color VGA
palette / EGA palette, but we've been using the first 16
entries of Draw::_vgaPalette for that for ages now.
The only parts where we didn't were codepaths never
actually taken in the gob games, so for the sake of
clarity (and fixing Coverity issues), this commit removes
those as well.
Fixes Coverity issues 1192648 and 1192649.
Diffstat (limited to 'engines/gob/minigames')
-rw-r--r-- | engines/gob/minigames/geisha/diving.cpp | 3 | ||||
-rw-r--r-- | engines/gob/minigames/geisha/penetration.cpp | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/engines/gob/minigames/geisha/diving.cpp b/engines/gob/minigames/geisha/diving.cpp index 20c0688dd7..37ef291a93 100644 --- a/engines/gob/minigames/geisha/diving.cpp +++ b/engines/gob/minigames/geisha/diving.cpp @@ -389,8 +389,7 @@ void Diving::initScreen() { _vm->_util->setFrameRate(15); // Set palette - memcpy(_vm->_draw->_vgaPalette , kPalette, sizeof(kPalette)); - memcpy(_vm->_draw->_vgaSmallPalette, kPalette, sizeof(kPalette)); + memcpy(_vm->_draw->_vgaPalette, kPalette, sizeof(kPalette)); // Draw background decal _vm->_draw->_backSurface->clear(); diff --git a/engines/gob/minigames/geisha/penetration.cpp b/engines/gob/minigames/geisha/penetration.cpp index 16742c712f..0ebcd2c55b 100644 --- a/engines/gob/minigames/geisha/penetration.cpp +++ b/engines/gob/minigames/geisha/penetration.cpp @@ -840,8 +840,7 @@ void Penetration::setPalette() { _vm->_palAnim->fade(0, 0, 0); // Set palette - memcpy(_vm->_draw->_vgaPalette , kPalettes[_floor], 3 * kPaletteSize); - memcpy(_vm->_draw->_vgaSmallPalette, kPalettes[_floor], 3 * kPaletteSize); + memcpy(_vm->_draw->_vgaPalette, kPalettes[_floor], 3 * kPaletteSize); _needFadeIn = true; } |