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/object1.hpp | |
| parent | b9e4f471c2e23283945ba9324912c7e29dd8fbd8 (diff) | |
Rework TR{1,2,3,4,5}_* flags to flag_set<>
Diffstat (limited to 'src/object1.hpp')
| -rw-r--r-- | src/object1.hpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/object1.hpp b/src/object1.hpp index da4a6ead..af055985 100644 --- a/src/object1.hpp +++ b/src/object1.hpp @@ -2,6 +2,7 @@ #include "h-basic.h" #include "object_filter.hpp" +#include "object_flag_set.hpp" #include <boost/optional.hpp> #include <functional> @@ -10,7 +11,7 @@ typedef std::function<boost::optional<int>(object_filter_t const &filter)> selec extern byte get_item_letter_color(object_type const *o_ptr); extern void object_pickup(int this_o_idx); -extern bool_ apply_set(s16b a_idx, s16b set_idx); +extern void apply_set(s16b a_idx, s16b set_idx); extern bool_ takeoff_set(s16b a_idx, s16b set_idx); extern bool_ wield_set(s16b a_idx, s16b set_idx, bool_ silent); extern bool_ verify(cptr prompt, int item); @@ -18,8 +19,9 @@ extern void flavor_init(void); extern void reset_visuals(void); extern int object_power(object_type *o_ptr); extern bool_ object_flags_no_set; -extern void object_flags(object_type const *o_ptr, u32b *f1, u32b *f2, u32b *f3, u32b *f4, u32b *f5, u32b *esp); -extern void object_flags_known(object_type const *o_ptr, u32b *f1, u32b *f2, u32b *f3, u32b *f4, u32b *f5, u32b *esp); +extern object_flag_set object_flags(object_type const *o_ptr); +extern object_flag_set object_flags_known(object_type const *o_ptr); + extern s32b calc_object_need_exp(object_type const *o_ptr); extern void object_desc(char *buf, object_type const *o_ptr, int pref, int mode); extern void object_desc_store(char *buf, object_type *o_ptr, int pref, int mode); |