diff --git a/src/r_defs.h b/src/r_defs.h index f5a4195bc..5a78a362b 100644 --- a/src/r_defs.h +++ b/src/r_defs.h @@ -639,6 +639,10 @@ typedef struct // textures from the TEXTURE1 list of patches. // // WARNING: this structure is cloned in GLPatch_t +#if defined(_MSC_VER) +#pragma pack(1) +#endif + typedef struct { INT16 width; // bounding box size @@ -656,20 +660,6 @@ typedef struct #endif } patch_t; -#if defined(_MSC_VER) -#pragma pack(1) -#endif - -typedef struct -{ - INT16 width; // bounding box size - INT16 height; - INT16 leftoffset; // pixels to the left of origin - INT16 topoffset; // pixels below the origin - INT32 columnofs[8]; // only [width] used - // the [0] is &columnofs[width] -} ATTRPACK softwarepatch_t; - #ifdef _MSC_VER #pragma warning(disable : 4200) #endif