diff options
author | Bardur Arantsson <bardur@scientician.net> | 2016-06-21 13:37:02 +0200 |
---|---|---|
committer | Bardur Arantsson <bardur@scientician.net> | 2016-06-21 13:37:02 +0200 |
commit | 073ad3584fbf781ce10bef61ad4ff38850282f47 (patch) | |
tree | eb2db284b91ad7987655401406a2d57843337875 /src/squelch/rule.cc | |
parent | b9e4f471c2e23283945ba9324912c7e29dd8fbd8 (diff) |
Rework TR{1,2,3,4,5}_* flags to flag_set<>
Diffstat (limited to 'src/squelch/rule.cc')
-rw-r--r-- | src/squelch/rule.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/squelch/rule.cc b/src/squelch/rule.cc index 1c17d2fd..2bdef61b 100644 --- a/src/squelch/rule.cc +++ b/src/squelch/rule.cc @@ -8,6 +8,7 @@ #include "../modules.hpp" #include "../object1.hpp" #include "../object2.hpp" +#include "../object_flag.hpp" #include "../object_type.hpp" #include "../quark.hpp" #include "../tables.hpp" @@ -250,10 +251,8 @@ bool DestroyRule::do_apply_rule(object_type *o_ptr, int item_idx) const // Cannot destroy CURSE_NO_DROP objects. { - u32b f1, f2, f3, f4, f5, esp; - object_flags(o_ptr, &f1, &f2, &f3, &f4, &f5, &esp); - - if ((f4 & TR4_CURSE_NO_DROP) != 0) + auto const f = object_flags(o_ptr); + if (f & TR_CURSE_NO_DROP) { return false; } |