From f59cf1fcdc88959d87072205a41f542c12e73e37 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Fri, 21 Jul 2006 21:25:17 +0000 Subject: 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 --- engines/scumm/akos.cpp | 4 ++-- engines/scumm/base-costume.h | 2 +- engines/scumm/boxes.cpp | 12 ++++++------ engines/scumm/file.cpp | 2 +- engines/scumm/he/intern_he.h | 2 +- engines/scumm/he/resource_he.h | 2 +- engines/scumm/intern.h | 2 +- engines/scumm/object.cpp | 8 ++++---- engines/scumm/object.h | 36 ++++++++++++++++++------------------ engines/scumm/player_v2.h | 2 +- engines/scumm/saveload.cpp | 2 +- engines/scumm/thumbnail.cpp | 2 +- 12 files changed, 38 insertions(+), 38 deletions(-) (limited to 'engines/scumm') diff --git a/engines/scumm/akos.cpp b/engines/scumm/akos.cpp index 4d01f87e57..f0bbc0bcc8 100644 --- a/engines/scumm/akos.cpp +++ b/engines/scumm/akos.cpp @@ -47,12 +47,12 @@ struct AkosHeader { uint16 num_anims; uint16 unk_3; uint16 codec; -} GCC_PACK; +}; struct AkosOffset { uint32 akcd; uint16 akci; -} GCC_PACK; +}; #if defined(END_PACK_STRUCTS) #pragma END_PACK_STRUCTS diff --git a/engines/scumm/base-costume.h b/engines/scumm/base-costume.h index 516129a564..56b4f717db 100644 --- a/engines/scumm/base-costume.h +++ b/engines/scumm/base-costume.h @@ -37,7 +37,7 @@ struct CostumeInfo { uint16 width, height; int16 rel_x, rel_y; int16 move_x, move_y; -} GCC_PACK; +}; #if defined(END_PACK_STRUCTS) #pragma END_PACK_STRUCTS diff --git a/engines/scumm/boxes.cpp b/engines/scumm/boxes.cpp index 2e2947c475..5a42a99212 100644 --- a/engines/scumm/boxes.cpp +++ b/engines/scumm/boxes.cpp @@ -43,7 +43,7 @@ struct Box { /* Internal walkbox file format */ byte y1; byte y2; byte mask; - } GCC_PACK c64; + } c64; struct { byte uy; @@ -54,7 +54,7 @@ struct Box { /* Internal walkbox file format */ byte lrx; byte mask; byte flags; - } GCC_PACK v2; + } v2; struct { int16 ulx, uly; @@ -64,7 +64,7 @@ struct Box { /* Internal walkbox file format */ byte mask; byte flags; uint16 scale; - } GCC_PACK old; + } old; struct { int32 ulx, uly; @@ -77,9 +77,9 @@ struct Box { /* Internal walkbox file format */ uint32 scale; uint32 unk2; uint32 unk3; - } GCC_PACK v8; - } GCC_PACK; -} GCC_PACK; + } v8; + }; +}; #if defined(END_PACK_STRUCTS) #pragma END_PACK_STRUCTS diff --git a/engines/scumm/file.cpp b/engines/scumm/file.cpp index 00393e6274..a043710dea 100644 --- a/engines/scumm/file.cpp +++ b/engines/scumm/file.cpp @@ -1254,7 +1254,7 @@ struct _lfl_index { uint16 script_addr[200]; byte sound_lfl[100]; uint16 sound_addr[100]; -} GCC_PACK lfl_index; +} lfl_index; #if defined(END_PACK_STRUCTS) #pragma END_PACK_STRUCTS diff --git a/engines/scumm/he/intern_he.h b/engines/scumm/he/intern_he.h index dfdaf4fa18..514e98afc9 100644 --- a/engines/scumm/he/intern_he.h +++ b/engines/scumm/he/intern_he.h @@ -237,7 +237,7 @@ protected: int32 dim2start; //0C int32 dim2end; //10 byte data[1]; //14 - } GCC_PACK; + }; #if defined(END_PACK_STRUCTS) #pragma END_PACK_STRUCTS diff --git a/engines/scumm/he/resource_he.h b/engines/scumm/he/resource_he.h index cc542cfda6..5176f6bb41 100644 --- a/engines/scumm/he/resource_he.h +++ b/engines/scumm/he/resource_he.h @@ -221,7 +221,7 @@ class Win32ResExtractor : public ResExtractor { uint16 reserved; uint16 type; uint16 count; - Win32CursorIconDirEntry entries[1] GCC_PACK; + Win32CursorIconDirEntry entries[1]; }; struct Win32CursorIconFileDirEntry { diff --git a/engines/scumm/intern.h b/engines/scumm/intern.h index d011370739..36bc1c7306 100644 --- a/engines/scumm/intern.h +++ b/engines/scumm/intern.h @@ -528,7 +528,7 @@ protected: int16 type; int16 dim2; byte data[1]; - } GCC_PACK; + }; #if defined(END_PACK_STRUCTS) #pragma END_PACK_STRUCTS diff --git a/engines/scumm/object.cpp b/engines/scumm/object.cpp index db53ecb3c4..6b07ed5dba 100644 --- a/engines/scumm/object.cpp +++ b/engines/scumm/object.cpp @@ -45,13 +45,13 @@ struct BompHeader { /* Bomp header */ struct { uint16 unk; uint16 width, height; - } GCC_PACK old; + } old; struct { uint32 width, height; - } GCC_PACK v8; - } GCC_PACK; -} GCC_PACK; + } v8; + }; +}; #if defined(END_PACK_STRUCTS) #pragma END_PACK_STRUCTS diff --git a/engines/scumm/object.h b/engines/scumm/object.h index 2e6a0723e5..c622ed026a 100644 --- a/engines/scumm/object.h +++ b/engines/scumm/object.h @@ -60,13 +60,13 @@ struct RoomHeader { struct { uint16 width, height; uint16 numObjects; - } GCC_PACK old; + } old; struct { uint32 version; uint16 width, height; uint16 numObjects; - } GCC_PACK v7; + } v7; struct { uint32 version; @@ -74,9 +74,9 @@ struct RoomHeader { uint32 numObjects; uint32 numZBuffer; uint32 transparency; - } GCC_PACK v8; - } GCC_PACK; -} GCC_PACK; + } v8; + }; +}; struct CodeHeader { union { @@ -88,7 +88,7 @@ struct CodeHeader { int16 walk_x; int16 walk_y; byte actordir; - } GCC_PACK v5; + } v5; struct { uint16 obj_id; @@ -98,17 +98,17 @@ struct CodeHeader { uint16 unk1; uint16 unk2; byte actordir; - } GCC_PACK v6; + } v6; struct { uint32 version; uint16 obj_id; byte parent; byte parentstate; - } GCC_PACK v7; + } v7; - } GCC_PACK; -} GCC_PACK; + }; +}; struct ImageHeader { /* file format */ union { @@ -124,8 +124,8 @@ struct ImageHeader { /* file format */ uint16 hotspot_num; struct { int16 x, y; - } GCC_PACK hotspot[15]; - } GCC_PACK old; + } hotspot[15]; + } old; struct { uint32 version; @@ -138,8 +138,8 @@ struct ImageHeader { /* file format */ uint16 hotspot_num; struct { int16 x, y; - } GCC_PACK hotspot[15]; - } GCC_PACK v7; + } hotspot[15]; + } v7; struct { char name[32]; @@ -154,10 +154,10 @@ struct ImageHeader { /* file format */ uint32 flags; // This field is missing in the COMI demo (version == 800) ! struct { int32 x, y; - } GCC_PACK hotspot[15]; - } GCC_PACK v8; - } GCC_PACK; -} GCC_PACK; + } hotspot[15]; + } v8; + }; +}; #if defined(END_PACK_STRUCTS) #pragma END_PACK_STRUCTS diff --git a/engines/scumm/player_v2.h b/engines/scumm/player_v2.h index 8feb082154..88562311fc 100644 --- a/engines/scumm/player_v2.h +++ b/engines/scumm/player_v2.h @@ -64,7 +64,7 @@ struct channel_data { uint16 unknown[4]; // 38 - 44 uint16 music_timer; // 46 uint16 music_script_nr; // 48 -} GCC_PACK; +}; #if defined(END_PACK_STRUCTS) #pragma END_PACK_STRUCTS diff --git a/engines/scumm/saveload.cpp b/engines/scumm/saveload.cpp index 31f5da12ae..9f0a65edda 100644 --- a/engines/scumm/saveload.cpp +++ b/engines/scumm/saveload.cpp @@ -67,7 +67,7 @@ struct SaveInfoSection { uint32 date; uint16 time; -} GCC_PACK; +}; #if defined(END_PACK_STRUCTS) #pragma END_PACK_STRUCTS diff --git a/engines/scumm/thumbnail.cpp b/engines/scumm/thumbnail.cpp index 0008d7539c..155637bb54 100644 --- a/engines/scumm/thumbnail.cpp +++ b/engines/scumm/thumbnail.cpp @@ -41,7 +41,7 @@ struct ThumbnailHeader { byte version; uint16 width, height; byte bpp; -} GCC_PACK; +}; #if defined(END_PACK_STRUCTS) #pragma END_PACK_STRUCTS -- cgit v1.2.3