aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schickel2011-02-15 22:15:33 +0100
committerJohannes Schickel2011-02-15 22:16:59 +0100
commit3b9da7f03b52c57c66ba79cc28d60ffdda5ec970 (patch)
tree7f1581181ae367e22e63c608be18b798c093a95d
parent83f66284a71b496f761b06d675dd9637d863809f (diff)
downloadscummvm-rg350-3b9da7f03b52c57c66ba79cc28d60ffdda5ec970.tar.gz
scummvm-rg350-3b9da7f03b52c57c66ba79cc28d60ffdda5ec970.tar.bz2
scummvm-rg350-3b9da7f03b52c57c66ba79cc28d60ffdda5ec970.zip
VIDEO: Adapt VideoDecoder::setSystemPalette to setPalette RGBA->RGB change.
-rw-r--r--video/video_decoder.cpp13
1 files changed, 1 insertions, 12 deletions
diff --git a/video/video_decoder.cpp b/video/video_decoder.cpp
index 3f23d83761..a6317bac8f 100644
--- a/video/video_decoder.cpp
+++ b/video/video_decoder.cpp
@@ -50,18 +50,7 @@ uint32 VideoDecoder::getElapsedTime() const {
}
void VideoDecoder::setSystemPalette() {
- const byte *vidPalette = getPalette();
- byte *sysPalette = new byte[256 * 4];
-
- for (uint16 i = 0; i < 256; i++) {
- sysPalette[i * 4] = vidPalette[i * 3];
- sysPalette[i * 4 + 1] = vidPalette[i * 3 + 1];
- sysPalette[i * 4 + 2] = vidPalette[i * 3 + 2];
- sysPalette[i * 4 + 3] = 0;
- }
-
- g_system->getPaletteManager()->setPalette(sysPalette, 0, 256);
- delete[] sysPalette;
+ g_system->getPaletteManager()->setPalette(getPalette(), 0, 256);
}
bool VideoDecoder::needsUpdate() const {