diff options
| author | Norbert Lange | 2009-07-01 14:45:24 +0000 |
|---|---|---|
| committer | Norbert Lange | 2009-07-01 14:45:24 +0000 |
| commit | abef70f4e14f495b20097cb46411d1fafbafdd53 (patch) | |
| tree | 27462f82f352b303ac059dd275466930c88b2de6 /engines/kyra/screen_v2.h | |
| parent | 3b94e2488df9a699a899727515ac69af6a0a1a6e (diff) | |
| parent | f9298ff40310149779b37ccdecc873afba7adf2f (diff) | |
| download | scummvm-rg350-abef70f4e14f495b20097cb46411d1fafbafdd53.tar.gz scummvm-rg350-abef70f4e14f495b20097cb46411d1fafbafdd53.tar.bz2 scummvm-rg350-abef70f4e14f495b20097cb46411d1fafbafdd53.zip | |
Merging in changes from trunk
svn-id: r41989
Diffstat (limited to 'engines/kyra/screen_v2.h')
| -rw-r--r-- | engines/kyra/screen_v2.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/engines/kyra/screen_v2.h b/engines/kyra/screen_v2.h index 18bac764ec..3aa726334c 100644 --- a/engines/kyra/screen_v2.h +++ b/engines/kyra/screen_v2.h @@ -37,17 +37,14 @@ public: ~Screen_v2(); // screen page handling - void copyWsaRect(int x, int y, int w, int h, int dimState, int plotFunc, const uint8 *src, - int unk1, const uint8 *unkPtr1, const uint8 *unkPtr2); - void checkedPageUpdate(int srcPage, int dstPage); // palette handling - uint8 *generateOverlay(const uint8 *palette, uint8 *buffer, int color, uint16 factor); + uint8 *generateOverlay(const Palette &pal, uint8 *buffer, int color, uint16 factor); void applyOverlay(int x, int y, int w, int h, int pageNum, const uint8 *overlay); - int findLeastDifferentColor(const uint8 *paletteEntry, const uint8 *palette, uint16 numColors, bool skipSpecialColors = false); + int findLeastDifferentColor(const uint8 *paletteEntry, const Palette &pal, uint8 firstColor, uint16 numColors, bool skipSpecialColors = false); - virtual void getFadeParams(const uint8 *palette, int delay, int &delayInc, int &diff); + virtual void getFadeParams(const Palette &pal, int delay, int &delayInc, int &diff); // shape handling uint8 *getPtrToShape(uint8 *shpFile, int shape); |