diff options
| -rw-r--r-- | src/object1.cc | 6 | ||||
| -rw-r--r-- | src/object1.hpp | 4 | ||||
| -rw-r--r-- | src/store.cc | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/object1.cc b/src/object1.cc index 1aaf2a6c..fd3ab769 100644 --- a/src/object1.cc +++ b/src/object1.cc @@ -1092,7 +1092,7 @@ s32b calc_object_need_exp(object_type const *o_ptr) * 2 -- The Cloak of Death [1,+3] (+2 to Stealth) * 3 -- The Cloak of Death [1,+3] (+2 to Stealth) {nifty} */ -std::string object_desc_aux(object_type *o_ptr, int pref, int mode) +static std::string object_desc_aux(object_type const *o_ptr, int pref, int mode) { bool_ hack_name = FALSE; @@ -2179,7 +2179,7 @@ std::string object_desc_aux(object_type *o_ptr, int pref, int mode) return t; } -void object_desc(char *buf, object_type *o_ptr, int pref, int mode) +void object_desc(char *buf, object_type const *o_ptr, int pref, int mode) { auto s = object_desc_aux(o_ptr, pref, mode); auto n = std::min<std::size_t>(s.size(), 79); @@ -4154,7 +4154,7 @@ void display_equip(void) /* Get the color of the letter idx */ -byte get_item_letter_color(object_type *o_ptr) +byte get_item_letter_color(object_type const *o_ptr) { byte color = TERM_WHITE; diff --git a/src/object1.hpp b/src/object1.hpp index e5a17813..da4a6ead 100644 --- a/src/object1.hpp +++ b/src/object1.hpp @@ -8,7 +8,7 @@ typedef std::function<boost::optional<int>(object_filter_t const &filter)> select_by_name_t; -extern byte get_item_letter_color(object_type *o_ptr); +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 bool_ takeoff_set(s16b a_idx, s16b set_idx); @@ -21,7 +21,7 @@ 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 s32b calc_object_need_exp(object_type const *o_ptr); -extern void object_desc(char *buf, object_type *o_ptr, int pref, int mode); +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); extern bool_ object_out_desc(object_type *o_ptr, FILE *fff, bool_ trim_down, bool_ wait_for_it); extern char index_to_label(int i); diff --git a/src/store.cc b/src/store.cc index d2947a7f..f2f92cd0 100644 --- a/src/store.cc +++ b/src/store.cc @@ -490,7 +490,7 @@ static void mass_produce(object_type *o_ptr) * * See "object_similar()" for the same function for the "player" */ -static bool_ store_object_similar(object_type *o_ptr, object_type *j_ptr) +static bool_ store_object_similar(object_type const *o_ptr, object_type *j_ptr) { /* Hack -- Identical items cannot be stacked */ if (o_ptr == j_ptr) return (0); |