From 44e7d5249c0ee9d7b45f39697383317aae3722ca Mon Sep 17 00:00:00 2001 From: Alug Date: Mon, 1 Jan 2024 18:30:06 +0100 Subject: [PATCH] dont pack my memories --- src/doomdata.h | 14 +++++++------- src/hardware/hw_draw.c | 2 +- src/hardware/s_openal/s_openal.c | 2 +- src/r_data.c | 4 ++-- src/r_defs.h | 6 +++--- src/sdl/sdl_sound.c | 2 +- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/doomdata.h b/src/doomdata.h index 6319238b7..3958e4656 100644 --- a/src/doomdata.h +++ b/src/doomdata.h @@ -65,7 +65,7 @@ enum typedef struct { INT16 x, y; -}ATTRPACK mapvertex_t; +} mapvertex_t; // A SideDef, defining the visual appearance of a wall, // by setting textures and offsets. @@ -75,7 +75,7 @@ typedef struct char toptexture[8], bottomtexture[8], midtexture[8]; // Front sector, towards viewer. INT16 sector; -} ATTRPACK mapsidedef_t; +} mapsidedef_t; // A LineDef, as used for editing, and as input // to the BSP builder. @@ -87,7 +87,7 @@ typedef struct INT16 tag; // sidenum[1] will be 0xffff if one sided UINT16 sidenum[2]; -} ATTRPACK maplinedef_t; +} maplinedef_t; // // LineDef attributes. @@ -148,7 +148,7 @@ typedef struct INT16 lightlevel; INT16 special; INT16 tag; -} ATTRPACK mapsector_t; +} mapsector_t; // SubSector, as generated by BSP. typedef struct @@ -156,7 +156,7 @@ typedef struct UINT16 numsegs; // Index of first one, segs are stored sequentially. UINT16 firstseg; -} ATTRPACK mapsubsector_t; +} mapsubsector_t; // LineSeg, generated by splitting LineDefs @@ -168,7 +168,7 @@ typedef struct INT16 linedef; INT16 side; INT16 offset; -} ATTRPACK mapseg_t; +} mapseg_t; // BSP node structure. @@ -186,7 +186,7 @@ typedef struct // If NF_SUBSECTOR it's a subsector, else it's a node of another subtree. UINT16 children[2]; -} ATTRPACK mapnode_t; +} mapnode_t; #if defined(_MSC_VER) #pragma pack() diff --git a/src/hardware/hw_draw.c b/src/hardware/hw_draw.c index 5aa2ae312..5a9a3083a 100644 --- a/src/hardware/hw_draw.c +++ b/src/hardware/hw_draw.c @@ -52,7 +52,7 @@ typedef struct INT16 height ; //15, 16 UINT8 image_pix_size ; //17 UINT8 image_descriptor; //18 -} ATTRPACK TGAHeader; // sizeof is 18 +} TGAHeader; // sizeof is 18 #if defined(_MSC_VER) #pragma pack() #endif diff --git a/src/hardware/s_openal/s_openal.c b/src/hardware/s_openal/s_openal.c index 7f91ccf2c..3740c8202 100644 --- a/src/hardware/s_openal/s_openal.c +++ b/src/hardware/s_openal/s_openal.c @@ -462,7 +462,7 @@ typedef struct ALushort samples; // number of samples ALushort dummy; // 0 ALubyte data[0]; // data; -} ATTRPACK dssfx_t; +} dssfx_t; #ifdef _MSC_VER #pragma pack() diff --git a/src/r_data.c b/src/r_data.c index 48a421170..a7076063d 100644 --- a/src/r_data.c +++ b/src/r_data.c @@ -53,7 +53,7 @@ typedef struct { INT16 originx, originy; INT16 patch, stepdir, colormap; -} ATTRPACK mappatch_t; +} mappatch_t; // // Texture definition. @@ -69,7 +69,7 @@ typedef struct INT32 columndirectory; // FIXTHIS: OBSOLETE INT16 patchcount; mappatch_t patches[1]; -} ATTRPACK maptexture_t; +} maptexture_t; #if defined(_MSC_VER) #pragma pack() diff --git a/src/r_defs.h b/src/r_defs.h index 8811d64e2..c54d53bf2 100644 --- a/src/r_defs.h +++ b/src/r_defs.h @@ -587,7 +587,7 @@ typedef struct { UINT8 topdelta; // -1 is the last post in a column UINT8 length; // length data bytes follows -} ATTRPACK post_t; +}post_t; #if defined(_MSC_VER) #pragma pack() @@ -694,7 +694,7 @@ typedef struct INT16 topoffset; // pixels below the origin INT32 columnofs[8]; // only [width] used // the [0] is &columnofs[width] -} ATTRPACK softwarepatch_t; +} softwarepatch_t; #ifdef _MSC_VER #pragma warning(disable : 4200) @@ -710,7 +710,7 @@ typedef struct INT16 height; INT16 reserved1; // set to 0 UINT8 data[0]; -} ATTRPACK pic_t; +} pic_t; #ifdef _MSC_VER #pragma warning(default : 4200) diff --git a/src/sdl/sdl_sound.c b/src/sdl/sdl_sound.c index 2f8fa7b5d..33aea5d20 100644 --- a/src/sdl/sdl_sound.c +++ b/src/sdl/sdl_sound.c @@ -246,7 +246,7 @@ typedef struct Uint16 samples; // number of samples Uint16 dummy; // 0 Uint8 data[0]; // data; -} ATTRPACK dssfx_t; +} dssfx_t; #ifdef _MSC_VER #pragma pack()