diff options
| author | Bardur Arantsson <bardur@scientician.net> | 2012-06-28 08:53:18 +0200 |
|---|---|---|
| committer | Bardur Arantsson <bardur@scientician.net> | 2012-06-28 08:53:18 +0200 |
| commit | f3413482e842d5f2b0b492807caa60660888d02e (patch) | |
| tree | 7ff4cb7e351e73a8c971b477d9e0d5341652f8ec | |
| parent | d5da4694480008c083896a43dc21f7c4434096eb (diff) | |
Remove SPOIL_* conditional code
| -rw-r--r-- | src/object1.c | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/src/object1.c b/src/object1.c index 86f98ae5..3b17e8c2 100644 --- a/src/object1.c +++ b/src/object1.c @@ -1028,8 +1028,6 @@ int object_power(object_type *o_ptr) */ void object_flags_known(object_type *o_ptr, u32b *f1, u32b *f2, u32b *f3, u32b *f4, u32b *f5, u32b *esp) { - bool_ spoil = FALSE; - object_kind *k_ptr = &k_info[o_ptr->k_idx]; /* Clear */ @@ -1053,23 +1051,13 @@ void object_flags_known(object_type *o_ptr, u32b *f1, u32b *f2, u32b *f3, u32b * (*f5) |= k_ptr->oflags5; (*esp) |= k_ptr->oesp; -#ifdef SPOIL_ARTIFACTS - /* Full knowledge for some artifacts */ - if (artifact_p(o_ptr) || o_ptr->art_name) spoil = TRUE; -#endif /* SPOIL_ARTIFACTS */ - -#ifdef SPOIL_EGO_ITEMS - /* Full knowledge for some ego-items */ - if (ego_item_p(o_ptr)) spoil = TRUE; -#endif /* SPOIL_EGO_ITEMS */ - /* Artifact */ if (o_ptr->name1) { artifact_type *a_ptr = &a_info[o_ptr->name1]; /* Need full knowledge or spoilers */ - if (spoil || (o_ptr->ident & IDENT_MENTAL)) + if ((o_ptr->ident & IDENT_MENTAL)) { (*f1) = a_ptr->flags1; (*f2) = a_ptr->flags2; @@ -1098,7 +1086,7 @@ void object_flags_known(object_type *o_ptr, u32b *f1, u32b *f2, u32b *f3, u32b * if (o_ptr->art_flags1 || o_ptr->art_flags2 || o_ptr->art_flags3 || o_ptr->art_flags4 || o_ptr->art_flags5 || o_ptr->art_esp) { /* Need full knowledge or spoilers */ - if (spoil || (o_ptr->ident & IDENT_MENTAL)) + if ((o_ptr->ident & IDENT_MENTAL)) { (*f1) |= o_ptr->art_flags1; (*f2) |= o_ptr->art_flags2; |