diff options
| author | Max Horn | 2004-09-21 12:57:38 +0000 |
|---|---|---|
| committer | Max Horn | 2004-09-21 12:57:38 +0000 |
| commit | 5f0ec872e04dbd8c5fb491be4a56802d522d6704 (patch) | |
| tree | e4e1b159025c6ac559195f6a0d5a7ea0578d4a92 /scumm/resource.h | |
| parent | 899a64cbc92184086219306dcbd83b122b3c81a0 (diff) | |
| download | scummvm-rg350-5f0ec872e04dbd8c5fb491be4a56802d522d6704.tar.gz scummvm-rg350-5f0ec872e04dbd8c5fb491be4a56802d522d6704.tar.bz2 scummvm-rg350-5f0ec872e04dbd8c5fb491be4a56802d522d6704.zip | |
More cleanup
svn-id: r15223
Diffstat (limited to 'scumm/resource.h')
| -rw-r--r-- | scumm/resource.h | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/scumm/resource.h b/scumm/resource.h index d2f0f125db..968f700f97 100644 --- a/scumm/resource.h +++ b/scumm/resource.h @@ -23,14 +23,6 @@ namespace Scumm { -#if !defined(__GNUC__) - #pragma START_PACK_STRUCTS -#endif - -struct ResHdr { - uint32 tag, size; -} GCC_PACK; - enum ArrayType { kBitArray = 1, kNibbleArray = 2, @@ -40,6 +32,10 @@ enum ArrayType { kDwordArray = 6 }; +#if !defined(__GNUC__) + #pragma START_PACK_STRUCTS +#endif + struct ArrayHeader { int16 dim1; int16 type; @@ -51,9 +47,6 @@ struct ArrayHeader { #pragma END_PACK_STRUCTS #endif -#define RES_DATA(x) (((const byte*)x) + sizeof(ResHdr)) -#define RES_SIZE(x) (READ_BE_UINT32(&((const ResHdr* )x)->size)) - enum { OF_OWNER_MASK = 0x0F, OF_STATE_MASK = 0xF0, |