aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schickel2009-06-25 19:54:41 +0000
committerJohannes Schickel2009-06-25 19:54:41 +0000
commitc3672f8433f762e7f7a33651e82a6732dc2ded54 (patch)
tree4cdb374dea0afe63946b1ee2f2e105a76cceb286
parentdca6ec26539983fffdf6ae84c390f7dd30ef7ac2 (diff)
downloadscummvm-rg350-c3672f8433f762e7f7a33651e82a6732dc2ded54.tar.gz
scummvm-rg350-c3672f8433f762e7f7a33651e82a6732dc2ded54.tar.bz2
scummvm-rg350-c3672f8433f762e7f7a33651e82a6732dc2ded54.zip
Replace yet another palette from file loading with Screen::loadPalette.
svn-id: r41878
-rw-r--r--engines/kyra/seqplayer.cpp6
1 files changed, 1 insertions, 5 deletions
diff --git a/engines/kyra/seqplayer.cpp b/engines/kyra/seqplayer.cpp
index a027444630..2145591c03 100644
--- a/engines/kyra/seqplayer.cpp
+++ b/engines/kyra/seqplayer.cpp
@@ -249,11 +249,7 @@ void SeqPlayer::s1_loadPalette() {
_screen->setScreenPalette(_screen->getPalette(0));
} else {
- uint32 fileSize;
- uint8 *srcData;
- srcData = _res->fileData(_vm->seqCOLTable()[colNum], &fileSize);
- memcpy(_screen->getPalette(0).getData(), srcData, fileSize);
- delete[] srcData;
+ _screen->loadPalette(_vm->seqCOLTable()[colNum], _screen->getPalette(0));
}
}