diff options
| author | Bardur Arantsson <bardur@scientician.net> | 2016-09-17 09:58:14 +0200 |
|---|---|---|
| committer | Bardur Arantsson <bardur@scientician.net> | 2016-09-17 09:58:14 +0200 |
| commit | b15461dbcedf27f28a843f700ce0473d57364230 (patch) | |
| tree | c8721bdfda19f26f2ae7b2171897a3c4e645100e /src/spells1.cc | |
| parent | 0cd5370d552babada63b59003e7629c180d4eeaa (diff) | |
Remove redundant checks "around" artifact_p()
Turns out artifact_p() already performs the necessary checks.
Diffstat (limited to 'src/spells1.cc')
| -rw-r--r-- | src/spells1.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/spells1.cc b/src/spells1.cc index 0054a1d6..3dc6c97f 100644 --- a/src/spells1.cc +++ b/src/spells1.cc @@ -1797,7 +1797,7 @@ static int inven_damage(inven_func typ, int perc) if (!o_ptr->k_idx) continue; /* Hack -- for now, skip artifacts */ - if (artifact_p(o_ptr) || o_ptr->art_name) continue; + if (artifact_p(o_ptr)) continue; /* Give this item slot a shot at death */ if ((*typ)(o_ptr)) @@ -2313,7 +2313,7 @@ bool_ apply_disenchant(int mode) /* Artifacts have 71% chance to resist */ - if ((artifact_p(o_ptr) || o_ptr->art_name) && (rand_int(100) < 71)) + if (artifact_p(o_ptr) && (rand_int(100) < 71)) { /* Message */ msg_format("Your %s (%c) resist%s disenchantment!", @@ -3853,7 +3853,7 @@ static bool_ project_o(int who, int r, int y, int x, int dam, int typ) if (o_ptr->number > 1) plural = TRUE; /* Check for artifact */ - if ((artifact_p(o_ptr) || o_ptr->art_name)) is_art = TRUE; + if (artifact_p(o_ptr)) is_art = TRUE; /* Analyze the type */ switch (typ) |