diff options
author | Johannes Schickel | 2006-01-06 10:45:42 +0000 |
---|---|---|
committer | Johannes Schickel | 2006-01-06 10:45:42 +0000 |
commit | 948cb0d0f77170fdbc1b80b07feea7b9794751bc (patch) | |
tree | 0a1baf14a227be19042a51c8ccc00f41af01df52 /kyra/screen.h | |
parent | a5601efd54c366cedb7f90bcb4573297232c17b0 (diff) | |
download | scummvm-rg350-948cb0d0f77170fdbc1b80b07feea7b9794751bc.tar.gz scummvm-rg350-948cb0d0f77170fdbc1b80b07feea7b9794751bc.tar.bz2 scummvm-rg350-948cb0d0f77170fdbc1b80b07feea7b9794751bc.zip |
Implemented the end sequence, (only the rest of the winning end sequence
is missing yet and one text part that malcolm says).
=> Kyra *should* be completeable now.
Also used KyraEngine:: in all debug calls from the KyraEngine class.
And fixes a bug while drawing shapes.
svn-id: r19928
Diffstat (limited to 'kyra/screen.h')
-rw-r--r-- | kyra/screen.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/kyra/screen.h b/kyra/screen.h index e853b324b4..b090930d1e 100644 --- a/kyra/screen.h +++ b/kyra/screen.h @@ -30,6 +30,7 @@ class OSystem; namespace Kyra { class KyraEngine; +struct Rect; struct ScreenDim { uint16 sx; @@ -98,7 +99,8 @@ public: void copyToPage0(int y, int h, uint8 page, uint8 *seqBuf); void copyRegion(int x1, int y1, int x2, int y2, int w, int h, int srcPage, int dstPage, int flags=0); void copyBlockToPage(int pageNum, int x, int y, int w, int h, const uint8 *src); - void copyCurPageBlock(int x, int y, int h, int w, uint8 *dst); + void copyFromCurPageBlock(int x, int y, int w, int h, const uint8 *src); + void copyCurPageBlock(int x, int y, int w, int h, uint8 *dst); void shuffleScreen(int sx, int sy, int w, int h, int srcPage, int dstPage, int ticks, bool transparent); void fillRect(int x1, int y1, int x2, int y2, uint8 color, int pageNum = -1); void setAnimBlockPtr(int size); @@ -131,6 +133,9 @@ public: byte getShapeFlag2(int x, int y); int setNewShapeHeight(uint8 *shape, int height); int resetShapeHeight(uint8 *shape); + + void addBitBlitRect(int x, int y, int w, int w); + void bitBlitRects(); int _charWidth; int _charOffset; @@ -159,6 +164,9 @@ private: uint8 *_animBlockPtr; int _animBlockSize; int _mouseLockCount; + + Rect *_bitBlitRects; + int _bitBlitNum; OSystem *_system; KyraEngine *_vm; |