diff options
| author | dhewg | 2011-02-14 12:18:34 +0100 |
|---|---|---|
| committer | Johannes Schickel | 2011-02-14 17:08:33 +0100 |
| commit | 2e9bf212e889de78c66d9c4e3564327727389e6e (patch) | |
| tree | d0addc59df8466f4f67ff439b848e49e4e58f81f /engines/sky/screen.h | |
| parent | f850ad2ced921e15b226a3f9db551fb96042e0dd (diff) | |
| download | scummvm-rg350-2e9bf212e889de78c66d9c4e3564327727389e6e.tar.gz scummvm-rg350-2e9bf212e889de78c66d9c4e3564327727389e6e.tar.bz2 scummvm-rg350-2e9bf212e889de78c66d9c4e3564327727389e6e.zip | |
SKY: Adapt to [set|grab]Palette RGBA->RGB change.
Diffstat (limited to 'engines/sky/screen.h')
| -rw-r--r-- | engines/sky/screen.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/sky/screen.h b/engines/sky/screen.h index 048f5c1e3e..bf5eeacf24 100644 --- a/engines/sky/screen.h +++ b/engines/sky/screen.h @@ -45,8 +45,8 @@ struct DataFileHeader; #define SCROLL_JUMP 16 #define VGA_COLOURS 256 -#define GAME_COLOURS 240 -#define SEQ_DELAY 3 +#define GAME_COLOURS 240 +#define SEQ_DELAY 3 #define FORE 1 #define BACK 0 @@ -101,8 +101,8 @@ private: OSystem *_system; Disk *_skyDisk; SkyCompact *_skyCompact; - static uint8 _top16Colours[16*3]; - uint8 _palette[1024]; + static uint8 _top16Colours[16 * 3]; + uint8 _palette[VGA_COLOURS * 3]; uint32 _currentPalette; uint8 _seqGrid[20 * 12]; @@ -123,7 +123,7 @@ private: //- more regular screen.asm + layer.asm routines void convertPalette(uint8 *inPal, uint8* outPal); - void palette_fadedown_helper(uint32 *pal, uint num); + void palette_fadedown_helper(uint8 *pal, uint num); //- sprite.asm routines // fixme: get rid of these globals |