diff --git a/src/r_bsp.c b/src/r_bsp.c index 66796f7a0..2de30d2ab 100644 --- a/src/r_bsp.c +++ b/src/r_bsp.c @@ -368,7 +368,7 @@ sector_t *R_FakeFlat(sector_t *sec, sector_t *tempsec, INT32 *floorlightlevel, return sec; } -FUNCINLINE ATTRINLINE boolean R_IsEmptyLine(seg_t *line, sector_t *front, sector_t *back) +boolean R_IsEmptyLine(seg_t *line, sector_t *front, sector_t *back) { return ( !line->polyseg && diff --git a/src/r_data.c b/src/r_data.c index 5e6ee3898..772d76925 100644 --- a/src/r_data.c +++ b/src/r_data.c @@ -54,7 +54,7 @@ typedef struct { INT16 originx, originy; INT16 patch, stepdir, colormap; -} mappatch_t; +} ATTRPACK mappatch_t; // // Texture definition. @@ -70,7 +70,7 @@ typedef struct INT32 columndirectory; // FIXTHIS: OBSOLETE INT16 patchcount; mappatch_t patches[1]; -} maptexture_t; +} ATTRPACK maptexture_t; #if defined(_MSC_VER) #pragma pack() diff --git a/src/r_defs.h b/src/r_defs.h index b14b3364f..085d25e0b 100644 --- a/src/r_defs.h +++ b/src/r_defs.h @@ -586,7 +586,7 @@ typedef struct { UINT8 topdelta; // -1 is the last post in a column UINT8 length; // length data bytes follows -}post_t; +} ATTRPACK post_t; #if defined(_MSC_VER) #pragma pack() @@ -693,7 +693,7 @@ typedef struct INT16 topoffset; // pixels below the origin INT32 columnofs[8]; // only [width] used // the [0] is &columnofs[width] -} softwarepatch_t; +} ATTRPACK softwarepatch_t; #ifdef _MSC_VER #pragma warning(disable : 4200) @@ -709,7 +709,7 @@ typedef struct INT16 height; INT16 reserved1; // set to 0 UINT8 data[0]; -} pic_t; +} ATTRPACK pic_t; #ifdef _MSC_VER #pragma warning(default : 4200)