aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra/screen_v2.h
diff options
context:
space:
mode:
authorJohannes Schickel2008-02-10 18:34:48 +0000
committerJohannes Schickel2008-02-10 18:34:48 +0000
commitb407420ebb4249a1cc0fc40f10f90c0bd1fd0b9b (patch)
tree737fc2811f25eb8df851ae338f400581337c4ebf /engines/kyra/screen_v2.h
parentcb6fb6200d207ab4b5c3e30539365762f9fbf6ac (diff)
downloadscummvm-rg350-b407420ebb4249a1cc0fc40f10f90c0bd1fd0b9b.tar.gz
scummvm-rg350-b407420ebb4249a1cc0fc40f10f90c0bd1fd0b9b.tar.bz2
scummvm-rg350-b407420ebb4249a1cc0fc40f10f90c0bd1fd0b9b.zip
Committed patch #1885629 "KYRA: HoF missing talkie credits and demo support".
svn-id: r30845
Diffstat (limited to 'engines/kyra/screen_v2.h')
-rw-r--r--engines/kyra/screen_v2.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/kyra/screen_v2.h b/engines/kyra/screen_v2.h
index 6931f5e4d4..b31b1de46a 100644
--- a/engines/kyra/screen_v2.h
+++ b/engines/kyra/screen_v2.h
@@ -46,10 +46,10 @@ public:
void applyGrayOverlay(int x, int y, int w, int h, int pageNum, const uint8 *grayOverlay);
int findLeastDifferentColor(const uint8 *paletteEntry, const uint8 *palette, uint16 numColors);
bool calcBounds(int w0, int h0, int &x1, int &y1, int &w1, int &h1, int &x2, int &y2, int &w2);
- void wsaFrameAnimationStep(int x1, int y1, int x2, int y2,
- int w1, int h1, int w2, int h2, int srcPage, int dstPage, int dim);
- 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 wsaFrameAnimationStep(int x1, int y1, int x2, int y2, int w1, int h1, int w2, int h2, int srcPage, int dstPage, int dim);
+ 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);
// screen page handling
void copyWsaRect(int x, int y, int w, int h, int dimState, int plotFunc, const uint8 *src,