aboutsummaryrefslogtreecommitdiff
path: root/sky
diff options
context:
space:
mode:
authorTorbjörn Andersson2004-09-16 07:35:01 +0000
committerTorbjörn Andersson2004-09-16 07:35:01 +0000
commite467ce17157479e59586736521952fffcce59629 (patch)
treef53c1124fa9c8b8d564e674aacc67819d3b5bd21 /sky
parent2cfcc33a33aa8a5e515db7244c5d9aff453cb2dd (diff)
downloadscummvm-rg350-e467ce17157479e59586736521952fffcce59629.tar.gz
scummvm-rg350-e467ce17157479e59586736521952fffcce59629.tar.bz2
scummvm-rg350-e467ce17157479e59586736521952fffcce59629.zip
Made the dataFileHeader struct packed, after discussing it with olki.
Neither of us can verify it, but it should fix bug #1002534. svn-id: r15133
Diffstat (limited to 'sky')
-rw-r--r--sky/struc.h10
1 files changed, 9 insertions, 1 deletions
diff --git a/sky/struc.h b/sky/struc.h
index 73fee91a8b..fb8eddd540 100644
--- a/sky/struc.h
+++ b/sky/struc.h
@@ -34,6 +34,10 @@ struct displayText_t {
uint32 textWidth;
};
+#if !defined(__GNUC__)
+#pragma START_PACK_STRUCTS
+#endif
+
struct dataFileHeader {
uint16 flag; // bit 0: set for colour data, clear for not
// bit 1: set for compressed, clear for uncompressed
@@ -48,7 +52,11 @@ struct dataFileHeader {
int16 s_offset_x;
int16 s_offset_y;
uint16 s_compressed_size;
-};
+} GCC_PACK;
+
+#if !defined(__GNUC__)
+#pragma END_PACK_STRUCTS
+#endif
struct GrafixPtr { // replacement for old grafixProg pointer. More savegame compatible.
uint8 ptrType; // ptr to autoroute / to compact / to turntable