add type casting for fprintf

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

diff --git a/src/wizard2.c b/src/wizard2.c
index f8c7b93..31a7b29 100644 (file)
--- a/src/wizard2.c
+++ b/src/wizard2.c
@@ -108,7 +108,7 @@ static bool wiz_dimension_door(void)
 
        if (!tgt_pt(&x, &y)) return FALSE;
 
-       teleport_player_to(y, x, FALSE, FALSE);
+       teleport_player_to(y, x, TELEPORT_NONMAGICAL);
 
        return (TRUE);
 }
@@ -121,7 +121,7 @@ static bool wiz_dimension_door(void)
 static void wiz_create_named_art(int a_idx)
 {
        /* Create the artifact */
-       create_named_art(a_idx, py, px);
+       (void)create_named_art(a_idx, py, px);
 
        /* All done */
        msg_print("Allocated.");
@@ -339,7 +339,7 @@ static void do_cmd_wiz_bamf(void)
        if (!target_who) return;
 
        /* Teleport to the target */
-       teleport_player_to(target_row, target_col, FALSE, FALSE);
+       teleport_player_to(target_row, target_col, TELEPORT_NONMAGICAL);
 }
 
 
@@ -366,7 +366,7 @@ static void do_cmd_wiz_change_aux(void)
                sprintf(tmp_val, "%d", p_ptr->stat_max[i]);
 
                /* Query */
-               if (!get_string(ppp, tmp_val, 3, TRUE)) return;
+               if (!get_string(ppp, tmp_val, 3)) return;
 
                /* Extract */
                tmp_int = atoi(tmp_val);
@@ -385,9 +385,9 @@ static void do_cmd_wiz_change_aux(void)
 
        /* Query */
 #ifdef JP
-       if (!get_string("½ÏÎýÅÙ: ", tmp_val, 9, TRUE)) return;
+       if (!get_string("½ÏÎýÅÙ: ", tmp_val, 9)) return;
 #else
-       if (!get_string("Proficiency: ", tmp_val, 9, TRUE)) return;
+       if (!get_string("Proficiency: ", tmp_val, 9)) return;
 #endif
 
        /* Extract */
@@ -421,7 +421,7 @@ static void do_cmd_wiz_change_aux(void)
        sprintf(tmp_val, "%ld", (long)(p_ptr->au));
 
        /* Query */
-       if (!get_string("Gold: ", tmp_val, 9, TRUE)) return;
+       if (!get_string("Gold: ", tmp_val, 9)) return;
 
        /* Extract */
        tmp_long = atol(tmp_val);
@@ -437,7 +437,7 @@ static void do_cmd_wiz_change_aux(void)
        sprintf(tmp_val, "%ld", (long)(p_ptr->max_exp));
 
        /* Query */
-       if (!get_string("Experience: ", tmp_val, 9, TRUE)) return;
+       if (!get_string("Experience: ", tmp_val, 9)) return;
 
        /* Extract */
        tmp_long = atol(tmp_val);
@@ -654,6 +654,7 @@ static tval_desc tvals[] =
        { TV_CRUSADE_BOOK,      "Crusade Spellbook"},
        { TV_MUSIC_BOOK,        "Music Spellbook"      },
        { TV_HISSATSU_BOOK,     "Book of Kendo" },
+       { TV_HEX_BOOK,          "Hex Spellbook"        },
        { TV_PARCHMENT,         "Parchment" },
        { TV_WHISTLE,           "Whistle"       },
        { TV_SPIKE,             "Spikes"               },
@@ -819,25 +820,25 @@ static void wiz_tweak_item(object_type *o_ptr)
 
        p = "Enter new 'pval' setting: ";
        sprintf(tmp_val, "%d", o_ptr->pval);
-       if (!get_string(p, tmp_val, 5, TRUE)) return;
+       if (!get_string(p, tmp_val, 5)) return;
        o_ptr->pval = atoi(tmp_val);
        wiz_display_item(o_ptr);
 
        p = "Enter new 'to_a' setting: ";
        sprintf(tmp_val, "%d", o_ptr->to_a);
-       if (!get_string(p, tmp_val, 5, TRUE)) return;
+       if (!get_string(p, tmp_val, 5)) return;
        o_ptr->to_a = atoi(tmp_val);
        wiz_display_item(o_ptr);
 
        p = "Enter new 'to_h' setting: ";
        sprintf(tmp_val, "%d", o_ptr->to_h);
-       if (!get_string(p, tmp_val, 5, TRUE)) return;
+       if (!get_string(p, tmp_val, 5)) return;
        o_ptr->to_h = atoi(tmp_val);
        wiz_display_item(o_ptr);
 
        p = "Enter new 'to_d' setting: ";
        sprintf(tmp_val, "%d", o_ptr->to_d);
-       if (!get_string(p, tmp_val, 5, TRUE)) return;
+       if (!get_string(p, tmp_val, 5)) return;
        o_ptr->to_d = atoi(tmp_val);
        wiz_display_item(o_ptr);
 }
@@ -1039,8 +1040,8 @@ static void wiz_statistics(object_type *o_ptr)
                        break;
                }
 
