diff options
| author | Filippos Karapetis | 2008-12-01 20:35:36 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2008-12-01 20:35:36 +0000 |
| commit | af945ac7881ae7e414f004bd0e99e8c3b5d76be9 (patch) | |
| tree | 72e9c6fd43406e2021973b4f163ab4faa10143fb /engines/tinsel/object.h | |
| parent | f10f151ff742801e12534bb052bd89419bf906cb (diff) | |
| download | scummvm-rg350-af945ac7881ae7e414f004bd0e99e8c3b5d76be9.tar.gz scummvm-rg350-af945ac7881ae7e414f004bd0e99e8c3b5d76be9.tar.bz2 scummvm-rg350-af945ac7881ae7e414f004bd0e99e8c3b5d76be9.zip | |
Merged the tinsel 2 engine with tinsel 1. Both Discworld 1 and Discworld 2 should be completable
svn-id: r35196
Diffstat (limited to 'engines/tinsel/object.h')
| -rw-r--r-- | engines/tinsel/object.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/engines/tinsel/object.h b/engines/tinsel/object.h index 8b61571a3e..f77c113482 100644 --- a/engines/tinsel/object.h +++ b/engines/tinsel/object.h @@ -51,21 +51,24 @@ enum { DMA_ABS = 0x0100, //!< position of object is absolute DMA_CHANGED = 0x0200, //!< object has changed in some way since the last frame DMA_USERDEF = 0x0400, //!< user defined flags start here + DMA_GHOST = 0x0080, + /** flags that effect an objects appearance */ DMA_HARDFLAGS = (DMA_WNZ | DMA_CNZ | DMA_CONST | DMA_WA | DMA_FLIPH | DMA_FLIPV | DMA_TRANS) }; /** structure for image */ +#include "common/pack-start.h" // START STRUCT PACKING struct IMAGE { short imgWidth; //!< image width - short imgHeight; //!< image height + unsigned short imgHeight; //!< image height short anioffX; //!< image x animation offset short anioffY; //!< image y animation offset SCNHANDLE hImgBits; //!< image bitmap handle SCNHANDLE hImgPal; //!< image palette handle -}; - +} PACKED_STRUCT; +#include "common/pack-end.h" // END STRUCT PACKING /** a multi-object animation frame is a list of multi-image handles */ typedef uint32 FRAME; @@ -93,6 +96,7 @@ struct OBJECT { SCNHANDLE hMirror; //!< objects previous animation frame int oid; //!< object identifier }; +typedef OBJECT *POBJECT; #include "common/pack-start.h" // START STRUCT PACKING |