Globals purge: wc

Author: Alex Smith

libnethack/include/extern.h

@@ -1,5 +1,5 @@
 /* vim:set cin ft=c sw=4 sts=4 ts=8 et ai cino=Ls\:0t0(0 : -*- mode:c;fill-column:80;tab-width:8;c-basic-offset:4;indent-tabs-mode:nil;c-file-style:"k&r" -*-*/
-/* Last modified by Alex Smith, 2015-07-22 */
+/* Last modified by Alex Smith, 2017-06-29 */
 /* Copyright (c) Steve Creps, 1988.                               */
 /* NetHack may be freely redistributed.  See license for details. */
 
@@ -645,7 +645,8 @@ extern void lookaround(enum u_interaction_mode);
 extern int monster_nearby(void);
 extern void losehp(int, const char *);
 extern int weight_cap(void);
-extern int inv_weight(void);
+extern int inv_weight_over_cap(void);
+extern int inv_weight_total(void);
 extern int near_capacity(void);
 extern int calc_capacity(int);
 extern int max_capacity(void);

libnethack/src/cmd.c

@@ -1,5 +1,5 @@
 /* vim:set cin ft=c sw=4 sts=4 ts=8 et ai cino=Ls\:0t0(0 : -*- mode:c;fill-column:80;tab-width:8;c-basic-offset:4;indent-tabs-mode:nil;c-file-style:"k&r" -*-*/
-/* Last modified by Alex Smith, 2015-10-11 */
+/* Last modified by Alex Smith, 2017-06-29 */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
 
@@ -868,7 +868,7 @@ doattributes(const struct nh_cmd_arg *arg)
     add_menutext(&menu, buf);
 
     wc = weight_cap();
-    buf = msgprintf("%-10s: %ld (", "burden", wc + inv_weight());
+    buf = msgprintf("%-10s: %ld (", "burden", inv_weight_total());
 
     switch (calc_capacity(wc / 4)) {
     case UNENCUMBERED:

libnethack/src/do.c

@@ -1,5 +1,5 @@
 /* vim:set cin ft=c sw=4 sts=4 ts=8 et ai cino=Ls\:0t0(0 : -*- mode:c;fill-column:80;tab-width:8;c-basic-offset:4;indent-tabs-mode:nil;c-file-style:"k&r" -*-*/
-/* Last modified by Alex Smith, 2015-07-20 */
+/* Last modified by Alex Smith, 2017-06-29 */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
 
@@ -821,7 +821,7 @@ doup(void)
         return 1;
     }
     if (near_capacity() > SLT_ENCUMBER) {
-        /* No levitation check; inv_weight() already allows for it */
+        /* No levitation check; the weight check already allows for it */
         pline("Your load is too heavy to climb the %s.",
               level->locations[u.ux][u.uy].typ == STAIRS ? "stairs" : "ladder");
         return 1;

libnethack/src/dokick.c

@@ -1,5 +1,5 @@
 /* vim:set cin ft=c sw=4 sts=4 ts=8 et ai cino=Ls\:0t0(0 : -*- mode:c;fill-column:80;tab-width:8;c-basic-offset:4;indent-tabs-mode:nil;c-file-style:"k&r" -*-*/
-/* Last modified by Alex Smith, 2015-07-12 */
+/* Last modified by Alex Smith, 2017-06-29 */
 /* Copyright (c) Izchak Miller, Mike Stephenson, Steve Linhart, 1989. */
 /* NetHack may be freely redistributed.  See license for details. */
 
@@ -210,7 +210,7 @@ kick_monster(xchar x, xchar y, schar dx, schar dy)
         return attack_status;
     }
 
