From bb826992dd6c6caa628ede17c293583054b7d529 Mon Sep 17 00:00:00 2001
From: nhmall <nhmall@nethack.org>
Date: Fri, 23 Nov 2018 22:17:22 -0500
Subject: [PATCH] Revert "Previous encumberance state moved to decl.c."

This reverts commit 4e774197a6161c015f350933430a20449782c96b.
---
 include/decl.h | 3 ---
 src/decl.c     | 5 -----
 src/pickup.c   | 1 +
 3 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/include/decl.h b/include/decl.h
index 7fcde0c6c..992e86ad5 100644
--- a/include/decl.h
+++ b/include/decl.h
@@ -437,9 +437,6 @@ struct early_opt {
     boolean valallowed;
 };
 
-/* encumbrance */
-E int oldcap;
-
 #undef E
 
 #endif /* DECL_H */
diff --git a/src/decl.c b/src/decl.c
index c3397a048..6c26b4422 100644
--- a/src/decl.c
+++ b/src/decl.c
@@ -214,9 +214,6 @@ NEARDATA struct monst *migrating_mons = (struct monst *) 0;
 
 NEARDATA struct mvitals mvitals[NUMMONS];
 
-/* originally from pickup.c */
-int oldcap = 0; /* encumbrance */
-
 NEARDATA struct c_color_names c_color_names = {
     "black",  "amber", "golden", "light blue", "red",   "green",
     "silver", "blue",  "purple", "white",      "orange"
@@ -528,8 +525,6 @@ decl_early_init()
     ZERO(ubirthday);
     ZERO(urealtime);
 
-    ZERO(oldcap);
-
     ZEROARRAY(lastseentyp);
 
     ZEROPTR(invent);
diff --git a/src/pickup.c b/src/pickup.c
index b32640dbd..d68def38d 100644
--- a/src/pickup.c
+++ b/src/pickup.c
@@ -1556,6 +1556,7 @@ struct obj *otmp;
 int
 encumber_msg()
 {
+    static int oldcap = UNENCUMBERED;
     int newcap = near_capacity();
 
     if (oldcap < newcap) {