nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

Use existing function to count containers

Browse Source
This commit is contained in:
Pasi Kallinen
2015-03-28 16:24:25 +02:00
parent 2fce0074b3
commit b17ecb149b
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/pickup.c
View File

@@ -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;