aboutsummaryrefslogtreecommitdiff
path: root/engines/simon
diff options
context:
space:
mode:
authorMax Horn2006-07-21 21:25:17 +0000
committerMax Horn2006-07-21 21:25:17 +0000
commitf59cf1fcdc88959d87072205a41f542c12e73e37 (patch)
tree7e6488f459a5af7020de29f2ec78a13fcf6f9517 /engines/simon
parent348e34c685b2c1c00e1d0a18f145ca4a075069ee (diff)
downloadscummvm-rg350-f59cf1fcdc88959d87072205a41f542c12e73e37.tar.gz
scummvm-rg350-f59cf1fcdc88959d87072205a41f542c12e73e37.tar.bz2
scummvm-rg350-f59cf1fcdc88959d87072205a41f542c12e73e37.zip
Removing GCC_PACK, we fully rely on START_PACK_STRUCTS / END_PACK_STRUCTS now (hiya eriktorbjorn, this one is for you *ggg*)
svn-id: r23547
Diffstat (limited to 'engines/simon')
-rw-r--r--engines/simon/vga.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/engines/simon/vga.h b/engines/simon/vga.h
index 192676e443..0d13e1d5e2 100644
--- a/engines/simon/vga.h
+++ b/engines/simon/vga.h
@@ -35,7 +35,7 @@ struct VgaFileHeader_Feeble {
uint16 x_1;
uint16 hdr2_start;
uint16 x_2, x_3;
-} GCC_PACK;
+};
struct VgaFileHeader2_Feeble {
uint16 imageCount;
@@ -46,27 +46,27 @@ struct VgaFileHeader2_Feeble {
uint16 x_4;
uint16 animationTable;
uint16 x_5;
-} GCC_PACK;
+};
struct ImageHeader_Feeble {
uint16 id;
uint16 x_1;
uint16 scriptOffs;
uint16 x_2;
-} GCC_PACK;
+};
struct AnimationHeader_Feeble {
uint16 scriptOffs;
uint16 x_2;
uint16 id;
-} GCC_PACK;
+};
// Simon 1/2
struct VgaFileHeader_Simon {
uint16 x_1, x_2;
uint16 hdr2_start;
uint16 x_3, x_4;
-} GCC_PACK;
+};
struct VgaFileHeader2_Simon {
uint16 x_1;
@@ -78,20 +78,20 @@ struct VgaFileHeader2_Simon {
uint16 x_4;
uint16 animationTable;
uint16 x_5;
-} GCC_PACK;
+};
struct ImageHeader_Simon {
uint16 id;
uint16 x_1;
uint16 x_2;
uint16 scriptOffs;
-} GCC_PACK;
+};
struct AnimationHeader_Simon {
uint16 id;
uint16 x_2;
uint16 scriptOffs;
-} GCC_PACK;
+};
#if defined(END_PACK_STRUCTS)