aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSven Hesse2011-08-26 05:00:28 +0200
committerSven Hesse2011-08-26 05:00:28 +0200
commit479eeb7e47e8bb27551ba49f7d37c36b3b1b88ee (patch)
treed04c9659b235af5850cf78352f14df139ecf710b
parent225f0ad3dce3bbfcf7c361f3797b9ef0afe2e73a (diff)
downloadscummvm-rg350-479eeb7e47e8bb27551ba49f7d37c36b3b1b88ee.tar.gz
scummvm-rg350-479eeb7e47e8bb27551ba49f7d37c36b3b1b88ee.tar.bz2
scummvm-rg350-479eeb7e47e8bb27551ba49f7d37c36b3b1b88ee.zip
GOB: Actually, we do support 16 color fading
-rw-r--r--engines/gob/palanim.cpp9
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++) {