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/object1.cc | |
| parent | 0cd5370d552babada63b59003e7629c180d4eeaa (diff) | |
Remove redundant checks "around" artifact_p()
Turns out artifact_p() already performs the necessary checks.
Diffstat (limited to 'src/object1.cc')
| -rw-r--r-- | src/object1.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/object1.cc b/src/object1.cc index 3f5d123f..c93d1ff1 100644 --- a/src/object1.cc +++ b/src/object1.cc @@ -1469,7 +1469,7 @@ static std::string object_desc_aux(object_type const *o_ptr, int pref, int mode) {} /* Hack -- The only one of its kind */ - else if (known && (artifact_p(o_ptr) || o_ptr->art_name)) + else if (known && artifact_p(o_ptr)) { t += "The "; } @@ -1571,7 +1571,7 @@ static std::string object_desc_aux(object_type const *o_ptr, int pref, int mode) } /* Hack -- The only one of its kind */ - else if (known && (artifact_p(o_ptr) || o_ptr->art_name)) + else if (known && artifact_p(o_ptr)) { t += "The "; } @@ -3463,7 +3463,7 @@ bool_ object_out_desc(object_type *o_ptr, FILE *fff, bool_ trim_down, bool_ wait /* Copying how others seem to do it. -- neil */ if (o_ptr->tval == TV_RING || o_ptr->tval == TV_AMULET || - !trim_down || (ego_item_p(o_ptr)) || (artifact_p(o_ptr))) + !trim_down || ego_item_p(o_ptr) || artifact_p(o_ptr)) { /* Where did we found it ? */ if (o_ptr->found == OBJ_FOUND_MONSTER) |