From: Pasi Kallinen <paxed@alt.org>
Date: Sat, 28 Mar 2015 14:24:25 +0000 (+0200)
Subject: Use existing function to count containers
X-Git-Tag: NetHack-3.6.0_RC01~528^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b17ecb149b862e2a366c5e8bebf2cbf88470e46b;p=nethack

Use existing function to count containers
---

diff --git a/src/pickup.c b/src/pickup.c
index 476d85798..d2a76416c 100644
--- a/src/pickup.c
+++ b/src/pickup.c
@@ -1498,6 +1498,7 @@ doloot()	/* loot a container on the floor or loot saddle from mon. */
     char qbuf[BUFSZ];
     int prev_inquiry = 0;
     boolean prev_loot = FALSE;
+    int num_conts;
 
     if (check_capacity((char *)0)) {
 	/* "Can't do that while carrying so much stuff." */
@@ -1518,15 +1519,11 @@ doloot()	/* loot a container on the floor or loot saddle from mon. */
 
 lootcont:
 
-    if (container_at(cc.x, cc.y, FALSE)) {
+    if ((num_conts = container_at(cc.x, cc.y, TRUE)) > 0) {
 	boolean anyfound = FALSE;
-	int num_conts = 0;
 
 	if (!able_to_loot(cc.x, cc.y, TRUE)) return 0;
 
-	for (cobj = level.objects[cc.x][cc.y]; cobj; cobj = cobj->nexthere)
-	    if (Is_container(cobj)) num_conts++;
-
 	if (num_conts > 1) {
 	    /* use a menu to loot many containers */
 	    int n, i;