fiddlerwoaroof/crawl - Change MDJV6Y2GVK2TOULGKGNTAYJFSFVMXODLZ6C75WNRIPGYHVFAXPIAC

autopickup_no_burden no longer influences manual pickup.

Fixes 2375482. This might have unintended consequences; jpeg, can you review?

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

Created by haranp on December 13, 2008

MDJV6Y2GVK2TOULGKGNTAYJFSFVMXODLZ6C75WNRIPGYHVFAXPIAC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/items.cc at line 804 [3.2584728]

B:BD[2.3378] → [2.3378:3637]

∅:D[2.3637] → [4.343686:343687]

B:BD[4.343686] → [4.343686:343687]

B:BD[4.343687] → [2.3638:4149]

                if (Options.autopickup_no_burden && item_mass(mitm[j]) != 0)
                {
                    int num_can_take =
                        (carrying_capacity(you.burden_state) - you.burden) /
                            item_mass(mitm[j]);
                    if (num_can_take < num_to_take)
                    {
                        if (!n_tried_pickup)
                        {
                            mpr("You can't pick everything up without "
                                "burdening yourself.");
                        }
                        n_tried_pickup++;
                        num_to_take = num_can_take;
                    }
                    if (num_can_take == 0)
                        continue;
                }

Deletion in crawl-ref/source/items.cc at line 1227 [3.2584728]
B:BD[3.2610177] → [2.4869:4904]
```
        bool tried_pickup = false;
```

Deletion in crawl-ref/source/items.cc at line 1264 [3.2584728]

B:BD[2.4993] → [2.4993:5769]

                if (Options.autopickup_no_burden && item_mass(mitm[o]) != 0)
                {
                    int num_can_take =
                        (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)
                        continue;
                }

Replacement in crawl-ref/source/items.cc at line 1271 [3.2584728]

B:BD[2.5988] → [2.5988:6065]

                       pickup_warning = "You can't carry that much weight.";

[2.5988]

[2.6065]

                        pickup_warning = "You can't carry that much weight.";