[Refactor] #37353 型の置換(C_MAKE)。 / Type replacement(C_MAKE).

[hengband/hengband.git] / src / cmd-item.c

diff --git a/src/cmd-item.c b/src/cmd-item.c
index 4f553f8..7a60ff8 100644 (file)
--- a/src/cmd-item.c
+++ b/src/cmd-item.c
@@ -22,6 +22,7 @@
 #include "cmd-zapwand.h"
 
 #include "object-hook.h"
+#include "sort.h"
 
 
 /*!
@@ -146,8 +147,8 @@ void do_cmd_wield(void)
        object_type *q_ptr;
        object_type *o_ptr;
 
-       cptr act;
-       cptr q, s;
+       concptr act;
+       concptr q, s;
 
        GAME_TEXT o_name[MAX_NLEN];
 
@@ -376,7 +377,6 @@ void do_cmd_wield(void)
        /* Player touches it */
        o_ptr->marked |= OM_TOUCHED;
 
-       /* Increase the weight */
        p_ptr->total_weight += q_ptr->weight;
 
        /* Increment the equip counter by hand */
@@ -517,7 +517,7 @@ void do_cmd_takeoff(void)
 {
        OBJECT_IDX item;
        object_type *o_ptr;
-       cptr q, s;
+       concptr q, s;
 
        if (p_ptr->special_defense & KATA_MUSOU)
        {
@@ -583,7 +583,7 @@ void do_cmd_drop(void)
 
        object_type *o_ptr;
 
-       cptr q, s;
+       concptr q, s;
 
        if (p_ptr->special_defense & KATA_MUSOU)
        {
@@ -678,7 +678,7 @@ void do_cmd_destroy(void)
        GAME_TEXT o_name[MAX_NLEN];
        char out_val[MAX_NLEN+40];
 
-       cptr q, s;
+       concptr q, s;
 
        if (p_ptr->special_defense & KATA_MUSOU)
        {
@@ -867,7 +867,7 @@ void do_cmd_observe(void)
        OBJECT_IDX item;
        object_type *o_ptr;
        GAME_TEXT o_name[MAX_NLEN];
-       cptr q, s;
+       concptr q, s;
 
        q = _("どのアイテムを調べますか? ", "Examine which item? ");
        s = _("調べられるアイテムがない。", "You have nothing to examine.");
@@ -882,10 +882,8 @@ void do_cmd_observe(void)
                return;
        }
 
-       /* Description */
        object_desc(o_name, o_ptr, 0);
        msg_format(_("%sを調べている...", "Examining %s..."), o_name);
-       /* Describe it fully */
        if (!screen_object(o_ptr, SCROBJ_FORCE_DETAIL)) msg_print(_("特に変わったところはないようだ。", "You see nothing special."));
 }
 
@@ -900,7 +898,7 @@ void do_cmd_uninscribe(void)
 {
        OBJECT_IDX item;
        object_type *o_ptr;
-       cptr q, s;
+       concptr q, s;
 
        q = _("どのアイテムの銘を消しますか? ", "Un-inscribe which item? ");
        s = _("銘を消せるアイテムがない。", "You have nothing to un-inscribe.");
@@ -942,7 +940,7 @@ void do_cmd_inscribe(void)
        object_type *o_ptr;
        GAME_TEXT o_name[MAX_NLEN];
        char out_val[80];
-       cptr q, s;
+       concptr q, s;
 
        q = _("どのアイテムに銘を刻みますか? ", "Inscribe which item? ");
        s = _("銘を刻めるアイテムがない。", "You have nothing to inscribe.");
@@ -1016,7 +1014,7 @@ static void do_cmd_refill_lamp(void)
        object_type *o_ptr;
        object_type *j_ptr;
 
-       cptr q, s;
+       concptr q, s;
 
        /* Restrict the choices */
        item_tester_hook = item_tester_refill_lantern;
@@ -1103,7 +1101,7 @@ static void do_cmd_refill_torch(void)
        object_type *o_ptr;
        object_type *j_ptr;
 
-       cptr q, s;
+       concptr q, s;
 
        /* Restrict the choices */
        item_tester_hook = item_tester_refill_torch;
@@ -1261,17 +1259,14 @@ void do_cmd_look(void)
  */
 void do_cmd_locate(void)
 {
-       int             dir, y1, x1, y2, x2;
-
-       char    tmp_val[80];
-
-       char    out_val[160];
-
-       int wid, hgt;
+       DIRECTION dir;
+       POSITION y1, x1, y2, x2;
+       GAME_TEXT tmp_val[80];
+       GAME_TEXT out_val[160];
+       TERM_LEN wid, hgt;
 
        get_screen_size(&wid, &hgt);
 
-
        /* Start at current panel */
        y2 = y1 = panel_row_min;
        x2 = x1 = panel_col_min;
@@ -1304,8 +1299,8 @@ void do_cmd_locate(void)
                }
 
                /* Prepare to ask which way to look */
-               sprintf(out_val, _("マップ位置 [%d(%02d),%d(%02d)] (プレイヤーの%s)  方向?", 
-                                              "Map sector [%d(%02d),%d(%02d)], which is%s your sector.  Direction?"),
+               sprintf(out_val, _("マップ位置 [%ld(%02ld),%ld(%02ld)] (プレイヤーの%s)  方向?", 
+                                              "Map sector [%ld(%02ld),%ld(%02ld)], which is%s your sector.  Direction?"),
                        y2 / (hgt / 2), y2 % (hgt / 2),
                        x2 / (wid / 2), x2 % (wid / 2), tmp_val);
 
@@ -1343,9 +1338,7 @@ void do_cmd_locate(void)
        verify_panel();
 
        p_ptr->update |= (PU_MONSTERS);
-
        p_ptr->redraw |= (PR_MAP);
-
        p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON);
        handle_stuff();
 }
@@ -1366,7 +1359,6 @@ void do_cmd_locate(void)
 bool ang_sort_comp_hook(vptr u, vptr v, int a, int b)
 {
        u16b *who = (u16b*)(u);
-
        u16b *why = (u16b*)(v);
 
        int w1 = who[a];
@@ -1548,7 +1540,7 @@ void do_cmd_query_symbol(void)
        prt(buf, 0, 0);
 
        /* Allocate the "who" array */
-       C_MAKE(who, max_r_idx, IDX);
+       C_MAKE(who, max_r_idx, MONRACE_IDX);
 
        /* Collect matching monsters */
        for (n = 0, i = 1; i < max_r_idx; i++)
@@ -1746,7 +1738,7 @@ void do_cmd_use(void)
 {
        OBJECT_IDX item;
        object_type *o_ptr;
-       cptr q, s;
+       concptr q, s;
 
        if (p_ptr->wild_mode)
        {