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_hof.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_hof.h')
| -rw-r--r-- | engines/kyra/screen_hof.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/kyra/screen_hof.h b/engines/kyra/screen_hof.h index 088e8b7f55..1c17a424b3 100644 --- a/engines/kyra/screen_hof.h +++ b/engines/kyra/screen_hof.h @@ -41,7 +41,7 @@ public: const ScreenDim *getScreenDim(int dim); // sequence player - void generateGrayOverlay(const uint8 *srcPal, uint8 *grayOverlay, int factor, int addR, int addG, int addB, int lastColor, bool flag); + void generateGrayOverlay(const Palette &pal, uint8 *grayOverlay, int factor, int addR, int addG, int addB, int lastColor, bool flag); void cmpFadeFrameStep(int srcPage, int srcW, int srcH, int srcX, int srcY, int dstPage, int dstW, int dstH, int dstX, int dstY, int cmpW, int cmpH, int cmpPage); void copyPageMemory(int srcPage, int srcPos, int dstPage, int dstPos, int numBytes); void copyRegionEx(int srcPage, int srcW, int srcH, int dstPage, int dstX,int dstY, int dstW, int dstH, const ScreenDim *d, bool flag = false); |