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/cmd2.cc | |
| parent | b9e4f471c2e23283945ba9324912c7e29dd8fbd8 (diff) | |
Rework TR{1,2,3,4,5}_* flags to flag_set<>
Diffstat (limited to 'src/cmd2.cc')
| -rw-r--r-- | src/cmd2.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/cmd2.cc b/src/cmd2.cc index 5bd508b2..c57518bb 100644 --- a/src/cmd2.cc +++ b/src/cmd2.cc @@ -31,6 +31,7 @@ #include "monster_type.hpp" #include "object1.hpp" #include "object2.hpp" +#include "object_flag.hpp" #include "object_kind.hpp" #include "options.hpp" #include "player_type.hpp" @@ -3594,11 +3595,10 @@ void do_cmd_throw(void) /* Access the item */ object_type *o_ptr = get_object(item); - u32b f1, f2, f3, f4, f5, esp; - object_flags(o_ptr, &f1, &f2, &f3, &f4, &f5, &esp); + auto const flags = object_flags(o_ptr); /* Hack - Cannot throw away 'no drop' cursed items */ - if (cursed_p(o_ptr) && (f4 & TR4_CURSE_NO_DROP)) + if (cursed_p(o_ptr) && (flags & TR_CURSE_NO_DROP)) { /* Oops */ msg_print("Hmmm, you seem to be unable to throw it."); |