diff options
| author | Max Horn | 2003-05-30 15:06:29 +0000 |
|---|---|---|
| committer | Max Horn | 2003-05-30 15:06:29 +0000 |
| commit | 3d28cfaf82f0e82acbe647595f30b7610908c572 (patch) | |
| tree | 580ef6fe905562cc3c2cc541b4ea78e029fe0e4a /scumm/gfx.h | |
| parent | 6eca1c98c785f8226a3df8c63431f19df07dbc0c (diff) | |
| download | scummvm-rg350-3d28cfaf82f0e82acbe647595f30b7610908c572.tar.gz scummvm-rg350-3d28cfaf82f0e82acbe647595f30b7610908c572.tar.bz2 scummvm-rg350-3d28cfaf82f0e82acbe647595f30b7610908c572.zip | |
cleanup
svn-id: r8145
Diffstat (limited to 'scumm/gfx.h')
| -rw-r--r-- | scumm/gfx.h | 33 |
1 files changed, 6 insertions, 27 deletions
diff --git a/scumm/gfx.h b/scumm/gfx.h index 0d54389a90..67f01de8c3 100644 --- a/scumm/gfx.h +++ b/scumm/gfx.h @@ -55,12 +55,6 @@ struct VirtScreen { /* Virtual screen areas */ byte *backBuf; }; -struct MouseCursor { /* Mouse cursor */ - int8 hotspot_x, hotspot_y; - byte colors[4]; - byte data[32]; -}; - struct ColorCycle { /* Palette cycles */ uint16 delay; uint16 counter; @@ -78,27 +72,6 @@ struct BlastObject { /* BlastObjects to draw */ uint16 mode; }; -#if !defined(__GNUC__) - #pragma START_PACK_STRUCTS -#endif - -struct BompHeader { /* Bomp header */ - union { - struct { - uint16 unk; - uint16 width, height; - } GCC_PACK old; - - struct { - uint32 width, height; - } GCC_PACK v8; - } GCC_PACK; -} GCC_PACK; - -#if !defined(__GNUC__) - #pragma END_PACK_STRUCTS -#endif - struct BompDrawData { /* Bomp graphics data */ byte *out; int outwidth, outheight; @@ -107,6 +80,12 @@ struct BompDrawData { /* Bomp graphics data */ const byte *dataptr; int srcwidth, srcheight; uint16 shadowMode; + + int32 scaleRight, scaleBottom; + byte *scalingXPtr, *scalingYPtr; + byte *maskPtr; + + BompDrawData() { memset(this, 0, sizeof(*this)); } }; class Gdi { |