diff options
| author | Matthew Hoops | 2011-08-26 22:44:17 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2011-08-26 22:44:17 -0400 |
| commit | 4a69dc13d92e82fff85dc5a3a923b74ced259ffa (patch) | |
| tree | 8945cd3745fd65f28b043caf7b1beddbbce2b2a1 /engines/gob/palanim.cpp | |
| parent | ad293b249e74dd1cfbdbd721d02145efbdaf9eca (diff) | |
| parent | 5e174cbfe466dbbe8e5470b0a00de1481b986181 (diff) | |
| download | scummvm-rg350-4a69dc13d92e82fff85dc5a3a923b74ced259ffa.tar.gz scummvm-rg350-4a69dc13d92e82fff85dc5a3a923b74ced259ffa.tar.bz2 scummvm-rg350-4a69dc13d92e82fff85dc5a3a923b74ced259ffa.zip | |
Merge remote branch 'upstream/master' into pegasus
Diffstat (limited to 'engines/gob/palanim.cpp')
| -rw-r--r-- | engines/gob/palanim.cpp | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/engines/gob/palanim.cpp b/engines/gob/palanim.cpp index 42aeaf63eb..8a5327c3f1 100644 --- a/engines/gob/palanim.cpp +++ b/engines/gob/palanim.cpp @@ -79,9 +79,6 @@ bool PalAnim::fadeStep(int16 oper) { byte newGreen; byte newBlue; - if (_vm->_global->_colorCount != 256) - error("PalAnim::fadeStep(): Only 256 color mode is supported"); - if (oper == 0) { if (_vm->_global->_setAllPalette) { if (_vm->_global->_inVM != 0) @@ -134,12 +131,6 @@ void PalAnim::fade(Video::PalDesc *palDesc, int16 fadeV, int16 allColors) { _fadeValue = (fadeV < 0) ? -fadeV : 2; - if (_vm->_global->_colorCount < 256) { - if (palDesc) - _vm->_video->setFullPalette(palDesc); - return; - } - if (!_vm->_global->_setAllPalette) { if (!palDesc) { for (i = 0; i < 16; i++) { |