diff options
| author | Paul Gilbert | 2019-06-18 20:45:23 -0700 |
|---|---|---|
| committer | Paul Gilbert | 2019-06-22 14:40:49 -0700 |
| commit | 0bbd9e26385efc19557d3d96ed275f051d7fbd04 (patch) | |
| tree | d2537fdaf7b0ff898a4774a84407b2968f61bc01 /engines/glk/alan2/acode.h | |
| parent | ed21388e11a928fc965714a035d2c18887ec7f62 (diff) | |
| download | scummvm-rg350-0bbd9e26385efc19557d3d96ed275f051d7fbd04.tar.gz scummvm-rg350-0bbd9e26385efc19557d3d96ed275f051d7fbd04.tar.bz2 scummvm-rg350-0bbd9e26385efc19557d3d96ed275f051d7fbd04.zip | |
GLK: ALAN2: Fixes to game header loading and validation
Diffstat (limited to 'engines/glk/alan2/acode.h')
| -rw-r--r-- | engines/glk/alan2/acode.h | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/engines/glk/alan2/acode.h b/engines/glk/alan2/acode.h index fff5144298..ef218dd3a6 100644 --- a/engines/glk/alan2/acode.h +++ b/engines/glk/alan2/acode.h @@ -209,7 +209,11 @@ typedef enum VarClass { #define I_CLASS(x) ((x)>>28) #define I_OP(x) ((x&0x8000000)?(x)|0x0f0000000:(x)&0x0fffffff) +#include "common/pack-start.h" // START STRUCT PACKING +/** + * Game header + */ struct AcdHdr { /* Important info */ char vers[4]; /* 01 - Version of compiler */ @@ -248,17 +252,9 @@ struct AcdHdr { Aaddr freq; /* 26 - Address to Char freq's for coding */ Aword acdcrc; /* 27 - Checksum for acd code (excl. hdr) */ Aword txtcrc; /* 28 - Checksum for text data file */ +} PACKED_STRUCT; - /** - * Constructor - */ - AcdHdr(); - - /** - * Loads the header from the passed stream - */ - void load(Common::SeekableReadStream &s); -}; +#include "common/pack-end.h" // END STRUCT PACKING /* Error message numbers */ typedef enum MsgKind { |