aboutsummaryrefslogtreecommitdiff
path: root/scumm/scumm.h
diff options
context:
space:
mode:
authorTravis Howell2005-04-17 12:55:42 +0000
committerTravis Howell2005-04-17 12:55:42 +0000
commitcaae2f00de411c7a26f5d5cd0a31fe23a017e501 (patch)
tree442af92f4dd377ef15926b718066ff1693fe75cb /scumm/scumm.h
parent2141a2648cba0451aec05c8ef2a8ad5dd724ef16 (diff)
downloadscummvm-rg350-caae2f00de411c7a26f5d5cd0a31fe23a017e501.tar.gz
scummvm-rg350-caae2f00de411c7a26f5d5cd0a31fe23a017e501.tar.bz2
scummvm-rg350-caae2f00de411c7a26f5d5cd0a31fe23a017e501.zip
Add separate function for loading palette from choosen room.
Avoid pointer problems. svn-id: r17653
Diffstat (limited to 'scumm/scumm.h')
-rw-r--r--scumm/scumm.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/scumm/scumm.h b/scumm/scumm.h
index 76ba8263bd..6ad002e63c 100644
--- a/scumm/scumm.h
+++ b/scumm/scumm.h
@@ -978,7 +978,8 @@ protected:
void setupEGAPalette();
void setupV1ManiacPalette();
void setupV1ZakPalette();
- void setPalette(int pal, int room);
+ void setPalette(int pal);
+ void setRoomPalette(int pal, int room);
virtual void setPaletteFromPtr(const byte *ptr, int numcolor = -1);
virtual void setPalColor(int index, int r, int g, int b);
void setDirtyColors(int min, int max);