diff options
author | Max Horn | 2006-07-21 21:25:17 +0000 |
---|---|---|
committer | Max Horn | 2006-07-21 21:25:17 +0000 |
commit | f59cf1fcdc88959d87072205a41f542c12e73e37 (patch) | |
tree | 7e6488f459a5af7020de29f2ec78a13fcf6f9517 /engines/sword1 | |
parent | 348e34c685b2c1c00e1d0a18f145ca4a075069ee (diff) | |
download | scummvm-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/sword1')
-rw-r--r-- | engines/sword1/mouse.h | 2 | ||||
-rw-r--r-- | engines/sword1/object.h | 10 | ||||
-rw-r--r-- | engines/sword1/router.h | 4 | ||||
-rw-r--r-- | engines/sword1/sworddefs.h | 12 |
4 files changed, 14 insertions, 14 deletions
diff --git a/engines/sword1/mouse.h b/engines/sword1/mouse.h index 35b2bc7324..78833362df 100644 --- a/engines/sword1/mouse.h +++ b/engines/sword1/mouse.h @@ -59,7 +59,7 @@ struct MousePtr { uint16 hotSpotX; uint16 hotSpotY; uint8 dummyData[0x30]; -} GCC_PACK; +}; #if defined(END_PACK_STRUCTS) #pragma END_PACK_STRUCTS diff --git a/engines/sword1/object.h b/engines/sword1/object.h index e8f80eaf2d..be1d6017ee 100644 --- a/engines/sword1/object.h +++ b/engines/sword1/object.h @@ -39,7 +39,7 @@ namespace Sword1 { struct OEventSlot { //receiving event list in the compact - int32 o_event; //array of these with O_TOTAL_EVENTS elements int32 o_event_script; -} GCC_PACK; // size = 2*int32 = 8 bytes +}; // size = 2*int32 = 8 bytes #define TOTAL_script_levels 5 @@ -47,12 +47,12 @@ struct ScriptTree { //this is a logic tree, used by OBJECTs int32 o_script_level; //logic level int32 o_script_id[TOTAL_script_levels]; //script id's (are unique to each level) int32 o_script_pc[TOTAL_script_levels]; //pc of script for each (if script_manager) -} GCC_PACK; // size = 11*int32 = 44 bytes +}; // size = 11*int32 = 44 bytes struct TalkOffset { int32 x; int32 y; -} GCC_PACK; // size = 2*int32 = 8 bytes +}; // size = 2*int32 = 8 bytes struct WalkData { int32 frame; @@ -60,7 +60,7 @@ struct WalkData { int32 y; int32 step; int32 dir; -} GCC_PACK; // size = 5*int32 = 20 bytes +}; // size = 5*int32 = 20 bytes struct Object { int32 o_type; // 0 broad description of type - object, floor, etc. @@ -118,7 +118,7 @@ struct Object { WalkData o_route[O_WALKANIM_SIZE]; // 340 size = 600*20 bytes = 12000 // mega size = 12340 bytes (+ 8 byte offset table + 20 byte header = 12368) -} GCC_PACK; +}; #if defined(END_PACK_STRUCTS) #pragma END_PACK_STRUCTS diff --git a/engines/sword1/router.h b/engines/sword1/router.h index 0d8645c105..9847cee499 100644 --- a/engines/sword1/router.h +++ b/engines/sword1/router.h @@ -43,7 +43,7 @@ struct BarData { int16 dx; // x2 - x1 int16 dy; // y2 - y1 int32 co; // co = (y1*dx) - (x1*dy) from an equation for a line y*dx = x*dy + co -} GCC_PACK; +}; struct NodeData { int16 x; @@ -51,7 +51,7 @@ struct NodeData { int16 level; int16 prev; int16 dist; -} GCC_PACK; +}; #if defined(END_PACK_STRUCTS) #pragma END_PACK_STRUCTS diff --git a/engines/sword1/sworddefs.h b/engines/sword1/sworddefs.h index 019cdcb756..600dfc668a 100644 --- a/engines/sword1/sworddefs.h +++ b/engines/sword1/sworddefs.h @@ -99,7 +99,7 @@ struct Header { uint32 comp_length; char compression[4]; uint32 decomp_length; -} GCC_PACK; +}; struct FrameHeader { uint8 runTimeComp[4]; @@ -108,31 +108,31 @@ struct FrameHeader { uint16 height; int16 offsetX; int16 offsetY; -} GCC_PACK; +}; struct ParallaxHeader { char type[16]; uint16 sizeX; uint16 sizeY; -} GCC_PACK; +}; struct AnimUnit { uint32 animX; uint32 animY; uint32 animFrame; -} GCC_PACK; +}; struct AnimSet { uint32 cdt; uint32 spr; -} GCC_PACK; +}; struct WalkGridHeader { int32 scaleA; int32 scaleB; int32 numBars; int32 numNodes; -} GCC_PACK; +}; #if defined(END_PACK_STRUCTS) #pragma END_PACK_STRUCTS |