diff options
| author | Nicola Mettifogo | 2007-08-07 15:08:45 +0000 |
|---|---|---|
| committer | Nicola Mettifogo | 2007-08-07 15:08:45 +0000 |
| commit | d800f33ff16ce2d0806b85357b6f3e2111adcfb8 (patch) | |
| tree | 3c5ee73f3c5c340292fe5b3f48c06e69575504f2 /engines/parallaction/graphics.h | |
| parent | d30c3650a358e4e5ba8a548d4e218d7b49fba34a (diff) | |
| download | scummvm-rg350-d800f33ff16ce2d0806b85357b6f3e2111adcfb8.tar.gz scummvm-rg350-d800f33ff16ce2d0806b85357b6f3e2111adcfb8.tar.bz2 scummvm-rg350-d800f33ff16ce2d0806b85357b6f3e2111adcfb8.zip | |
Turned StaticCnv struct into stock Graphics::Surface, and changed all relevant code.
svn-id: r28484
Diffstat (limited to 'engines/parallaction/graphics.h')
| -rw-r--r-- | engines/parallaction/graphics.h | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/engines/parallaction/graphics.h b/engines/parallaction/graphics.h index 9f7d2ffd6d..ee0383960f 100644 --- a/engines/parallaction/graphics.h +++ b/engines/parallaction/graphics.h @@ -91,18 +91,6 @@ public: }; -struct StaticCnv { - uint16 _width; // - uint16 _height; // - byte* _data0; // bitmap - byte* _data1; // unused - - StaticCnv() { - _width = _height = 0; - _data0 = _data1 = NULL; - } -}; - struct Cnv { uint16 _count; // # of frames uint16 _width; // @@ -207,15 +195,15 @@ public: bool displayWrappedString(char *text, uint16 x, uint16 y, byte color, int16 wrapwidth = -1); uint16 getStringWidth(const char *text); void getStringExtent(char *text, uint16 maxwidth, int16* width, int16* height); - void makeCnvFromString(StaticCnv *cnv, char *text); + void makeCnvFromString(Graphics::Surface *cnv, char *text); // cut/paste - void flatBlitCnv(StaticCnv *cnv, int16 x, int16 y, Gfx::Buffers buffer); + void flatBlitCnv(Graphics::Surface *cnv, int16 x, int16 y, Gfx::Buffers buffer); void flatBlitCnv(Cnv *cnv, uint16 frame, int16 x, int16 y, Gfx::Buffers buffer); - void blitCnv(StaticCnv *cnv, int16 x, int16 y, uint16 z, Gfx::Buffers buffer); + void blitCnv(Graphics::Surface *cnv, int16 x, int16 y, uint16 z, Gfx::Buffers buffer); void restoreBackground(const Common::Rect& r); void backupDoorBackground(DoorData *data, int16 x, int16 y); - void restoreDoorBackground(StaticCnv *cnv, const Common::Rect& r, byte* background); + void restoreDoorBackground(Graphics::Surface *cnv, const Common::Rect& r, byte* background); void backupGetBackground(GetData *data, int16 x, int16 y); void restoreGetBackground(const Common::Rect& r, byte *data); @@ -242,7 +230,6 @@ public: void setHalfbriteMode(bool enable); // misc - void freeStaticCnv(StaticCnv *cnv); int16 queryMask(int16 v); void setMousePointer(int16 index); void setFont(Fonts name); @@ -267,7 +254,7 @@ protected: Graphics::Surface *_buffers[NUM_BUFFERS]; MaskBuffer *_depthMask; static byte _mouseArrow[256]; - StaticCnv *_mouseComposedArrow; + Graphics::Surface *_mouseComposedArrow; Font *_font; Font *_fonts[3]; bool _halfbrite; @@ -287,3 +274,4 @@ protected: #endif + |