From: Pasi Kallinen <paxed@alt.org>
Date: Mon, 16 Mar 2020 09:27:33 +0000 (+0200)
Subject: Use TAINT_AGE for old corpses instead of hardcoded value
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=408321b4f77efeb20885b84f4ba66dfee5d7f955;p=nethack

Use TAINT_AGE for old corpses instead of hardcoded value
---

diff --git a/include/hack.h b/include/hack.h
index 5d0d13484..feb24001e 100644
--- a/include/hack.h
+++ b/include/hack.h
@@ -477,6 +477,11 @@ enum bodypart_types {
 #define RANDOM_TIN (-2)
 #define HEALTHY_TIN (-3)
 
+/* Corpse aging */
+#define TAINT_AGE (50L)        /* age when corpses go bad */
+#define TROLL_REVIVE_CHANCE 37 /* 1/37 chance for 50 turns ~ 75% chance */
+#define ROT_AGE (250L)         /* age when corpses rot away */
+
 /* Some misc definitions */
 #define POTION_OCCUPANT_CHANCE(n) (13 + 2 * (n))
 #define WAND_BACKFIRE_CHANCE 100
diff --git a/src/dig.c b/src/dig.c
index 9579b66b7..64dc5f117 100644
--- a/src/dig.c
+++ b/src/dig.c
@@ -928,7 +928,7 @@ coord *cc;
     case 1:
         You("unearth a corpse.");
         if ((otmp = mk_tt_object(CORPSE, dig_x, dig_y)) != 0)
-            otmp->age -= 100; /* this is an *OLD* corpse */
+            otmp->age -= (TAINT_AGE + 1); /* this is an *OLD* corpse */
         break;
     case 2:
         if (!Blind)
diff --git a/src/mklev.c b/src/mklev.c
index 85127f6cc..414bd90b6 100644
--- a/src/mklev.c
+++ b/src/mklev.c
@@ -1543,7 +1543,7 @@ coord *tm;
         otmp = mkcorpstat(CORPSE, NULL, &mons[victim_mnum], m.x, m.y,
                           CORPSTAT_INIT);
         if (otmp)
-            otmp->age -= 51; /* died too long ago to eat */
+            otmp->age -= (TAINT_AGE + 1); /* died too long ago to eat */
     }
 }
 
diff --git a/src/mkobj.c b/src/mkobj.c
index 91e12b882..0248c873e 100644
--- a/src/mkobj.c
+++ b/src/mkobj.c
@@ -1189,10 +1189,6 @@ struct obj *body;
     int rot_adjust;
     short action;
 
-#define TAINT_AGE (50L)        /* age when corpses go bad */
-#define TROLL_REVIVE_CHANCE 37 /* 1/37 chance for 50 turns ~ 75% chance */
-#define ROT_AGE (250L)         /* age when corpses rot away */
-
     /* lizards and lichen don't rot or revive */
     if (body->corpsenm == PM_LIZARD || body->corpsenm == PM_LICHEN)
         return;
diff --git a/src/mon.c b/src/mon.c
index 77c7bf073..3fe0697b1 100644
--- a/src/mon.c
+++ b/src/mon.c
@@ -350,7 +350,7 @@ unsigned corpseflags;
         num = undead_to_corpse(mndx);
         corpstatflags |= CORPSTAT_INIT;
         obj = mkcorpstat(CORPSE, mtmp, &mons[num], x, y, corpstatflags);
-        obj->age -= 100; /* this is an *OLD* corpse */
+        obj->age -= (TAINT_AGE + 1); /* this is an *OLD* corpse */
         break;
     case PM_KOBOLD_MUMMY:
     case PM_DWARF_MUMMY:
@@ -371,7 +371,7 @@ unsigned corpseflags;
         num = undead_to_corpse(mndx);
         corpstatflags |= CORPSTAT_INIT;
         obj = mkcorpstat(CORPSE, mtmp, &mons[num], x, y, corpstatflags);
-        obj->age -= 100; /* this is an *OLD* corpse */
+        obj->age -= (TAINT_AGE + 1); /* this is an *OLD* corpse */
         break;
     case PM_IRON_GOLEM:
         num = d(2, 6);