diff options
| author | Norbert Lange | 2009-08-02 01:00:56 +0000 |
|---|---|---|
| committer | Norbert Lange | 2009-08-02 01:00:56 +0000 |
| commit | ed8f02af96b56137b75d48e32c87de7b825a33e3 (patch) | |
| tree | a8219e4514d8c2543a747b94aa8fc46cea6e5033 /engines/scumm/scumm.h | |
| parent | 2a4c60244bd57e807a88bc6064af1a265d33a130 (diff) | |
| download | scummvm-rg350-ed8f02af96b56137b75d48e32c87de7b825a33e3.tar.gz scummvm-rg350-ed8f02af96b56137b75d48e32c87de7b825a33e3.tar.bz2 scummvm-rg350-ed8f02af96b56137b75d48e32c87de7b825a33e3.zip | |
synced the branch with the palette patch (#2819787)
svn-id: r42987
Diffstat (limited to 'engines/scumm/scumm.h')
| -rw-r--r-- | engines/scumm/scumm.h | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/engines/scumm/scumm.h b/engines/scumm/scumm.h index 143051c162..8ce76c4184 100644 --- a/engines/scumm/scumm.h +++ b/engines/scumm/scumm.h @@ -1018,16 +1018,7 @@ protected: const byte *getPalettePtr(int palindex, int room); - void setHardcodedPaletteRGB(const byte *ptr, int numcolor, int firstIndex = 0); - void setC64Palette(); - void setNESPalette(); - void setAmigaPalette(); - void setAmigaMIPalette(); - void setHercPalette(); - void setCGAPalette(); - void setEGAPalette(); - void setV1Palette(); - + void setPaletteFromTable(const byte *ptr, int numcolor, int firstIndex = 0); void resetPalette(); void setCurrentPalette(int pal); |