aboutsummaryrefslogtreecommitdiff
path: root/scumm/palette.cpp
diff options
context:
space:
mode:
authorMax Horn2004-09-21 12:44:34 +0000
committerMax Horn2004-09-21 12:44:34 +0000
commit899a64cbc92184086219306dcbd83b122b3c81a0 (patch)
tree5e8d65a966cd439ed68f8016dfa49bacc6bb5463 /scumm/palette.cpp
parent62ff56804c34aaaf2741fea33eee5d681a9a28b4 (diff)
downloadscummvm-rg350-899a64cbc92184086219306dcbd83b122b3c81a0.tar.gz
scummvm-rg350-899a64cbc92184086219306dcbd83b122b3c81a0.tar.bz2
scummvm-rg350-899a64cbc92184086219306dcbd83b122b3c81a0.zip
cleanup
svn-id: r15222
Diffstat (limited to 'scumm/palette.cpp')
-rw-r--r--scumm/palette.cpp7
1 files changed, 0 insertions, 7 deletions
diff --git a/scumm/palette.cpp b/scumm/palette.cpp
index 5f4ed3b09d..99c2a9f665 100644
--- a/scumm/palette.cpp
+++ b/scumm/palette.cpp
@@ -149,12 +149,6 @@ void ScummEngine::setPaletteFromPtr(const byte *ptr, int numcolor) {
setDirtyColors(0, numcolor - 1);
}
-void ScummEngine::setPaletteFromRes() {
- byte *ptr;
- ptr = getResourceAddress(rtRoom, _roomResource) + _CLUT_offs;
- setPaletteFromPtr(ptr);
-}
-
void ScummEngine::setDirtyColors(int min, int max) {
if (_palDirtyMin > min)
_palDirtyMin = min;
@@ -170,7 +164,6 @@ void ScummEngine::initCycl(const byte *ptr) {
if (_features & GF_SMALL_HEADER) {
cycl = _colorCycle;
- ptr += 6;
for (j = 0; j < 16; ++j, ++cycl) {
uint16 delay = READ_BE_UINT16(ptr);
ptr += 2;