diff options
| author | Johanna Ploog <j-p-e-g@users.sourceforge.net> | 2009-12-15 15:28:02 +0100 |
|---|---|---|
| committer | Johanna Ploog <j-p-e-g@users.sourceforge.net> | 2009-12-15 15:32:27 +0100 |
| commit | 897011da36356074ba0d6154e26bed96b1946b29 (patch) | |
| tree | ec450f370f8920c9935c5694bdaa930b5a070fca /crawl-ref/source/artefact.cc | |
| parent | 078604b473703ce2e8fc7af45d97cf8509c38a51 (diff) | |
| download | crawl-ref-897011da36356074ba0d6154e26bed96b1946b29.tar.gz crawl-ref-897011da36356074ba0d6154e26bed96b1946b29.zip | |
Fix all branded unrandarts being created cursed.
Diffstat (limited to 'crawl-ref/source/artefact.cc')
| -rw-r--r-- | crawl-ref/source/artefact.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/crawl-ref/source/artefact.cc b/crawl-ref/source/artefact.cc index 9ba3507056..46e9b84d6a 100644 --- a/crawl-ref/source/artefact.cc +++ b/crawl-ref/source/artefact.cc @@ -126,7 +126,7 @@ static bool _god_fits_artefact(const god_type which_god, const item_def &item, return (false); const int brand = get_weapon_brand(item); - const int ego = get_armour_ego_type(item); + const int ego = get_armour_ego_type(item); if (is_evil_god(which_god) && brand == SPWPN_HOLY_WRATH) return (false); @@ -1881,8 +1881,7 @@ bool randart_is_bad( const item_def &item, artefact_properties_t &proprt ) if (_artefact_num_props( proprt ) == 0) return (true); - if ((item.base_type == OBJ_WEAPONS) - && (proprt[ARTP_BRAND] == SPWPN_NORMAL)) + if (item.base_type == OBJ_WEAPONS && proprt[ARTP_BRAND] == SPWPN_NORMAL) return (true); return (_randart_is_redundant( item, proprt ) @@ -2000,7 +1999,7 @@ bool make_item_unrandart( item_def &item, int unrand_index ) item.flags |= ISFLAG_UNRANDART; _init_artefact_properties(item); - if (unrand->prpty[ARTP_BRAND] != 0) + if (unrand->prpty[ARTP_CURSED] != 0) do_curse_item( item ); // get true artefact name |