-    i = -inv_weight();
+    i = -inv_weight_over_cap();
     j = weight_cap();
 
     if (i < (j * 3) / 10) {
@@ -810,7 +810,7 @@ dokick(const struct nh_cmd_arg *arg)
         if (Is_airlevel(&u.uz) || Levitation) {
             int range;
 
-            range = ((int)youmonst.data->cwt + (weight_cap() + inv_weight()));
+            range = ((int)youmonst.data->cwt + inv_weight_total());
             if (range < 1)
                 range = 1;      /* divide by zero avoidance */
             range = (3 * (int)mdat->cwt) / range;

libnethack/src/dothrow.c

@@ -1,5 +1,5 @@
 /* vim:set cin ft=c sw=4 sts=4 ts=8 et ai cino=Ls\:0t0(0 : -*- mode:c;fill-column:80;tab-width:8;c-basic-offset:4;indent-tabs-mode:nil;c-file-style:"k&r" -*-*/
-/* Last modified by Alex Smith, 2015-05-19 */
+/* Last modified by Alex Smith, 2017-06-29 */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
 
@@ -474,7 +474,7 @@ hurtle_step(void *arg, int x, int y)
         }
         if ((u.ux - x) && (u.uy - y) && bad_rock(youmonst.data, u.ux, y) &&
             bad_rock(youmonst.data, x, u.uy)) {
-            boolean too_much = (invent && (inv_weight() + weight_cap() > 600));
+            boolean too_much = (invent && (inv_weight_total() > 600));
 
             /* Move at a diagonal. */
             if (bigmonst(youmonst.data) || too_much) {

libnethack/src/hack.c

@@ -1,5 +1,5 @@
 /* vim:set cin ft=c sw=4 sts=4 ts=8 et ai cino=Ls\:0t0(0 : -*- mode:c;fill-column:80;tab-width:8;c-basic-offset:4;indent-tabs-mode:nil;c-file-style:"k&r" -*-*/
-/* Last modified by Fredrik Ljungdahl, 2015-10-02 */
+/* Last modified by Alex Smith, 2017-06-29 */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
 
@@ -859,7 +859,7 @@ test_move(int ux, int uy, int dx, int dy, int dz, int mode,
                 pline("Your body is too large to fit through.");
             return FALSE;
         }
-        if (invent && (inv_weight() + weight_cap() > 600)) {
+        if (invent && (inv_weight_total() > 600)) {
             if (mode == DO_MOVE)
                 pline("You are carrying too much to get through.");
             return FALSE;
@@ -905,7 +905,7 @@ test_move(int ux, int uy, int dx, int dy, int dz, int mode,
     /* Can we be blocked by a boulder? */
     if (!throws_rocks(youmonst.data) &&
         !(verysmall(youmonst.data) && !u.usteed) &&
-        !((!invent || inv_weight() <= -850) && !u.usteed)) {
+        !((!invent || inv_weight_over_cap() <= -850) && !u.usteed)) {
         /* We assume we can move boulders when we're at a distance from them.
            When it comes to actually do the move, resolve_uim() may replace the
            move with a #pushboulder command. If it doesn't, the move fails
@@ -3099,12 +3099,8 @@ weight_cap(void)
     return (int)carrcap;
 }
 
-static int wc;  /* current weight_cap(); valid after call to inv_weight() */
-
-/* returns how far beyond the normal capacity the player is currently. */
-/* inv_weight() is negative if the player is below normal capacity. */
 int
-inv_weight(void)
+inv_weight_total(void)
 {
     struct obj *otmp = invent;
     int wt = 0;
@@ -3116,18 +3112,27 @@ inv_weight(void)
             wt += otmp->owt;
         otmp = otmp->nobj;
     }
-    wc = weight_cap();
-    return wt - wc;
+    return wt;
+}
+
+/* Returns how far beyond the normal capacity the player is currently. Negative
+   if the player is below normal capacity. */
+int
+inv_weight_over_cap(void)
+{
+    return inv_weight_total() - weight_cap();
 }
 
+
 /*
  * Returns 0 if below normal capacity, or the number of "capacity units"
  * over the normal capacity the player is loaded.  Max is 5.
  */
 int
 calc_capacity(int xtra_wt)
 {
-    int cap, wt = inv_weight() + xtra_wt;
+    int wc = weight_cap();
+    int cap, wt = inv_weight_total() + xtra_wt - wc;
 
     if (wt <= 0)
         return UNENCUMBERED;
@@ -3146,9 +3151,9 @@ near_capacity(void)
 int
 max_capacity(void)
 {
-    int wt = inv_weight();
+    int wt = inv_weight_over_cap();
 
-    return wt - (2 * wc);
+    return wt - (2 * weight_cap());
 }
 
 boolean

libnethack/src/timeout.c

@@ -1,5 +1,5 @@
 /* vim:set cin ft=c sw=4 sts=4 ts=8 et ai cino=Ls\:0t0(0 : -*- mode:c;fill-column:80;tab-width:8;c-basic-offset:4;indent-tabs-mode:nil;c-file-style:"k&r" -*-*/
-/* Last modified by Alex Smith, 2015-07-22 */
+/* Last modified by Alex Smith, 2017-06-29 */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
 
@@ -320,7 +320,7 @@ nh_timeout(void)
                     /* The more you are carrying the more likely you are to
                        make noise when you fumble.  Adjustments to this number
                        must be thoroughly play tested. */
-                    if ((inv_weight() > -500)) {
+                    if ((inv_weight_over_cap() > -500)) {
                         pline("You make a lot of noise!");
                         wake_nearby(FALSE);
                     }

libnethack/src/trap.c

@@ -1,5 +1,5 @@
 /* vim:set cin ft=c sw=4 sts=4 ts=8 et ai cino=Ls\:0t0(0 : -*- mode:c;fill-column:80;tab-width:8;c-basic-offset:4;indent-tabs-mode:nil;c-file-style:"k&r" -*-*/
-/* Last modified by Alex Smith, 2015-10-11 */
+/* Last modified by Alex Smith, 2017-06-29 */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
 
@@ -3249,7 +3249,7 @@ try_disarm(struct trap *ttmp, boolean force_failure, schar dx, schar dy)
     /* duplicate tight-space checks from test_move */
     if (dx && dy && bad_rock(youmonst.data, u.ux, ttmp->ty) &&
         bad_rock(youmonst.data, ttmp->tx, u.uy)) {
-        if ((invent && (inv_weight() + weight_cap() > 600)) ||
+        if ((invent && (inv_weight_total() > 600)) ||
             bigmonst(youmonst.data)) {
             /* don't allow untrap if they can't get thru to it */
             pline("You are unable to reach the %s!", trapexplain[ttype - 1]);
@@ -3524,7 +3524,7 @@ help_monster_out(struct monst *mtmp, struct trap *ttmp)
     }
 
     /* is the monster too heavy? */
-    wt = inv_weight() + mtmp->data->cwt;
+    wt = inv_weight_over_cap() + mtmp->data->cwt;
     if (!try_lift(mtmp, ttmp, wt, FALSE))
         return 1;
 

libnethack/src/u_init.c

@@ -1,5 +1,5 @@
 /* vim:set cin ft=c sw=4 sts=4 ts=8 et ai cino=Ls\:0t0(0 : -*- mode:c;fill-column:80;tab-width:8;c-basic-offset:4;indent-tabs-mode:nil;c-file-style:"k&r" -*-*/
-/* Last modified by Alex Smith, 2015-06-15 */
+/* Last modified by Alex Smith, 2017-06-29 */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
 
@@ -851,7 +851,7 @@ u_init_inv_skills(void)
         }
 
     /* make sure you can carry all you have - especially for Tourists */
-    while (inv_weight() > 0) {
+    while (inv_weight_over_cap() > 0) {
         if (adjattrib(A_STR, 1, TRUE))
             continue;
         if (adjattrib(A_CON, 1, TRUE))