diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-15 11:43:36 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-15 11:43:36 +0000 |
| commit | 9732543e9f33ed367f108f7b00509f67e8e9db81 (patch) | |
| tree | 7a507938a5929cfa3a06ca94303098b728b62dd1 /crawl-ref/source | |
| parent | fdd9765b0b000fe63d19eba03fd13ff5916d6047 (diff) | |
| download | crawl-ref-9732543e9f33ed367f108f7b00509f67e8e9db81.tar.gz crawl-ref-9732543e9f33ed367f108f7b00509f67e8e9db81.zip | |
Apply settings changes, and fix dangling inscriptions.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6555 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source')
| -rw-r--r-- | crawl-ref/source/items.cc | 3 | ||||
| -rw-r--r-- | crawl-ref/source/misc.cc | 25 |
2 files changed, 14 insertions, 14 deletions
diff --git a/crawl-ref/source/items.cc b/crawl-ref/source/items.cc index ccce30d015..7ee40289ca 100644 --- a/crawl-ref/source/items.cc +++ b/crawl-ref/source/items.cc @@ -2235,8 +2235,7 @@ bool item_needs_autopickup(const item_def &item) std::string itemname; return ((Options.autopickups & (1L << item.base_type) - && !is_useless_item(item) && !is_inedible(item) - || _is_forced_autopickup(item, itemname)) + || _is_forced_autopickup(item, itemname)) && (Options.pickup_dropped || !(item.flags & ISFLAG_DROPPED)) && !_is_denied_autopickup(item, itemname)); } diff --git a/crawl-ref/source/misc.cc b/crawl-ref/source/misc.cc index 4dd1b21753..f5be8ee92e 100644 --- a/crawl-ref/source/misc.cc +++ b/crawl-ref/source/misc.cc @@ -611,18 +611,19 @@ bool maybe_coagulate_blood_potions_inv(item_def &blood) if (freeslot >= 0 && freeslot < ENDOFPACK && !is_valid_item(you.inv[freeslot])) { - item_def &item = you.inv[freeslot]; - item.link = freeslot; - item.slot = index_to_letter(item.link); - item.base_type = OBJ_POTIONS; - item.sub_type = POT_BLOOD_COAGULATED; - item.quantity = coag_count; - item.x = -1; - item.y = -1; - item.plus = 0; - item.plus2 = 0; - item.special = 0; - item.flags = 0; + item_def &item = you.inv[freeslot]; + item.link = freeslot; + item.slot = index_to_letter(item.link); + item.base_type = OBJ_POTIONS; + item.sub_type = POT_BLOOD_COAGULATED; + item.quantity = coag_count; + item.x = -1; + item.y = -1; + item.plus = 0; + item.plus2 = 0; + item.special = 0; + item.flags = 0; + item.inscription = ""; item_colour(item); CrawlHashTable &props_new = item.props; |