aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm/smush
diff options
context:
space:
mode:
authorJohannes Schickel2011-02-13 20:10:34 +0100
committerJohannes Schickel2011-02-14 17:08:33 +0100
commitbb9e82c3b3f56ac9fd985c8f8d22f6d1dc0cc5e7 (patch)
treecbeee36c1a19fbcefffcb93db97087eef6879617 /engines/scumm/smush
parentbba430eebc2a0701b9cea5fd5cc57ec1da87a5c9 (diff)
downloadscummvm-rg350-bb9e82c3b3f56ac9fd985c8f8d22f6d1dc0cc5e7.tar.gz
scummvm-rg350-bb9e82c3b3f56ac9fd985c8f8d22f6d1dc0cc5e7.tar.bz2
scummvm-rg350-bb9e82c3b3f56ac9fd985c8f8d22f6d1dc0cc5e7.zip
SCUMM: Adapt to setPalette RGBA->RGB change.
Diffstat (limited to 'engines/scumm/smush')
-rw-r--r--engines/scumm/smush/smush_player.cpp14
1 files changed, 1 insertions, 13 deletions
diff --git a/engines/scumm/smush/smush_player.cpp b/engines/scumm/smush/smush_player.cpp
index ad8a135a7c..fe2b9d99ff 100644
--- a/engines/scumm/smush/smush_player.cpp
+++ b/engines/scumm/smush/smush_player.cpp
@@ -1217,19 +1217,7 @@ void SmushPlayer::play(const char *filename, int32 speed, int32 offset, int32 st
_vm->parseEvents();
_vm->processInput();
if (_palDirtyMax >= _palDirtyMin) {
- byte palette_colors[1024];
- byte *p = palette_colors;
-
- for (int i = _palDirtyMin; i <= _palDirtyMax; i++) {
- byte *data = _pal + i * 3;
-
- *p++ = data[0];
- *p++ = data[1];
- *p++ = data[2];
- *p++ = 0;
- }
-
- _vm->_system->getPaletteManager()->setPalette(palette_colors, _palDirtyMin, _palDirtyMax - _palDirtyMin + 1);
+ _vm->_system->getPaletteManager()->setPalette(_pal + _palDirtyMin * 3, _palDirtyMin, _palDirtyMax - _palDirtyMin + 1);
_palDirtyMax = -1;
_palDirtyMin = 256;