From d88490fa948b048e13fc8952824811b232d2eb5a Mon Sep 17 00:00:00 2001
From: nhmall <nhmall@nethack.org>
Date: Fri, 23 Nov 2018 22:17:31 -0500
Subject: [PATCH] Revert "Revert "Modified how we initialize save file info.""

This reverts commit 05c9ccc0356f96e8f49f5792f598dcb813e10488.
---
 include/global.h | 27 +++++++++++++++++++++++++++
 src/decl.c       | 42 ++----------------------------------------
 2 files changed, 29 insertions(+), 40 deletions(-)

diff --git a/include/global.h b/include/global.h
index 154c49ebe..d57352611 100644
--- a/include/global.h
+++ b/include/global.h
@@ -294,15 +294,42 @@ struct savefile_info {
     unsigned long sfi3; /* thirdparty */
 };
 #ifdef NHSTDC
+#define SFI_ZERO (0UL)
 #define SFI1_EXTERNALCOMP (1UL)
 #define SFI1_RLECOMP (1UL << 1)
 #define SFI1_ZEROCOMP (1UL << 2)
 #else
+#define SFI_ZERO (0L)
 #define SFI1_EXTERNALCOMP (1L)
 #define SFI1_RLECOMP (1L << 1)
 #define SFI1_ZEROCOMP (1L << 2)
 #endif
 
+#if defined(COMPRESS) || defined(ZLIB_COMP)
+#define SFI1_DEFAULT_EXTERNALCOMP SFI1_EXTERNALCOMP
+#else
+#define SFI1_DEFAULT_EXTERNALCOMP SFI_ZERO
+#endif
+
+#if defined(ZEROCOMP)
+#define SFI1_DEFAULT_ZEROCOMP SFI1_EXTERNALCOMP
+#else
+#define SFI1_DEFAULT_ZEROCOMP SFI_ZERO
+#endif
+
+#if defined(RLECOMP)
+#define SFI1_DEFAULT_RLECOMP SFI1_RLECOMP
+#else
+#define SFI1_DEFAULT_RLECOMP SFI_ZERO
+#endif
+
+#define SFI1_DEFAULT (SFI1_DEFAULT_EXTERNALCOMP | \
+                      SFI1_DEFAULT_ZEROCOMP |     \
+                      SFI1_DEFAULT_RLECOMP)
+#define SFI2_DEFAULT SFI_ZERO
+#define SFI3_DEFAULT SFI_ZERO
+
+
 /*
  * Configurable internal parameters.
  *
diff --git a/src/decl.c b/src/decl.c
index ffd9ef974..15c28d2a1 100644
--- a/src/decl.c
+++ b/src/decl.c
@@ -285,49 +285,11 @@ char *fqn_prefix_names[PREFIX_COUNT] = {
 #endif
 
 NEARDATA struct savefile_info sfcap = {
-#ifdef NHSTDC
-    0x00000000UL
-#else
-    0x00000000L
-#endif
-#if defined(COMPRESS) || defined(ZLIB_COMP)
-        | SFI1_EXTERNALCOMP
-#endif
-#if defined(ZEROCOMP)
-        | SFI1_ZEROCOMP
-#endif
-#if defined(RLECOMP)
-        | SFI1_RLECOMP
-#endif
-    ,
-#ifdef NHSTDC
-    0x00000000UL, 0x00000000UL
-#else
-    0x00000000L, 0x00000000L
-#endif
+    SFI1_DEFAULT, SFI2_DEFAULT, SFI3_DEFAULT
 };
 
 NEARDATA struct savefile_info sfrestinfo, sfsaveinfo = {
-#ifdef NHSTDC
-    0x00000000UL
-#else
-    0x00000000L
-#endif
-#if defined(COMPRESS) || defined(ZLIB_COMP)
-        | SFI1_EXTERNALCOMP
-#endif
-#if defined(ZEROCOMP)
-        | SFI1_ZEROCOMP
-#endif
-#if defined(RLECOMP)
-        | SFI1_RLECOMP
-#endif
-    ,
-#ifdef NHSTDC
-    0x00000000UL, 0x00000000UL
-#else
-    0x00000000L, 0x00000000L
-#endif
+    SFI1_DEFAULT, SFI2_DEFAULT, SFI3_DEFAULT
 };
 
 struct plinemsg_type *plinemsg_types = (struct plinemsg_type *) 0;
-- 
2.40.0