summaryrefslogtreecommitdiff
path: root/src/object2.cc
diff options
context:
space:
mode:
authorBardur Arantsson <bardur@scientician.net>2016-09-17 09:58:14 +0200
committerBardur Arantsson <bardur@scientician.net>2016-09-17 09:58:14 +0200
commitb15461dbcedf27f28a843f700ce0473d57364230 (patch)
treec8721bdfda19f26f2ae7b2171897a3c4e645100e /src/object2.cc
parent0cd5370d552babada63b59003e7629c180d4eeaa (diff)
Remove redundant checks "around" artifact_p()
Turns out artifact_p() already performs the necessary checks.
Diffstat (limited to 'src/object2.cc')
-rw-r--r--src/object2.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/object2.cc b/src/object2.cc
index c474fe18..89378fb2 100644
--- a/src/object2.cc
+++ b/src/object2.cc
@@ -311,7 +311,7 @@ void compact_objects(int size)
chance = chance - cur_lev / 2;
/* Artifacts */
- if ( artifact_p(o_ptr) || o_ptr->art_name )
+ if (artifact_p(o_ptr))
{
/* Artifacts are "immune if the level is lower */
/* than 300 + artifact level */
@@ -5082,7 +5082,7 @@ s16b drop_near(object_type *j_ptr, int chance, int y, int x)
/* Handle normal "breakage" */
- if (!(j_ptr->art_name || artifact_p(j_ptr)) && (rand_int(100) < chance))
+ if ((!artifact_p(j_ptr)) && (rand_int(100) < chance))
{
/* Message */
msg_format("The %s disappear%s.",
@@ -5187,7 +5187,7 @@ s16b drop_near(object_type *j_ptr, int chance, int y, int x)
/* Handle lack of space */
- if (!flag && !(artifact_p(j_ptr) || j_ptr->art_name))
+ if (!flag && (!artifact_p(j_ptr)))
{
/* Message */
msg_format("The %s disappear%s.",