diff options
| author | Chris Oelmueller <chris.oelmueller@gmail.com> | 2014-04-11 04:23:38 +0200 |
|---|---|---|
| committer | Nicholas Feinberg <pleasingfung@gmail.com> | 2014-06-14 23:00:53 -0700 |
| commit | 2ff73b2fa81b0674be7a6592ab0f38b3867a949e (patch) | |
| tree | 55726a8942bb6e4ec4a958d6a789f6ee7adbb634 /crawl-ref/source/items.cc | |
| parent | ff84095d8b04a5b2e939fbfb1d8688f82ed4d1a2 (diff) | |
| download | crawl-ref-2ff73b2fa81b0674be7a6592ab0f38b3867a949e.tar.gz crawl-ref-2ff73b2fa81b0674be7a6592ab0f38b3867a949e.zip | |
Plus2: (JEWEL/WPN) Simplify
Diffstat (limited to 'crawl-ref/source/items.cc')
| -rw-r--r-- | crawl-ref/source/items.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/crawl-ref/source/items.cc b/crawl-ref/source/items.cc index 1e9d234c30..5ef516892f 100644 --- a/crawl-ref/source/items.cc +++ b/crawl-ref/source/items.cc @@ -177,7 +177,7 @@ static bool _item_preferred_to_clean(int item) { // Preferably clean "normal" weapons and ammo if (mitm[item].base_type == OBJ_WEAPONS - && mitm[item].plus <= 0 && mitm[item].plus2 <= 0 + && mitm[item].plus <= 0 && !is_artefact(mitm[item])) { return true; @@ -3862,14 +3862,14 @@ item_info get_item_info(const item_def& item) switch (item.base_type) { - case OBJ_WEAPONS: case OBJ_MISSILES: + if (item_ident(ii, ISFLAG_KNOW_PLUSES)) + ii.plus2 = item.plus2; + // intentional fall-through + case OBJ_WEAPONS: ii.sub_type = item.sub_type; if (item_ident(ii, ISFLAG_KNOW_PLUSES)) - { ii.plus = item.plus; - ii.plus2 = item.plus2; - } if (item_type_known(item)) ii.special = item.special; // brand break; |