Revert "Previous encumberance state moved to decl.c."

This reverts commit 4e774197a6.
This commit is contained in:
nhmall
2018-11-23 22:17:22 -05:00
parent 28a953337f
commit bb826992dd
3 changed files with 1 additions and 8 deletions
-3
View File
@@ -437,9 +437,6 @@ struct early_opt {
boolean valallowed; boolean valallowed;
}; };
/* encumbrance */
E int oldcap;
#undef E #undef E
#endif /* DECL_H */ #endif /* DECL_H */
-5
View File
@@ -214,9 +214,6 @@ NEARDATA struct monst *migrating_mons = (struct monst *) 0;
NEARDATA struct mvitals mvitals[NUMMONS]; NEARDATA struct mvitals mvitals[NUMMONS];
/* originally from pickup.c */
int oldcap = 0; /* encumbrance */
NEARDATA struct c_color_names c_color_names = { NEARDATA struct c_color_names c_color_names = {
"black", "amber", "golden", "light blue", "red", "green", "black", "amber", "golden", "light blue", "red", "green",
"silver", "blue", "purple", "white", "orange" "silver", "blue", "purple", "white", "orange"
@@ -528,8 +525,6 @@ decl_early_init()
ZERO(ubirthday); ZERO(ubirthday);
ZERO(urealtime); ZERO(urealtime);
ZERO(oldcap);
ZEROARRAY(lastseentyp); ZEROARRAY(lastseentyp);
ZEROPTR(invent); ZEROPTR(invent);
+1
View File
@@ -1556,6 +1556,7 @@ struct obj *otmp;
int int
encumber_msg() encumber_msg()
{ {
static int oldcap = UNENCUMBERED;
int newcap = near_capacity(); int newcap = near_capacity();
if (oldcap < newcap) { if (oldcap < newcap) {