From: nhmall <nhmall@nethack.org>
Date: Thu, 28 Nov 2019 01:18:45 +0000 (-0500)
Subject: return struct fields borrowed in 3.6
X-Git-Tag: NetHack-3.7.0_WIP~217^2~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=566019e588695267f878affea9a42d6fe181712d;p=nethack

return struct fields borrowed in 3.6

This will break existing 3.7 save/bones.
---

diff --git a/include/monst.h b/include/monst.h
index bc8f939c5..3a26b7241 100644
--- a/include/monst.h
+++ b/include/monst.h
@@ -159,8 +159,9 @@ struct monst {
 
     long mtrapseen;        /* bitmap of traps we've been trapped in */
     long mlstmv;           /* for catching up with lost time */
+    long mstate;           /* debugging info on monsters stored here */
+    long migflags;         /* migrating flags */
     long mspare1;
-#define mstate mspare1      /* only for debug exam right now, not code flow */
     struct obj *minvent;   /* mon's inventory */
     struct obj *mw;        /* mon's weapon */
     long misc_worn_check;  /* mon's wornmask */
diff --git a/src/dog.c b/src/dog.c
index a5946eb76..5b9cfed69 100644
--- a/src/dog.c
+++ b/src/dog.c
@@ -417,7 +417,7 @@ boolean with_you;
         break;
     }
 
-    if ((mtmp->mspare1 & MIGR_LEFTOVERS) != 0L) {
+    if ((mtmp->migflags & MIGR_LEFTOVERS) != 0L) {
         /* Pick up the rest of the MIGR_TO_SPECIES objects */
         if (g.migrating_objs)
             deliver_obj_to_mon(mtmp, 0, DF_ALL);
diff --git a/src/mkmaze.c b/src/mkmaze.c
index 0313c002d..b5fd346fd 100644
--- a/src/mkmaze.c
+++ b/src/mkmaze.c
@@ -646,14 +646,14 @@ unsigned long mflags;
         /* once in a blue moon, he won't be at the very bottom */
         if (!rn2(40))
             nlev--;
-        mtmp->mspare1 |= MIGR_LEFTOVERS;
+        mtmp->migflags |= MIGR_LEFTOVERS;
     } else {
         nlev = rn2((max_depth - cur_depth) + 1) + cur_depth;
         if (nlev == cur_depth)
             nlev++;
         if (nlev > max_depth)
             nlev = max_depth;
-        mtmp->mspare1 = (mtmp->mspare1 & ~MIGR_LEFTOVERS);
+        mtmp->migflags = (mtmp->migflags & ~MIGR_LEFTOVERS);
     }
     get_level(&dest, nlev);
     migrate_to_level(mtmp, ledger_no(&dest), MIGR_RANDOM, (coord *) 0);
diff --git a/src/sfdata.c b/src/sfdata.c
index ac6fe5fc5..b3d862ae7 100644
--- a/src/sfdata.c
+++ b/src/sfdata.c
@@ -1258,6 +1258,8 @@ int cnt;
     sfo_ulong(nhfp, &d_monst->mstrategy, parent, "mstrategy", 1);/* (unsigned long) */
     sfo_long(nhfp, &d_monst->mtrapseen, parent, "mtrapseen", 1); /* (long) */
     sfo_long(nhfp, &d_monst->mlstmv, parent, "mlstmv", 1);       /* (long) */
+    sfo_long(nhfp, &d_monst->mstate, parent, "mstate", 1);       /* (long) */
+    sfo_long(nhfp, &d_monst->migflags, parent, "migflags", 1);   /* (long) */
     sfo_long(nhfp, &d_monst->mspare1, parent, "mspare1", 1);     /* (long) */
     sfo_genericptr(nhfp, (genericptr_t) &d_monst->minvent, parent, "minvent", 1);/* (struct obj *) */
     sfo_genericptr(nhfp, (genericptr_t) &d_monst->mw, parent, "mw", 1);/* (struct obj *) */
@@ -3814,6 +3816,8 @@ int cnt;
     sfi_ulong(nhfp, &d_monst->mstrategy, parent, "mstrategy", 1);
     sfi_long(nhfp, &d_monst->mtrapseen, parent, "mtrapseen", 1);
     sfi_long(nhfp, &d_monst->mlstmv, parent, "mlstmv", 1);
+    sfi_long(nhfp, &d_monst->mstate, parent, "mstate", 1);
+    sfi_long(nhfp, &d_monst->migflags, parent, "migflags", 1);
     sfi_long(nhfp, &d_monst->mspare1, parent, "mspare1", 1);
     sfi_genericptr(nhfp, (genericptr_t) &d_monst->minvent, parent, "minvent", 1);
     sfi_genericptr(nhfp, (genericptr_t) &d_monst->mw, parent, "mw", 1);
@@ -5682,6 +5686,8 @@ const char *critical_members[] = {
 	"struct monst:mstrategy:unsigned long",
 	"struct monst:mtrapseen:long",
 	"struct monst:mlstmv:long",
+	"struct monst:mstate:long",
+	"struct monst:migflags:long",
 	"struct monst:mspare1:long",
 	"struct monst:minvent:struct obj *",
 	"struct monst:mw:struct obj *",