Revert "Previous encumberance state moved to decl.c."
This reverts commit 4e774197a6.
This commit is contained in:
@@ -437,9 +437,6 @@ struct early_opt {
|
||||
boolean valallowed;
|
||||
};
|
||||
|
||||
/* encumbrance */
|
||||
E int oldcap;
|
||||
|
||||
#undef E
|
||||
|
||||
#endif /* DECL_H */
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -1556,6 +1556,7 @@ struct obj *otmp;
|
||||
int
|
||||
encumber_msg()
|
||||
{
|
||||
static int oldcap = UNENCUMBERED;
|
||||
int newcap = near_capacity();
|
||||
|
||||
if (oldcap < newcap) {
|
||||
|
||||
Reference in New Issue
Block a user