-               sprintf(tmp_val, "%ld", test_roll);
-               if (get_string(p, tmp_val, 10, TRUE)) test_roll = atol(tmp_val);
+               sprintf(tmp_val, "%ld", (long int)test_roll);
+               if (get_string(p, tmp_val, 10)) test_roll = atol(tmp_val);
                test_roll = MAX(1, test_roll);
 
                /* Let us know what we are doing */
@@ -1163,7 +1164,7 @@ static void wiz_quantity_item(object_type *o_ptr)
        sprintf(tmp_val, "%d", o_ptr->number);
 
        /* Query */
-       if (get_string("Quantity: ", tmp_val, 2, TRUE))
+       if (get_string("Quantity: ", tmp_val, 2))
        {
                /* Extract */
                tmp_int = atoi(tmp_val);
@@ -1390,7 +1391,7 @@ static void wiz_create_item(void)
                        if (a_info[i].sval != k_info[k_idx].sval) continue;
 
                        /* Create this artifact */
-                       create_named_art(i, py, px);
+                       (void)create_named_art(i, py, px);
 
                        /* All done */
                        msg_print("Allocated(INSTA_ART).");
@@ -1492,7 +1493,7 @@ static void do_cmd_wiz_jump(void)
                sprintf(tmp_val, "%d", dungeon_type);
 
                /* Ask for a level */
-               if (!get_string(ppp, tmp_val, 2, TRUE)) return;
+               if (!get_string(ppp, tmp_val, 2)) return;
 
                tmp_dungeon_type = atoi(tmp_val);
                if (!d_info[tmp_dungeon_type].maxdepth || (tmp_dungeon_type > max_d_idx)) tmp_dungeon_type = DUNGEON_ANGBAND;
@@ -1504,7 +1505,7 @@ static void do_cmd_wiz_jump(void)
                sprintf(tmp_val, "%d", dun_level);
 
                /* Ask for a level */
-               if (!get_string(ppp, tmp_val, 10, TRUE)) return;
+               if (!get_string(ppp, tmp_val, 10)) return;
 
                /* Extract request */
                command_arg = atoi(tmp_val);
@@ -1643,6 +1644,14 @@ static void do_cmd_wiz_zap(void)
                /* Delete nearby monsters */
                if (m_ptr->cdis <= MAX_SIGHT)
                {
+                       if (record_named_pet && is_pet(m_ptr) && m_ptr->nickname)
+                       {
+                               char m_name[80];
+
+                               monster_desc(m_name, m_ptr, MD_INDEF_VISIBLE);
+                               do_cmd_write_nikki(NIKKI_NAMED_PET, RECORD_NAMED_PET_WIZ_ZAP, m_name);
+                       }
+
                        delete_monster_idx(i);
                }
        }
@@ -1667,6 +1676,14 @@ static void do_cmd_wiz_zap_all(void)
                /* Skip the mount */
                if (i == p_ptr->riding) continue;
 
+               if (record_named_pet && is_pet(m_ptr) && m_ptr->nickname)
+               {
+                       char m_name[80];
+
+                       monster_desc(m_name, m_ptr, MD_INDEF_VISIBLE);
+                       do_cmd_write_nikki(NIKKI_NAMED_PET, RECORD_NAMED_PET_WIZ_ZAP, m_name);
+               }
+
                /* Delete this monster */
                delete_monster_idx(i);
        }
@@ -1678,8 +1695,8 @@ static void do_cmd_wiz_zap_all(void)
  */
 static void do_cmd_wiz_create_feature(void)
 {
-       static int   prev_feat = FEAT_NONE;
-       static int   prev_mimic = FEAT_NONE;
+       static int   prev_feat = 0;
+       static int   prev_mimic = 0;
        cave_type    *c_ptr;
        feature_type *f_ptr;
        char         tmp_val[160];
@@ -1695,9 +1712,9 @@ static void do_cmd_wiz_create_feature(void)
 
        /* Query */
 #ifdef JP
-       if (!get_string("ÃÏ·Á: ", tmp_val, 3, TRUE)) return;
+       if (!get_string("ÃÏ·Á: ", tmp_val, 3)) return;
 #else
-       if (!get_string("Feature: ", tmp_val, 3, TRUE)) return;
+       if (!get_string("Feature: ", tmp_val, 3)) return;
 #endif
 
        /* Extract */
@@ -1710,9 +1727,9 @@ static void do_cmd_wiz_create_feature(void)
 
        /* Query */
 #ifdef JP
-       if (!get_string("ÃÏ·Á (mimic): ", tmp_val, 3, TRUE)) return;
+       if (!get_string("ÃÏ·Á (mimic): ", tmp_val, 3)) return;
 #else
-       if (!get_string("Feature (mimic): ", tmp_val, 3, TRUE)) return;
+       if (!get_string("Feature (mimic): ", tmp_val, 3)) return;
 #endif
 
        /* Extract */
@@ -2021,7 +2038,7 @@ void do_cmd_debug(void)
 
        /* Phase Door */
        case 'p':
-               teleport_player(10, FALSE);
+               teleport_player(10, 0L);
                break;
 
 #if 0
@@ -2065,7 +2082,7 @@ void do_cmd_debug(void)
 
        /* Teleport */
        case 't':
-               teleport_player(100, FALSE);
+               teleport_player(100, 0L);
                break;
 
        /* Very Good Objects */