diff options
Diffstat (limited to 'src/store.c')
| -rw-r--r-- | src/store.c | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/src/store.c b/src/store.c index 0f4fc491..9e9a77a6 100644 --- a/src/store.c +++ b/src/store.c @@ -362,7 +362,7 @@ static owner_type *ot_ptr = NULL; * to adjust (by 200) to extract a usable multiplier. Note that the * "greed" value is always something (?). */ -static s32b price_item(object_type *o_ptr, int greed, bool flip) +static s32b price_item(object_type *o_ptr, int greed, bool_ flip) { int factor; int adjust; @@ -592,7 +592,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 *o_ptr, object_type *j_ptr) { /* Hack -- Identical items cannot be stacked */ if (o_ptr == j_ptr) return (0); @@ -683,7 +683,7 @@ static void store_object_absorb(object_type *o_ptr, object_type *j_ptr) * Note that the shop, just like a player, will not accept things * it cannot hold. Before, one could "nuke" potions this way. */ -static bool store_check_num(object_type *o_ptr) +static bool_ store_check_num(object_type *o_ptr) { int i; object_type *j_ptr; @@ -725,7 +725,7 @@ static bool store_check_num(object_type *o_ptr) } -bool is_blessed(object_type *o_ptr) +bool_ is_blessed(object_type *o_ptr) { u32b f1, f2, f3, f4, f5, esp; object_flags_known(o_ptr, &f1, &f2, &f3, &f4, &f5, &esp); @@ -740,7 +740,7 @@ bool is_blessed(object_type *o_ptr) * * Note that a shop-keeper must refuse to buy "worthless" items */ -static bool store_will_buy(object_type *o_ptr) +static bool_ store_will_buy(object_type *o_ptr) { /* Hack -- The Home is simple */ if (cur_store_num == 7) return (TRUE); @@ -1021,7 +1021,7 @@ static void store_item_optimize(int item) * Crap is defined as any item that is "available" elsewhere * Based on a suggestion by "Lee Vogt" <lvogt@cig.mcel.mot.com> */ -static bool black_market_crap(object_type *o_ptr) +static bool_ black_market_crap(object_type *o_ptr) { int i, j; @@ -1111,7 +1111,7 @@ static int store_tval = 0, store_level = 0; /* * Hack -- determine if a template is "good" */ -static bool kind_is_storeok(int k_idx) +static bool_ kind_is_storeok(int k_idx) { object_kind *k_ptr = &k_info[k_idx]; @@ -1145,7 +1145,7 @@ static void store_create(void) object_type forge; object_type *q_ptr = NULL; - bool obj_all_done = FALSE; + bool_ obj_all_done = FALSE; /* Paranoia -- no room left */ @@ -1331,7 +1331,7 @@ static void store_create(void) /* * Eliminate need to bargain if player has haggled well in the past */ -static bool noneedtobargain(s32b minprice) +static bool_ noneedtobargain(s32b minprice) { s32b good = st_ptr->good_buy; s32b bad = st_ptr->bad_buy; @@ -1782,7 +1782,7 @@ static int haggle_insults(void) /* * Mega-Hack -- Enable "increments" */ -static bool allow_inc = FALSE; +static bool_ allow_inc = FALSE; /* * Mega-Hack -- Last "increment" during haggling @@ -1911,7 +1911,7 @@ static int get_haggle(cptr pmt, s32b *poffer, s32b price, int final) * * Return TRUE if offer is NOT okay */ -static bool receive_offer(cptr pmt, s32b *poffer, +static bool_ receive_offer(cptr pmt, s32b *poffer, s32b last_offer, int factor, s32b price, int final) { @@ -1941,7 +1941,7 @@ static bool receive_offer(cptr pmt, s32b *poffer, * * Return TRUE if purchase is NOT successful */ -static bool purchase_haggle(object_type *o_ptr, s32b *price) +static bool_ purchase_haggle(object_type *o_ptr, s32b *price) { s32b cur_ask, final_ask; s32b last_offer, offer; @@ -1950,7 +1950,7 @@ static bool purchase_haggle(object_type *o_ptr, s32b *price) int flag, loop_flag, noneed; int annoyed = 0, final = FALSE; - bool cancel = FALSE; + bool_ cancel = FALSE; cptr pmt = "Asking"; @@ -2121,7 +2121,7 @@ static bool purchase_haggle(object_type *o_ptr, s32b *price) * * Return TRUE if purchase is NOT successful */ -static bool sell_haggle(object_type *o_ptr, s32b *price) +static bool_ sell_haggle(object_type *o_ptr, s32b *price) { s32b purse, cur_ask, final_ask; s32b last_offer = 0, offer = 0; @@ -2131,7 +2131,7 @@ static bool sell_haggle(object_type *o_ptr, s32b *price) int flag, loop_flag, noneed; int annoyed = 0, final = FALSE; - bool cancel = FALSE; + bool_ cancel = FALSE; cptr pmt = "Offer"; @@ -2315,7 +2315,7 @@ static bool sell_haggle(object_type *o_ptr, s32b *price) /* * Will the owner retire? */ -static bool retire_owner_p(void) +static bool_ retire_owner_p(void) { store_info_type *sti_ptr = &st_info[town_info[p_ptr->town_num].store[cur_store_num].st_idx]; @@ -2943,7 +2943,7 @@ void store_sell(void) u32b f1, f2, f3, f4, f5, esp; - bool museum = (st_info[st_ptr->st_idx].flags1 & SF1_MUSEUM) ? TRUE : FALSE; + bool_ museum = (st_info[st_ptr->st_idx].flags1 & SF1_MUSEUM) ? TRUE : FALSE; /* Prepare a prompt */ if (cur_store_num == 7) q = "Drop which item? "; @@ -3337,7 +3337,7 @@ void store_examine(void) /* * Hack -- set this to leave the store */ -static bool leave_store = FALSE; +static bool_ leave_store = FALSE; /* @@ -3348,12 +3348,12 @@ static bool leave_store = FALSE; * must disable some commands which are allowed in the dungeon * but not in the stores, to prevent chaos. */ -static bool store_process_command(void) +static bool_ store_process_command(void) { - bool validcmd = FALSE; + bool_ validcmd = FALSE; int i; store_action_type *ba_ptr; - bool recreate = FALSE; + bool_ recreate = FALSE; /* Handle repeating the last command */ repeat_check(); @@ -3689,7 +3689,7 @@ void do_cmd_store(void) int maintain_num; int tmp_chr; int i; - bool recreate = FALSE; + bool_ recreate = FALSE; cave_type *c_ptr; |