[Refactor] #37353 コメント整理 / Refactor comments.

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

diff --git a/src/object1.c b/src/object1.c
index fdba093..6c5e085 100644 (file)
--- a/src/object1.c
+++ b/src/object1.c
@@ -107,7 +107,7 @@ void reset_visuals(void)
  * @param flgs フラグ情報を受け取る配列
  * @return なし
  */
-void object_flags(object_type *o_ptr, u32b flgs[TR_FLAG_SIZE])
+void object_flags(object_type *o_ptr, BIT_FLAGS flgs[TR_FLAG_SIZE])
 {
        object_kind *k_ptr = &k_info[o_ptr->k_idx];
        int i;
@@ -216,7 +216,7 @@ void object_flags(object_type *o_ptr, u32b flgs[TR_FLAG_SIZE])
  * @param flgs フラグ情報を受け取る配列
  * @return なし
  */
-void object_flags_known(object_type *o_ptr, u32b flgs[TR_FLAG_SIZE])
+void object_flags_known(object_type *o_ptr, BIT_FLAGS flgs[TR_FLAG_SIZE])
 {
        bool spoil = FALSE;
        int i;
@@ -344,7 +344,7 @@ void object_flags_known(object_type *o_ptr, u32b flgs[TR_FLAG_SIZE])
 static cptr item_activation_dragon_breath(object_type *o_ptr)
 {
        static char desc[256];
-       u32b flgs[TR_FLAG_SIZE]; /* for resistance flags */
+       BIT_FLAGS flgs[TR_FLAG_SIZE]; /* for resistance flags */
        int i, n = 0;
 
        object_flags(o_ptr, flgs);
@@ -473,7 +473,7 @@ static cptr item_activation_aux(object_type *o_ptr)
  */
 cptr item_activation(object_type *o_ptr)
 {
-       u32b flgs[TR_FLAG_SIZE];
+       BIT_FLAGS flgs[TR_FLAG_SIZE];
 
        /* Extract the flags */
        object_flags(o_ptr, flgs);
@@ -512,9 +512,9 @@ cptr item_activation(object_type *o_ptr)
  */
 bool screen_object(object_type *o_ptr, BIT_FLAGS mode)
 {
-       int                     i = 0, j, k;
+       int i = 0, j, k;
 
-       u32b flgs[TR_FLAG_SIZE];
+       BIT_FLAGS flgs[TR_FLAG_SIZE];
 
        char temp[70 * 20];
        cptr            info[128];
@@ -1658,7 +1658,7 @@ void display_inven(void)
 {
        register        int i, n, z = 0;
        object_type     *o_ptr;
-       byte            attr = TERM_WHITE;
+       TERM_COLOR      attr = TERM_WHITE;
        char            tmp_val[80];
        char            o_name[MAX_NLEN];
        int             wid, hgt;
@@ -1754,7 +1754,7 @@ void display_equip(void)
 {
        register        int i, n;
        object_type     *o_ptr;
-       byte            attr = TERM_WHITE;
+       TERM_COLOR      attr = TERM_WHITE;
        char            tmp_val[80];
        char            o_name[MAX_NLEN];
        int             wid, hgt;
@@ -2150,11 +2150,11 @@ COMMAND_CODE show_inven(int target_item)
        object_type     *o_ptr;
        char            o_name[MAX_NLEN];
        char            tmp_val[80];
-       COMMAND_CODE out_index[23];
-       byte            out_color[23];
+       COMMAND_CODE    out_index[23];
+       TERM_COLOR      out_color[23];
        char            out_desc[23][MAX_NLEN];
        COMMAND_CODE target_item_label = 0;
-       TERM_POSITION wid, hgt;
+       TERM_LEN wid, hgt;
        char            inven_label[52 + 1];
 
        /* Starting column */
@@ -2317,11 +2317,11 @@ COMMAND_CODE show_equip(int target_item)
        object_type     *o_ptr;
        char            tmp_val[80];
        char            o_name[MAX_NLEN];
-       COMMAND_CODE out_index[23];
-       byte            out_color[23];
+       COMMAND_CODE    out_index[23];
+       TERM_COLOR      out_color[23];
        char            out_desc[23][MAX_NLEN];
        COMMAND_CODE target_item_label = 0;
-       TERM_POSITION wid, hgt;
+       TERM_LEN wid, hgt;
        char            equip_label[52 + 1];
 
        /* Starting column */
@@ -2349,11 +2349,7 @@ COMMAND_CODE show_equip(int target_item)
 
                if ((((i == INVEN_RARM) && p_ptr->hidarite) || ((i == INVEN_LARM) && p_ptr->migite)) && p_ptr->ryoute)
                {
-#ifdef JP
-                       (void)strcpy(out_desc[k],"(武器を両手持ち)");
-#else
-                       (void)strcpy(out_desc[k],"(wielding with two-hands)");
-#endif
+                       (void)strcpy(out_desc[k],_("(武器を両手持ち)", "(wielding with two-hands)"));
                        out_color[k] = TERM_WHITE;
                }
                else
@@ -3631,7 +3627,7 @@ ITEM_NUMBER scan_floor(OBJECT_IDX *items, POSITION y, POSITION x, BIT_FLAGS mode
  * @return 選択したアイテムの添え字
  * @details
  */
-COMMAND_CODE show_floor(int target_item, POSITION y, POSITION x, TERM_POSITION *min_width)
+COMMAND_CODE show_floor(int target_item, POSITION y, POSITION x, TERM_LEN *min_width)
 {
        COMMAND_CODE i, m;
        int j, k, l;
@@ -3643,13 +3639,13 @@ COMMAND_CODE show_floor(int target_item, POSITION y, POSITION x, TERM_POSITION *
        char tmp_val[80];
 
        COMMAND_CODE out_index[23];
-       byte out_color[23];
+       TERM_COLOR out_color[23];
        char out_desc[23][MAX_NLEN];
        COMMAND_CODE target_item_label = 0;
 
        OBJECT_IDX floor_list[23];
        ITEM_NUMBER floor_num;
-       TERM_POSITION wid, hgt;
+       TERM_LEN wid, hgt;
        char floor_label[52 + 1];
 
        bool dont_need_to_show_weights = TRUE;
@@ -3798,7 +3794,7 @@ bool get_item_floor(COMMAND_CODE *cp, cptr pmt, cptr str, BIT_FLAGS mode)
        ITEM_NUMBER floor_num;
        OBJECT_IDX floor_list[23];
        int floor_top = 0;
-       TERM_POSITION min_width = 0;
+       TERM_LEN min_width = 0;
 
        extern bool select_the_force;
 
@@ -4541,7 +4537,7 @@ bool get_item_floor(COMMAND_CODE *cp, cptr pmt, cptr str, BIT_FLAGS mode)
                        case '+':
                        {
                                int i;
-                               IDX o_idx;
+                               OBJECT_IDX o_idx;
                                cave_type *c_ptr = &cave[p_ptr->y][p_ptr->x];
 
                                if (command_wrk != (USE_FLOOR)) break;
@@ -5060,7 +5056,6 @@ void py_pickup_floor(bool pickup)
                /* Pick up gold */
                if (o_ptr->tval == TV_GOLD)
                {
-                       /* Message */
 #ifdef JP
                        msg_format(" $%ld の価値がある%sを見つけた。",
                                (long)o_ptr->pval, o_name);
@@ -5132,14 +5127,12 @@ void py_pickup_floor(bool pickup)
                        /* Describe the object */
                        object_desc(o_name, o_ptr, 0);
 
-                       /* Message */
                        msg_format(_("%sがある。", "You see %s."), o_name);
                }
 
                /* Multiple objects */
                else
                {
-                       /* Message */
                        msg_format(_("%d 個のアイテムの山がある。", "You see a pile of %d items."), floor_num);
                }
 
@@ -5170,14 +5163,12 @@ void py_pickup_floor(bool pickup)
                        /* Describe the object */
                        object_desc(o_name, o_ptr, 0);
 
-                       /* Message */
                        msg_format(_("ザックには%sを入れる隙間がない。", "You have no room for %s."), o_name);
                }
 
                /* Multiple objects */
                else
                {
-                       /* Message */
                        msg_print(_("ザックには床にあるどのアイテムも入らない。", "You have no room for any of the objects on the floor."));
 
                }