Refix autopickup so as not to kill greedy-explore.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@731 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 9 insertions, 3 deletions

diff --git a/crawl-ref/source/items.cc b/crawl-ref/source/items.cc
index 180e5d17a2..da54eeaf4f 100644
--- a/crawl-ref/source/items.cc
+++ b/crawl-ref/source/items.cc
@@ -2967,14 +2967,20 @@ void autopickup()
                     (carrying_capacity(you.burden_state) - you.burden) /
                     item_mass(mitm[o]);
 
+                if ( num_can_take < num_to_take )
+                {
+                    if (!tried_pickup)
+                        mpr("You can't pick everything up without burdening "
+                            "yourself.");
+                    tried_pickup = true;
+                    num_to_take = num_can_take;
+                }
+
                 if ( num_can_take == 0 )
                 {
                     o = next;
                     continue;
                 }
-
-                if ( num_can_take < num_to_take )
-                    num_to_take = num_can_take;
             }
 
             mitm[o].flags &= ~(ISFLAG_THROWN | ISFLAG_DROPPED);