diff options
author | David Corrales | 2007-08-05 19:34:20 +0000 |
---|---|---|
committer | David Corrales | 2007-08-05 19:34:20 +0000 |
commit | 6856535010bd2fa4449bcfde1c88dc06cd46e26f (patch) | |
tree | b81a2234c2beff0312c93e039d6cafda4babeca6 /engines/parallaction/graphics.h | |
parent | 1400d28bfb37fc94f3c44dec0a4d0cef65fb8fb7 (diff) | |
parent | ec1803f838d5efc7decf75c05a1fb4a9633751e5 (diff) | |
download | scummvm-rg350-6856535010bd2fa4449bcfde1c88dc06cd46e26f.tar.gz scummvm-rg350-6856535010bd2fa4449bcfde1c88dc06cd46e26f.tar.bz2 scummvm-rg350-6856535010bd2fa4449bcfde1c88dc06cd46e26f.zip |
Merged fsnode with trunk: r27971:28460
svn-id: r28462
Diffstat (limited to 'engines/parallaction/graphics.h')
-rw-r--r-- | engines/parallaction/graphics.h | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/engines/parallaction/graphics.h b/engines/parallaction/graphics.h index d535d3cf05..f518bd6625 100644 --- a/engines/parallaction/graphics.h +++ b/engines/parallaction/graphics.h @@ -36,14 +36,6 @@ namespace Parallaction { - -#define SCREEN_WIDTH 320 -#define SCREEN_HEIGHT 200 -#define SCREEN_SIZE SCREEN_WIDTH*SCREEN_HEIGHT - -#define SCREENMASK_WIDTH SCREEN_WIDTH/4 -#define SCREENPATH_WIDTH SCREEN_WIDTH/8 - #define BASE_PALETTE_COLORS 32 #define FIRST_BASE_COLOR 0 #define LAST_BASE_COLOR (FIRST_BASE_COLOR+BASE_PALETTE_COLORS-1) @@ -57,6 +49,12 @@ namespace Parallaction { #define BASE_PALETTE_SIZE BASE_PALETTE_COLORS*3 #define PALETTE_SIZE PALETTE_COLORS*3 +#define MOUSEARROW_WIDTH 16 +#define MOUSEARROW_HEIGHT 16 + +#define MOUSECOMBO_WIDTH 32 // sizes for cursor + selected inventory item +#define MOUSECOMBO_HEIGHT 32 + #include "common/pack-start.h" // START STRUCT PACKING struct PaletteFxRange { @@ -162,12 +160,13 @@ public: }; public: + void screenClip(Common::Rect& r, Common::Point& p); // dialogue and text void drawBalloon(const Common::Rect& r, uint16 arg_8); void displayString(uint16 x, uint16 y, const char *text, byte color); void displayCenteredString(uint16 y, const char *text); - bool displayWrappedString(char *text, uint16 x, uint16 y, byte color, uint16 wrapwidth = SCREEN_WIDTH); + 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); @@ -176,7 +175,8 @@ public: void freeStaticCnv(StaticCnv *cnv); void backupDoorBackground(DoorData *data, int16 x, int16 y); void backupGetBackground(GetData *data, int16 x, int16 y); - void restoreZoneBackground(const Common::Rect& r, byte *data); + void restoreGetBackground(const Common::Rect& r, byte *data); + void restoreDoorBackground(StaticCnv *cnv, const Common::Rect& r, byte* background); // location void setBackground(byte *background); @@ -210,9 +210,8 @@ public: void setPalette(Palette palette, uint32 first = FIRST_BASE_COLOR, uint32 num = BASE_PALETTE_COLORS); void setBlackPalette(); void animatePalette(); - void fadePalette(Palette palette); - void buildBWPalette(Palette palette); - void quickFadePalette(Palette palette); + void fadePalette(Palette palette, Palette target, uint step); // fades palette to target palette, with specified step + void makeGrayscalePalette(Palette palette); // transform palette into black and white // amiga specific void setHalfbriteMode(bool enable); |