diff options
| author | Johannes Schickel | 2010-10-13 03:57:44 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2010-10-13 03:57:44 +0000 |
| commit | 75e8452b6e6a2bf4fb2f588aa00b428a60d873b5 (patch) | |
| tree | f29541d55309487a94bd1d38e8b53bb3dde9aec6 /engines/mohawk/graphics.h | |
| parent | 48ee83b88957dab86bc763e9ef21a70179fa8679 (diff) | |
| parent | e9f50882ea5b6beeefa994040be9d3bab6a1f107 (diff) | |
| download | scummvm-rg350-75e8452b6e6a2bf4fb2f588aa00b428a60d873b5.tar.gz scummvm-rg350-75e8452b6e6a2bf4fb2f588aa00b428a60d873b5.tar.bz2 scummvm-rg350-75e8452b6e6a2bf4fb2f588aa00b428a60d873b5.zip | |
OPENGL: Merged from trunk, from rev 52105 to 53396.
This includes an rather hacky attempt to merge all the recent gp2x backend
changes into the branch. I suppose the gp2x backend and probably all new
backends, i.e. gph, dingux etc., might not compile anymore.
Since I have no way of testing those it would be nice if porters could look
into getting those up to speed in this branch.
svn-id: r53399
Diffstat (limited to 'engines/mohawk/graphics.h')
| -rw-r--r-- | engines/mohawk/graphics.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/engines/mohawk/graphics.h b/engines/mohawk/graphics.h index dd1764e6d6..9419aad277 100644 --- a/engines/mohawk/graphics.h +++ b/engines/mohawk/graphics.h @@ -41,6 +41,8 @@ class MohawkBitmap; class MystBitmap; enum { + kRivenOpenHandCursor = 2003, + kRivenClosedHandCursor = 2004, kRivenMainCursor = 3000, kRivenPelletCursor = 5000, kRivenHideCursor = 9000 @@ -117,7 +119,7 @@ private: uint16 type; uint16 width; uint16 height; - } *entries; + } *entries; Common::File picFile; } _pictureFile; @@ -147,6 +149,8 @@ public: Common::Array<uint16> _activatedPLSTs; void drawPLST(uint16 x); void drawRect(Common::Rect rect, bool active); + void drawImageRect(uint16 id, Common::Rect srcRect, Common::Rect dstRect); + void drawExtrasImage(uint16 id, Common::Rect dstRect); // Water Effect void scheduleWaterEffect(uint16); @@ -181,7 +185,6 @@ private: Graphics::Surface *_mainScreen; bool _dirtyScreen; Graphics::PixelFormat _pixelFormat; - byte findBlackIndex(); }; class LBGraphics { |