From cfc0a04155eda35a4fe80ef72fd2b0f9eb10856b Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Sat, 7 Mar 2015 16:55:41 +0100 Subject: Split object*.cc declarations into separate header files --- src/object2.hpp | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 src/object2.hpp (limited to 'src/object2.hpp') diff --git a/src/object2.hpp b/src/object2.hpp new file mode 100644 index 00000000..07986cd3 --- /dev/null +++ b/src/object2.hpp @@ -0,0 +1,60 @@ +#pragma once + +#include "angband.h" + +extern void inc_stack_size(int item, int delta); +extern void inc_stack_size_ex(int item, int delta, optimize_flag opt, describe_flag desc); +extern object_type *get_object(int item); +extern s32b calc_total_weight(void); +extern void add_random_ego_flag(object_type *o_ptr, int fego, bool_ *limit_blows); +extern void init_match_theme(obj_theme theme); +extern bool_ kind_is_artifactable(int k_idx); +extern bool_ kind_is_legal(int k_idx); +extern void inven_item_charges(int item); +extern void inven_item_describe(int item); +extern void inven_item_increase(int item, int num); +extern bool_ inven_item_optimize(int item); +extern void floor_item_charges(int item); +extern void floor_item_describe(int item); +extern void floor_item_increase(int item, int num); +extern void floor_item_optimize(int item); +extern bool_ inven_carry_okay(object_type *o_ptr); +extern s16b inven_carry(object_type *o_ptr, bool_ final); +extern s16b inven_takeoff(int item, int amt, bool_ force_drop); +extern void inven_drop(int item, int amt, int dy, int dx, bool_ silent); +extern void excise_object_idx(int o_idx); +extern void delete_object_idx(int o_idx); +extern void delete_object(int y, int x); +extern void compact_objects(int size); +extern void wipe_o_list(void); +extern s16b o_pop(void); +extern errr get_obj_num_prep(void); +extern s16b get_obj_num(int level); +extern void object_known(object_type *o_ptr); +extern void object_aware(object_type *o_ptr); +extern void object_tried(object_type *o_ptr); +extern s32b object_value(object_type *o_ptr); +extern s32b object_value_real(object_type *o_ptr); +extern bool_ object_similar(object_type *o_ptr, object_type *j_ptr); +extern void object_absorb(object_type *o_ptr, object_type *j_ptr); +extern s16b lookup_kind(int tval, int sval); +extern void object_wipe(object_type *o_ptr); +extern void object_prep(object_type *o_ptr, int k_idx); +extern void object_copy(object_type *o_ptr, object_type *j_ptr); +extern int hack_apply_magic_power; +extern void apply_magic(object_type *o_ptr, int lev, bool_ okay, bool_ good, bool_ great); +extern bool_ make_object(object_type *j_ptr, bool_ good, bool_ great, obj_theme theme); +extern void place_object(int y, int x, bool_ good, bool_ great, int where); +extern bool_ make_gold(object_type *j_ptr); +extern void place_gold(int y, int x); +extern s16b drop_near(object_type *o_ptr, int chance, int y, int x); +extern void acquirement(int y1, int x1, int num, bool_ great, bool_ known); +extern void pick_trap(int y, int x); +extern void combine_pack(void); +extern void reorder_pack(void); +extern void random_artifact_resistance (object_type * o_ptr); +extern s16b floor_carry(int y, int x, object_type *j_ptr); +extern void pack_decay(int item); +extern void floor_decay(int item); +extern s16b m_bonus(int max, int level); +extern s32b flag_cost(object_type * o_ptr, int plusses); -- cgit v1.2.3 From 09c129b63548338b120d54915153ae9321f51a76 Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Sat, 7 Mar 2015 16:55:42 +0100 Subject: Move {optimize,describe}_flag to object2.hpp --- src/object2.hpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/object2.hpp') diff --git a/src/object2.hpp b/src/object2.hpp index 07986cd3..c205334c 100644 --- a/src/object2.hpp +++ b/src/object2.hpp @@ -1,6 +1,10 @@ #pragma once -#include "angband.h" +#include "h-basic.h" +#include "types_fwd.h" + +typedef enum { OPTIMIZE, NO_OPTIMIZE } optimize_flag; +typedef enum { DESCRIBE, NO_DESCRIBE } describe_flag; extern void inc_stack_size(int item, int delta); extern void inc_stack_size_ex(int item, int delta, optimize_flag opt, describe_flag desc); -- cgit v1.2.3 From 99a0478c7a943290ab4350d64688682dbb615f24 Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Sat, 7 Mar 2015 16:55:42 +0100 Subject: Convert object-related macros from defines.h into functions --- src/object2.hpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/object2.hpp') diff --git a/src/object2.hpp b/src/object2.hpp index c205334c..52165a7e 100644 --- a/src/object2.hpp +++ b/src/object2.hpp @@ -35,8 +35,11 @@ extern s16b o_pop(void); extern errr get_obj_num_prep(void); extern s16b get_obj_num(int level); extern void object_known(object_type *o_ptr); +extern bool object_known_p(object_type const *o_ptr); extern void object_aware(object_type *o_ptr); +extern bool object_aware_p(object_type const *o_ptr); extern void object_tried(object_type *o_ptr); +extern bool object_tried_p(object_type const *o_ptr); extern s32b object_value(object_type *o_ptr); extern s32b object_value_real(object_type *o_ptr); extern bool_ object_similar(object_type *o_ptr, object_type *j_ptr); -- cgit v1.2.3 From e8345c7da1e3b62dec011798a03d25c2f23f9d60 Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Tue, 14 Apr 2015 06:39:21 +0200 Subject: Add a few "const" qualifiers to object-related functions --- src/object2.hpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/object2.hpp') diff --git a/src/object2.hpp b/src/object2.hpp index 52165a7e..6cb11040 100644 --- a/src/object2.hpp +++ b/src/object2.hpp @@ -22,7 +22,7 @@ extern void floor_item_charges(int item); extern void floor_item_describe(int item); extern void floor_item_increase(int item, int num); extern void floor_item_optimize(int item); -extern bool_ inven_carry_okay(object_type *o_ptr); +extern bool_ inven_carry_okay(object_type const *o_ptr); extern s16b inven_carry(object_type *o_ptr, bool_ final); extern s16b inven_takeoff(int item, int amt, bool_ force_drop); extern void inven_drop(int item, int amt, int dy, int dx, bool_ silent); @@ -40,9 +40,9 @@ extern void object_aware(object_type *o_ptr); extern bool object_aware_p(object_type const *o_ptr); extern void object_tried(object_type *o_ptr); extern bool object_tried_p(object_type const *o_ptr); -extern s32b object_value(object_type *o_ptr); -extern s32b object_value_real(object_type *o_ptr); -extern bool_ object_similar(object_type *o_ptr, object_type *j_ptr); +extern s32b object_value(object_type const *o_ptr); +extern s32b object_value_real(object_type const *o_ptr); +extern bool_ object_similar(object_type const *o_ptr, object_type const *j_ptr); extern void object_absorb(object_type *o_ptr, object_type *j_ptr); extern s16b lookup_kind(int tval, int sval); extern void object_wipe(object_type *o_ptr); @@ -64,4 +64,4 @@ extern s16b floor_carry(int y, int x, object_type *j_ptr); extern void pack_decay(int item); extern void floor_decay(int item); extern s16b m_bonus(int max, int level); -extern s32b flag_cost(object_type * o_ptr, int plusses); +extern s32b flag_cost(object_type const *o_ptr, int plusses); -- cgit v1.2.3 From c8a270e51dc22f39ed048ab1cc609e6e456df58f Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Sun, 7 Jun 2015 17:49:09 +0200 Subject: Split types.h into separate header for each type --- src/object2.hpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/object2.hpp') diff --git a/src/object2.hpp b/src/object2.hpp index 6cb11040..6d5d7160 100644 --- a/src/object2.hpp +++ b/src/object2.hpp @@ -1,7 +1,8 @@ #pragma once #include "h-basic.h" -#include "types_fwd.h" +#include "object_type_fwd.hpp" +#include "obj_theme_fwd.hpp" typedef enum { OPTIMIZE, NO_OPTIMIZE } optimize_flag; typedef enum { DESCRIBE, NO_DESCRIBE } describe_flag; @@ -11,7 +12,7 @@ extern void inc_stack_size_ex(int item, int delta, optimize_flag opt, describe_f extern object_type *get_object(int item); extern s32b calc_total_weight(void); extern void add_random_ego_flag(object_type *o_ptr, int fego, bool_ *limit_blows); -extern void init_match_theme(obj_theme theme); +extern void init_match_theme(obj_theme const &theme); extern bool_ kind_is_artifactable(int k_idx); extern bool_ kind_is_legal(int k_idx); extern void inven_item_charges(int item); @@ -50,7 +51,7 @@ extern void object_prep(object_type *o_ptr, int k_idx); extern void object_copy(object_type *o_ptr, object_type *j_ptr); extern int hack_apply_magic_power; extern void apply_magic(object_type *o_ptr, int lev, bool_ okay, bool_ good, bool_ great); -extern bool_ make_object(object_type *j_ptr, bool_ good, bool_ great, obj_theme theme); +extern bool_ make_object(object_type *j_ptr, bool_ good, bool_ great, obj_theme const &theme); extern void place_object(int y, int x, bool_ good, bool_ great, int where); extern bool_ make_gold(object_type *j_ptr); extern void place_gold(int y, int x); -- cgit v1.2.3 From 87544c0599ec69df0af560dbfe7f58482d2a0bf5 Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Mon, 14 Sep 2015 17:30:27 +0200 Subject: Replace hack_apply_magic_power with optional parameter --- src/object2.hpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/object2.hpp') diff --git a/src/object2.hpp b/src/object2.hpp index 6d5d7160..26d07b25 100644 --- a/src/object2.hpp +++ b/src/object2.hpp @@ -4,6 +4,8 @@ #include "object_type_fwd.hpp" #include "obj_theme_fwd.hpp" +#include + typedef enum { OPTIMIZE, NO_OPTIMIZE } optimize_flag; typedef enum { DESCRIBE, NO_DESCRIBE } describe_flag; @@ -49,8 +51,7 @@ extern s16b lookup_kind(int tval, int sval); extern void object_wipe(object_type *o_ptr); extern void object_prep(object_type *o_ptr, int k_idx); extern void object_copy(object_type *o_ptr, object_type *j_ptr); -extern int hack_apply_magic_power; -extern void apply_magic(object_type *o_ptr, int lev, bool_ okay, bool_ good, bool_ great); +extern void apply_magic(object_type *o_ptr, int lev, bool_ okay, bool_ good, bool_ great, boost::optional force_power = boost::none); extern bool_ make_object(object_type *j_ptr, bool_ good, bool_ great, obj_theme const &theme); extern void place_object(int y, int x, bool_ good, bool_ great, int where); extern bool_ make_gold(object_type *j_ptr); -- cgit v1.2.3 From e17e742edb3809d45ce1edc716d71b3bb93056d6 Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Mon, 20 Jun 2016 22:49:05 +0200 Subject: Make obj_theme a non-POD struct --- src/object2.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/object2.hpp') diff --git a/src/object2.hpp b/src/object2.hpp index 26d07b25..a8d0fab9 100644 --- a/src/object2.hpp +++ b/src/object2.hpp @@ -14,7 +14,7 @@ extern void inc_stack_size_ex(int item, int delta, optimize_flag opt, describe_f extern object_type *get_object(int item); extern s32b calc_total_weight(void); extern void add_random_ego_flag(object_type *o_ptr, int fego, bool_ *limit_blows); -extern void init_match_theme(obj_theme const &theme); +extern bool init_match_theme(obj_theme const &theme); extern bool_ kind_is_artifactable(int k_idx); extern bool_ kind_is_legal(int k_idx); extern void inven_item_charges(int item); -- cgit v1.2.3 From 6f02ef2e62739efc23d10ae2c7cea69a908b657b Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Tue, 21 Jun 2016 11:02:48 +0200 Subject: Rework ETR4_* flags to flag_set<> --- src/object2.hpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/object2.hpp') diff --git a/src/object2.hpp b/src/object2.hpp index a8d0fab9..8a99753d 100644 --- a/src/object2.hpp +++ b/src/object2.hpp @@ -1,5 +1,6 @@ #pragma once +#include "ego_flag_set.hpp" #include "h-basic.h" #include "object_type_fwd.hpp" #include "obj_theme_fwd.hpp" @@ -13,7 +14,7 @@ extern void inc_stack_size(int item, int delta); extern void inc_stack_size_ex(int item, int delta, optimize_flag opt, describe_flag desc); extern object_type *get_object(int item); extern s32b calc_total_weight(void); -extern void add_random_ego_flag(object_type *o_ptr, int fego, bool_ *limit_blows); +extern void add_random_ego_flag(object_type *o_ptr, ego_flag_set const &fego, bool_ *limit_blows); extern bool init_match_theme(obj_theme const &theme); extern bool_ kind_is_artifactable(int k_idx); extern bool_ kind_is_legal(int k_idx); -- cgit v1.2.3 From cbafbc638c2e1d5bb40ee6bc419007062e9615e4 Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Wed, 5 Oct 2016 18:45:09 +0200 Subject: Remove traps Credit goes mostly to "miramor" who did most of the actual work. I just did a few minor tweaks and fixes + rebased onto master. --- src/object2.hpp | 1 - 1 file changed, 1 deletion(-) (limited to 'src/object2.hpp') diff --git a/src/object2.hpp b/src/object2.hpp index 8a99753d..7c16be85 100644 --- a/src/object2.hpp +++ b/src/object2.hpp @@ -59,7 +59,6 @@ extern bool_ make_gold(object_type *j_ptr); extern void place_gold(int y, int x); extern s16b drop_near(object_type *o_ptr, int chance, int y, int x); extern void acquirement(int y1, int x1, int num, bool_ great, bool_ known); -extern void pick_trap(int y, int x); extern void combine_pack(void); extern void reorder_pack(void); extern void random_artifact_resistance (object_type * o_ptr); -- cgit v1.2.3 From a40e1d524849e22edf2fb65b5c2fedbe47a59b81 Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Tue, 2 May 2017 19:20:57 +0200 Subject: Remove redundant "extern" on function declarations --- src/object2.hpp | 114 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 57 insertions(+), 57 deletions(-) (limited to 'src/object2.hpp') diff --git a/src/object2.hpp b/src/object2.hpp index 7c16be85..8444f408 100644 --- a/src/object2.hpp +++ b/src/object2.hpp @@ -10,60 +10,60 @@ typedef enum { OPTIMIZE, NO_OPTIMIZE } optimize_flag; typedef enum { DESCRIBE, NO_DESCRIBE } describe_flag; -extern void inc_stack_size(int item, int delta); -extern void inc_stack_size_ex(int item, int delta, optimize_flag opt, describe_flag desc); -extern object_type *get_object(int item); -extern s32b calc_total_weight(void); -extern void add_random_ego_flag(object_type *o_ptr, ego_flag_set const &fego, bool_ *limit_blows); -extern bool init_match_theme(obj_theme const &theme); -extern bool_ kind_is_artifactable(int k_idx); -extern bool_ kind_is_legal(int k_idx); -extern void inven_item_charges(int item); -extern void inven_item_describe(int item); -extern void inven_item_increase(int item, int num); -extern bool_ inven_item_optimize(int item); -extern void floor_item_charges(int item); -extern void floor_item_describe(int item); -extern void floor_item_increase(int item, int num); -extern void floor_item_optimize(int item); -extern bool_ inven_carry_okay(object_type const *o_ptr); -extern s16b inven_carry(object_type *o_ptr, bool_ final); -extern s16b inven_takeoff(int item, int amt, bool_ force_drop); -extern void inven_drop(int item, int amt, int dy, int dx, bool_ silent); -extern void excise_object_idx(int o_idx); -extern void delete_object_idx(int o_idx); -extern void delete_object(int y, int x); -extern void compact_objects(int size); -extern void wipe_o_list(void); -extern s16b o_pop(void); -extern errr get_obj_num_prep(void); -extern s16b get_obj_num(int level); -extern void object_known(object_type *o_ptr); -extern bool object_known_p(object_type const *o_ptr); -extern void object_aware(object_type *o_ptr); -extern bool object_aware_p(object_type const *o_ptr); -extern void object_tried(object_type *o_ptr); -extern bool object_tried_p(object_type const *o_ptr); -extern s32b object_value(object_type const *o_ptr); -extern s32b object_value_real(object_type const *o_ptr); -extern bool_ object_similar(object_type const *o_ptr, object_type const *j_ptr); -extern void object_absorb(object_type *o_ptr, object_type *j_ptr); -extern s16b lookup_kind(int tval, int sval); -extern void object_wipe(object_type *o_ptr); -extern void object_prep(object_type *o_ptr, int k_idx); -extern void object_copy(object_type *o_ptr, object_type *j_ptr); -extern void apply_magic(object_type *o_ptr, int lev, bool_ okay, bool_ good, bool_ great, boost::optional force_power = boost::none); -extern bool_ make_object(object_type *j_ptr, bool_ good, bool_ great, obj_theme const &theme); -extern void place_object(int y, int x, bool_ good, bool_ great, int where); -extern bool_ make_gold(object_type *j_ptr); -extern void place_gold(int y, int x); -extern s16b drop_near(object_type *o_ptr, int chance, int y, int x); -extern void acquirement(int y1, int x1, int num, bool_ great, bool_ known); -extern void combine_pack(void); -extern void reorder_pack(void); -extern void random_artifact_resistance (object_type * o_ptr); -extern s16b floor_carry(int y, int x, object_type *j_ptr); -extern void pack_decay(int item); -extern void floor_decay(int item); -extern s16b m_bonus(int max, int level); -extern s32b flag_cost(object_type const *o_ptr, int plusses); +void inc_stack_size(int item, int delta); +void inc_stack_size_ex(int item, int delta, optimize_flag opt, describe_flag desc); +object_type *get_object(int item); +s32b calc_total_weight(void); +void add_random_ego_flag(object_type *o_ptr, ego_flag_set const &fego, bool_ *limit_blows); +bool init_match_theme(obj_theme const &theme); +bool_ kind_is_artifactable(int k_idx); +bool_ kind_is_legal(int k_idx); +void inven_item_charges(int item); +void inven_item_describe(int item); +void inven_item_increase(int item, int num); +bool_ inven_item_optimize(int item); +void floor_item_charges(int item); +void floor_item_describe(int item); +void floor_item_increase(int item, int num); +void floor_item_optimize(int item); +bool_ inven_carry_okay(object_type const *o_ptr); +s16b inven_carry(object_type *o_ptr, bool_ final); +s16b inven_takeoff(int item, int amt, bool_ force_drop); +void inven_drop(int item, int amt, int dy, int dx, bool_ silent); +void excise_object_idx(int o_idx); +void delete_object_idx(int o_idx); +void delete_object(int y, int x); +void compact_objects(int size); +void wipe_o_list(void); +s16b o_pop(void); +errr get_obj_num_prep(void); +s16b get_obj_num(int level); +void object_known(object_type *o_ptr); +bool object_known_p(object_type const *o_ptr); +void object_aware(object_type *o_ptr); +bool object_aware_p(object_type const *o_ptr); +void object_tried(object_type *o_ptr); +bool object_tried_p(object_type const *o_ptr); +s32b object_value(object_type const *o_ptr); +s32b object_value_real(object_type const *o_ptr); +bool_ object_similar(object_type const *o_ptr, object_type const *j_ptr); +void object_absorb(object_type *o_ptr, object_type *j_ptr); +s16b lookup_kind(int tval, int sval); +void object_wipe(object_type *o_ptr); +void object_prep(object_type *o_ptr, int k_idx); +void object_copy(object_type *o_ptr, object_type *j_ptr); +void apply_magic(object_type *o_ptr, int lev, bool_ okay, bool_ good, bool_ great, boost::optional force_power = boost::none); +bool_ make_object(object_type *j_ptr, bool_ good, bool_ great, obj_theme const &theme); +void place_object(int y, int x, bool_ good, bool_ great, int where); +bool_ make_gold(object_type *j_ptr); +void place_gold(int y, int x); +s16b drop_near(object_type *o_ptr, int chance, int y, int x); +void acquirement(int y1, int x1, int num, bool_ great, bool_ known); +void combine_pack(void); +void reorder_pack(void); +void random_artifact_resistance(object_type * o_ptr); +s16b floor_carry(int y, int x, object_type *j_ptr); +void pack_decay(int item); +void floor_decay(int item); +s16b m_bonus(int max, int level); +s32b flag_cost(object_type const *o_ptr, int plusses); -- cgit v1.2.3 From 6a35e3de332df186eab39c3b67506882409a3ca2 Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Tue, 2 May 2017 19:20:57 +0200 Subject: Remove redundant (void) parameters and return value casts --- src/object2.hpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/object2.hpp') diff --git a/src/object2.hpp b/src/object2.hpp index 8444f408..a91631aa 100644 --- a/src/object2.hpp +++ b/src/object2.hpp @@ -13,7 +13,7 @@ typedef enum { DESCRIBE, NO_DESCRIBE } describe_flag; void inc_stack_size(int item, int delta); void inc_stack_size_ex(int item, int delta, optimize_flag opt, describe_flag desc); object_type *get_object(int item); -s32b calc_total_weight(void); +s32b calc_total_weight(); void add_random_ego_flag(object_type *o_ptr, ego_flag_set const &fego, bool_ *limit_blows); bool init_match_theme(obj_theme const &theme); bool_ kind_is_artifactable(int k_idx); @@ -34,9 +34,9 @@ void excise_object_idx(int o_idx); void delete_object_idx(int o_idx); void delete_object(int y, int x); void compact_objects(int size); -void wipe_o_list(void); -s16b o_pop(void); -errr get_obj_num_prep(void); +void wipe_o_list(); +s16b o_pop(); +errr get_obj_num_prep(); s16b get_obj_num(int level); void object_known(object_type *o_ptr); bool object_known_p(object_type const *o_ptr); @@ -59,8 +59,8 @@ bool_ make_gold(object_type *j_ptr); void place_gold(int y, int x); s16b drop_near(object_type *o_ptr, int chance, int y, int x); void acquirement(int y1, int x1, int num, bool_ great, bool_ known); -void combine_pack(void); -void reorder_pack(void); +void combine_pack(); +void reorder_pack(); void random_artifact_resistance(object_type * o_ptr); s16b floor_carry(int y, int x, object_type *j_ptr); void pack_decay(int item); -- cgit v1.2.3