From d7b3cf93148e5cd7b466aafa8fabdb84114f3a0d Mon Sep 17 00:00:00 2001
From: Nev3r <apophycens@gmail.com>
Date: Sun, 25 Nov 2018 11:35:19 +0100
Subject: [PATCH] Forgot the alignment for compact structs.
Signed-off-by: Nev3r <apophycens@gmail.com>
---
src/w_wad.c | 13 ++++++-------
src/w_wad.h | 7 +++++++
2 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/src/w_wad.c b/src/w_wad.c
index f1ae8b8358..d0af5ede07 100644
--- a/src/w_wad.c
+++ b/src/w_wad.c
@@ -79,13 +79,6 @@ int snprintf(char *str, size_t n, const char *fmt, ...);
#define O_BINARY 0
#endif
-#if defined(_MSC_VER)
-#pragma pack(1)
-#endif
-
-#if defined(_MSC_VER)
-#pragma pack()
-#endif
typedef struct
{
@@ -466,6 +459,9 @@ static boolean ResFindSignature (FILE* handle, char endPat[], UINT32 startpos)
return false;
}
+#if defined(_MSC_VER)
+#pragma pack(1)
+#endif
typedef struct zend_s
{
char signature[4];
@@ -513,6 +509,9 @@ typedef struct zlentry_s
UINT16 namelen;
UINT16 xtralen;
} ATTRPACK zlentry_t;
+#if defined(_MSC_VER)
+#pragma pack()
+#endif
/** Create a lumpinfo_t array for a PKZip file.
*/
diff --git a/src/w_wad.h b/src/w_wad.h
index e77301dcef..6c33988c0d 100644
--- a/src/w_wad.h
+++ b/src/w_wad.h
@@ -24,12 +24,19 @@
// a raw entry of the wad directory
// NOTE: This sits here and not in w_wad.c because p_setup.c makes use of it to load map WADs inside PK3s.
+#if defined(_MSC_VER)
+#pragma pack(1)
+#endif
typedef struct
{
UINT32 filepos; // file offset of the resource
UINT32 size; // size of the resource
char name[8]; // name of the resource
} ATTRPACK filelump_t;
+#if defined(_MSC_VER)
+#pragma pack()
+#endif
+
// ==============================================================
// WAD FILE STRUCTURE DEFINITIONS
--
GitLab