Replace "is_random_artefact()" with "is_artefact()" in a few places where

this was missed, and add checks for unrandart and special unrandarts where
applicable.


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

1 files changed, 3 insertions, 3 deletions

diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc
index 9657d2e40e..5b74a77724 100644
--- a/crawl-ref/source/fight.cc
+++ b/crawl-ref/source/fight.cc
@@ -375,7 +375,7 @@ void melee_attack::init_attack()
     damage_brand = attacker->damage_brand(attack_number);
 
     if (weapon && weapon->base_type == OBJ_WEAPONS
-        && is_random_artefact( *weapon ))
+        && is_artefact( *weapon ))
     {
         artefact_wpn_properties( *weapon, art_props );
     }
@@ -2251,7 +2251,7 @@ bool melee_attack::distortion_affects_defender()
             // with a distortion weapon, then we have to ID it before
             // the player goes to Abyss, while the weapon object is
             // still in memory.
-            if (is_random_artefact(*weapon))
+            if (is_artefact(*weapon))
                 artefact_wpn_learn_prop(*weapon, ARTP_BRAND);
             else
                 set_ident_flags(*weapon, ISFLAG_KNOW_TYPE);
@@ -3007,7 +3007,7 @@ bool melee_attack::apply_damage_brand()
 
     if (weapon)
     {
-        if (is_random_artefact(*weapon))
+        if (is_artefact(*weapon))
             brand_was_known = artefact_known_wpn_property(*weapon, ARTP_BRAND);
         else
             brand_was_known = item_type_known(*weapon);