地形フラグ参照に関して, have_flag(f_flags_*(), フラグ)として使われて

[hengband/hengband.git] / src / store.c

diff --git a/src/store.c b/src/store.c
index ab4bb47..a35e5a5 100644 (file)
--- a/src/store.c
+++ b/src/store.c
@@ -641,6 +641,11 @@ static store_type *st_ptr = NULL;
 static owner_type *ot_ptr = NULL;
 #endif
 
+/*
+ * We store the current "store feat" here so everyone can access it
+ */
+static int cur_store_feat;
+
 
 
 
@@ -1036,8 +1041,8 @@ static void mass_produce(object_type *o_ptr)
                case TV_DIGGING:
                case TV_BOW:
                {
-                       if (o_ptr->art_name) break;
-                       if (o_ptr->name2) break;
+                       if (object_is_artifact(o_ptr)) break;
+                       if (object_is_ego(o_ptr)) break;
                        if (cost <= 10L) size += damroll(3, 5);
                        if (cost <= 100L) size += damroll(3, 5);
                        break;
@@ -1163,14 +1168,11 @@ static bool store_object_similar(object_type *o_ptr, object_type *j_ptr)
        if (o_ptr->to_d != j_ptr->to_d) return (0);
        if (o_ptr->to_a != j_ptr->to_a) return (0);
 
-       /* Require identical "artifact" names */
-       if (o_ptr->name1 != j_ptr->name1) return (0);
-
        /* Require identical "ego-item" names */
        if (o_ptr->name2 != j_ptr->name2) return (0);
 
-       /* Random artifacts don't stack !*/
-       if (o_ptr->art_name || j_ptr->art_name) return (0);
+       /* Artifacts don't stack! */
+       if (object_is_artifact(o_ptr) || object_is_artifact(j_ptr)) return (0);
 
        /* Hack -- Identical art_flags! */
        for (i = 0; i < TR_FLAG_SIZE; i++)
@@ -1592,16 +1594,16 @@ static int home_carry(object_type *o_ptr)
                if (o_ptr->tval < j_ptr->tval) continue;
 
                /* Can happen in the home */
-               if (!object_aware_p(o_ptr)) continue;
-               if (!object_aware_p(j_ptr)) break;
+               if (!object_is_aware(o_ptr)) continue;
+               if (!object_is_aware(j_ptr)) break;
 
                /* Objects sort by increasing sval */
                if (o_ptr->sval < j_ptr->sval) break;
                if (o_ptr->sval > j_ptr->sval) continue;
 
                /* Objects in the home can be unknown */
-               if (!object_known_p(o_ptr)) continue;
-               if (!object_known_p(j_ptr)) break;
+               if (!object_is_known(o_ptr)) continue;
+               if (!object_is_known(j_ptr)) break;
 
                /*
                 * Hack:  otherwise identical rods sort by
@@ -1811,7 +1813,7 @@ static bool black_market_crap(object_type *o_ptr)
        int     i, j;
 
        /* Ego items are never crap */
-       if (o_ptr->name2) return (FALSE);
+       if (object_is_ego(o_ptr)) return (FALSE);
 
        /* Good items are never crap */
        if (o_ptr->to_a > 0) return (FALSE);
@@ -1945,7 +1947,7 @@ static void store_create(void)
                object_known(q_ptr);
 
                /* Mark it storebought */
-               q_ptr->ident |= IDENT_STOREB;
+               q_ptr->ident |= IDENT_STORE;
 
                /* Mega-Hack -- no chests in stores */
                if (q_ptr->tval == TV_CHEST) continue;
@@ -2089,7 +2091,7 @@ static void display_entry(int pos)
                if (show_weights) maxwid -= 10;
 
                /* Describe the object */
-               object_desc(o_name, o_ptr, TRUE, 3);
+               object_desc(o_name, o_ptr, 0);
                o_name[maxwid] = '\0';
                c_put_str(tval_to_attr[o_ptr->tval], o_name, i+6, cur_col);
 
@@ -2119,7 +2121,7 @@ static void display_entry(int pos)
                if (show_weights) maxwid -= 7;
 
                /* Describe the object (fully) */
-               object_desc_store(o_name, o_ptr, TRUE, 3);
+               object_desc(o_name, o_ptr, 0);
                o_name[maxwid] = '\0';
                c_put_str(tval_to_attr[o_ptr->tval], o_name, i+6, cur_col);
 
@@ -2329,7 +2331,7 @@ static void display_store(void)
        /* Normal stores */
        else
        {
-               cptr store_name = (f_name + f_info[FEAT_SHOP_HEAD + cur_store_num].name);
+               cptr store_name = (f_name + f_info[cur_store_feat].name);
                cptr owner_name = (ot_ptr->owner_name);
                cptr race_name = race_info[ot_ptr->owner_race].title;
 
@@ -3353,7 +3355,7 @@ msg_format("
                else
                {
                        /* Describe the object (fully) */
-                       object_desc_store(o_name, j_ptr, TRUE, 3);
+                       object_desc(o_name, j_ptr, 0);
 
                        /* Message */
 #ifdef JP
@@ -3407,7 +3409,7 @@ msg_format("%s(%c)
                                j_ptr->ident &= ~(IDENT_FIXED);
 
                                /* Describe the transaction */
-                               object_desc(o_name, j_ptr, TRUE, 3);
+                               object_desc(o_name, j_ptr, 0);
 
                                /* Message */
 #ifdef JP
@@ -3420,7 +3422,7 @@ msg_format("%s
                                record_turn = turn;
 
                                if (record_buy) do_cmd_write_nikki(NIKKI_BUY, 0, o_name);
-                               object_desc(o_name, o_ptr, TRUE, 0);
+                               object_desc(o_name, o_ptr, OD_NAME_ONLY);
                                if(record_rand_art && o_ptr->art_name)
                                        do_cmd_write_nikki(NIKKI_ART, 0, o_name);
 
@@ -3429,12 +3431,12 @@ msg_format("%s
 
                                /* Erase the "feeling" */
                                j_ptr->feeling = FEEL_NONE;
-                               j_ptr->ident &= ~(IDENT_STOREB);
+                               j_ptr->ident &= ~(IDENT_STORE);
                                /* Give it to the player */
                                item_new = inven_carry(j_ptr);
 
                                /* Describe the final result */
-                               object_desc(o_name, &inventory[item_new], TRUE, 3);
+                               object_desc(o_name, &inventory[item_new], 0);
 
                                /* Message */
 #ifdef JP
@@ -3486,7 +3488,7 @@ msg_format("%s
                                                        ot_ptr->owner_name, race_info[ot_ptr->owner_race].title);
                                                put_str(buf, 3, 10);
                                                sprintf(buf, "%s (%ld)",
-                                                       (f_name + f_info[FEAT_SHOP_HEAD + cur_store_num].name), (long)(ot_ptr->max_cost));
+                                                       (f_name + f_info[cur_store_feat].name), (long)(ot_ptr->max_cost));
                                                prt(buf, 3, 50);
                                        }
 
@@ -3558,7 +3560,7 @@ msg_format("%s
                item_new = inven_carry(j_ptr);
 
                /* Describe just the result */
-               object_desc(o_name, &inventory[item_new], TRUE, 3);
+               object_desc(o_name, &inventory[item_new], 0);
 
                /* Message */
 #ifdef JP
@@ -3697,7 +3699,7 @@ static void store_sell(void)
 
 
        /* Hack -- Cannot remove cursed items */
-       if ((item >= INVEN_RARM) && cursed_p(o_ptr))
+       if ((item >= INVEN_RARM) && object_is_cursed(o_ptr))
        {
                /* Oops */
 #ifdef JP
@@ -3744,7 +3746,7 @@ static void store_sell(void)
        }
 
        /* Get a full description */
-       object_desc(o_name, q_ptr, TRUE, 3);
+       object_desc(o_name, q_ptr, 0);
 
        /* Remove any inscription, feeling for stores */
        if ((cur_store_num != STORE_HOME) && (cur_store_num != STORE_MUSEUM))
@@ -3837,8 +3839,8 @@ static void store_sell(void)
                        /* Modify quantity */
                        q_ptr->number = amt;
 
-                       /* Make it look like known */
-                       q_ptr->ident |= IDENT_STOREB;
+                       /* Make it look like to be known */
+                       q_ptr->ident |= IDENT_STORE;
 
                        /*
                         * Hack -- If a rod or wand, let the shopkeeper know just
@@ -3853,7 +3855,7 @@ static void store_sell(void)
                        value = object_value(q_ptr) * q_ptr->number;
 
                        /* Get the description all over again */
-                       object_desc(o_name, q_ptr, TRUE, 3);
+                       object_desc(o_name, q_ptr, 0);
 
                        /* Describe the result (in message buffer) */
 #ifdef JP
@@ -3908,7 +3910,7 @@ msg_format("%s
        else if (cur_store_num == STORE_MUSEUM)
        {
                char o2_name[MAX_NLEN];
-               object_desc(o2_name, q_ptr, TRUE, 0);
+               object_desc(o2_name, q_ptr, OD_NAME_ONLY);
 
                if (-1 == store_check_num(q_ptr))
                {
@@ -4081,7 +4083,7 @@ msg_print("
        }
 
        /* Description */
-       object_desc(o_name, o_ptr, TRUE, 3);
+       object_desc(o_name, o_ptr, 0);
 
        /* Describe */
 #ifdef JP
@@ -4499,9 +4501,7 @@ void do_cmd_store(void)
        c_ptr = &cave[py][px];
 
        /* Verify a store */
-       if (!((c_ptr->feat >= FEAT_SHOP_HEAD) &&
-                 (c_ptr->feat <= FEAT_SHOP_TAIL)) &&
-           (c_ptr->feat != FEAT_MUSEUM))
+       if (!cave_have_flag_grid(c_ptr, FF_STORE))
        {
 #ifdef JP
                msg_print("¤³¤³¤Ë¤ÏŹ¤¬¤¢¤ê¤Þ¤»¤ó¡£");
@@ -4513,8 +4513,7 @@ void do_cmd_store(void)
        }
 
        /* Extract the store code */
-       if (c_ptr->feat == FEAT_MUSEUM) which = STORE_MUSEUM;
-       else which = (c_ptr->feat - FEAT_SHOP_HEAD);
+       which = f_info[c_ptr->feat].power;
 
        old_town_num = p_ptr->town_num;
        if ((which == STORE_HOME) || (which == STORE_MUSEUM)) p_ptr->town_num = 1;
@@ -4575,6 +4574,9 @@ void do_cmd_store(void)
        /* Save the store number */
        cur_store_num = which;
 
+       /* Hack -- save the store feature */
+       cur_store_feat = c_ptr->feat;
+
        /* Save the store and owner pointers */
        st_ptr = &town[p_ptr->town_num].store[cur_store_num];
        ot_ptr = &owners[cur_store_num][st_ptr->owner];
@@ -4786,7 +4788,7 @@ void do_cmd_store(void)
                                object_copy(q_ptr, o_ptr);
 
                                /* Describe it */
-                               object_desc(o_name, q_ptr, TRUE, 3);
+                               object_desc(o_name, q_ptr, 0);
 
                                /* Message */
 #ifdef JP
@@ -4917,7 +4919,7 @@ void store_shuffle(int which)
                /* Get the item */
                o_ptr = &st_ptr->stock[i];
 
-               if (!(artifact_p(o_ptr) || o_ptr->art_name))
+               if (!object_is_artifact(o_ptr))
                {
                        /* Hack -- Sell all non-artifact old items for "half price" */
                        o_ptr->discount = 50;
@@ -5083,7 +5085,7 @@ void move_to_black_market(object_type *o_ptr)
 
        st_ptr = &town[p_ptr->town_num].store[STORE_BLACK];
 
-       o_ptr->ident |= IDENT_STOREB;
+       o_ptr->ident |= IDENT_STORE;
 
        (void)store_carry(o_ptr);