#33109 GF_*の一部にDoxygenコメント追加。 / Add Doxygen comments to parts of GF_*.

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

diff --git a/src/wizard2.c b/src/wizard2.c
index eeb1ed0..67e3287 100644 (file)
--- a/src/wizard2.c
+++ b/src/wizard2.c
@@ -710,7 +710,7 @@ static tval_desc tvals[] =
  * @param k_idx ベースアイテムID
  * @return なし
  */
-void strip_name(char *buf, int k_idx)
+void strip_name(char *buf, KIND_OBJECT_IDX k_idx)
 {
        char *t;
 
@@ -745,16 +745,17 @@ void strip_name(char *buf, int k_idx)
  * This function returns the k_idx of an object type, or zero if failed
  * List up to 50 choices in three columns
  */
-static IDX wiz_create_itemtype(void)
+static KIND_OBJECT_IDX wiz_create_itemtype(void)
 {
-       int i, num, max_num;
-       int col, row;
+       KIND_OBJECT_IDX i;
+       int num, max_num;
+       TERM_POSITION col, row;
        OBJECT_TYPE_VALUE tval;
 
        cptr tval_desc;
        char ch;
 
-       int choice[80];
+       KIND_OBJECT_IDX choice[80];
 
        char buf[160];
 
@@ -1035,7 +1036,7 @@ static void wiz_statistics(object_type *o_ptr)
        char ch;
        cptr quality;
 
-       u32b mode;
+       BIT_FLAGS mode;
 
        object_type forge;
        object_type     *q_ptr;
@@ -1272,7 +1273,7 @@ static void do_cmd_wiz_blue_mage(void)
  */
 static void do_cmd_wiz_play(void)
 {
-       int item;
+       OBJECT_IDX item;
 
        object_type     forge;
        object_type *q_ptr;
@@ -1538,9 +1539,8 @@ static void do_cmd_wiz_jump(void)
        if (command_arg <= 0)
        {
                char    ppp[80];
-
                char    tmp_val[160];
-               int             tmp_dungeon_type;
+               DUNGEON_IDX tmp_dungeon_type;
 
                /* Prompt */
                sprintf(ppp, "Jump which dungeon : ");
@@ -1551,11 +1551,12 @@ static void do_cmd_wiz_jump(void)
                /* Ask for a level */
                if (!get_string(ppp, tmp_val, 2)) return;
 
-               tmp_dungeon_type = atoi(tmp_val);
+               tmp_dungeon_type = (DUNGEON_IDX)atoi(tmp_val);
                if (!d_info[tmp_dungeon_type].maxdepth || (tmp_dungeon_type > max_d_idx)) tmp_dungeon_type = DUNGEON_ANGBAND;
 
                /* Prompt */
-               sprintf(ppp, "Jump to level (0, %d-%d): ", d_info[tmp_dungeon_type].mindepth, d_info[tmp_dungeon_type].maxdepth);
+               sprintf(ppp, "Jump to level (0, %d-%d): ",
+                       (int)d_info[tmp_dungeon_type].mindepth, (int)d_info[tmp_dungeon_type].maxdepth);
 
                /* Default */
                sprintf(tmp_val, "%d", (int)dun_level);
@@ -1564,16 +1565,16 @@ static void do_cmd_wiz_jump(void)
                if (!get_string(ppp, tmp_val, 10)) return;
 
                /* Extract request */
-               command_arg = (s16b)atoi(tmp_val);
+               command_arg = (COMMAND_ARG)atoi(tmp_val);
 
-               dungeon_type = (byte_hack)tmp_dungeon_type;
+               dungeon_type = tmp_dungeon_type;
        }
 
        /* Paranoia */
        if (command_arg < d_info[dungeon_type].mindepth) command_arg = 0;
 
        /* Paranoia */
-       if (command_arg > d_info[dungeon_type].maxdepth) command_arg = d_info[dungeon_type].maxdepth;
+       if (command_arg > d_info[dungeon_type].maxdepth) command_arg = (COMMAND_ARG)d_info[dungeon_type].maxdepth;
 
        /* Accept request */
        msg_format("You jump to dungeon level %d.", command_arg);
@@ -1697,7 +1698,7 @@ static void do_cmd_wiz_named_friendly(MONRACE_IDX r_idx)
  */
 static void do_cmd_wiz_zap(void)
 {
-       int i;
+       MONSTER_IDX i;
 
 
        /* Genocide everyone nearby */
@@ -1735,7 +1736,7 @@ static void do_cmd_wiz_zap(void)
  */
 static void do_cmd_wiz_zap_all(void)
 {
-       int i;
+       MONSTER_IDX i;
 
        /* Genocide everyone */
        for (i = 1; i < m_max; i++)