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

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

diff --git a/src/wizard2.c b/src/wizard2.c
index f54b8b7..94514ec 100644 (file)
--- a/src/wizard2.c
+++ b/src/wizard2.c
@@ -73,10 +73,7 @@ void do_cmd_rerate(bool display)
        p_ptr->update |= (PU_HP);
        p_ptr->redraw |= (PR_HP);
 
-       /* Window stuff */
        p_ptr->window |= (PW_PLAYER);
-
-       /* Handle stuff */
        handle_stuff();
 
        if (display)
@@ -168,14 +165,10 @@ static void wiz_create_named_art(void)
  */
 static void do_cmd_wiz_hack_ben(void)
 {
-       /* Oops */
        msg_print("Oops.");
        (void)probing();
 }
 
-
-#ifdef MONSTER_HORDES
-
 /*!
  * @brief ウィザードモード用モンスターの群れ生成 / Summon a horde of monsters
  * @return なし
@@ -194,8 +187,6 @@ static void do_cmd_summon_horde(void)
        (void)alloc_horde(wy, wx);
 }
 
-#endif /* MONSTER_HORDES */
-
 /*!
  * @brief 32ビット変数のビット配列を並べて描画する / Output a long int in binary format.
  * @return なし
@@ -900,8 +891,6 @@ static void wiz_reroll_item(object_type *o_ptr)
        /* Hack -- leave artifacts alone */
        if (object_is_artifact(o_ptr)) return;
 
-
-       /* Get local object */
        q_ptr = &forge;
 
        /* Copy the object */
@@ -1009,7 +998,6 @@ static void wiz_reroll_item(object_type *o_ptr)
                /* Combine / Reorder the pack (later) */
                p_ptr->notice |= (PN_COMBINE | PN_REORDER);
 
-               /* Window stuff */
                p_ptr->window |= (PW_INVEN | PW_EQUIP | PW_SPELL | PW_PLAYER);
        }
 }
@@ -1047,7 +1035,7 @@ static void wiz_statistics(object_type *o_ptr)
        char tmp_val[80];
 
 
-       /* XXX XXX XXX Mega-Hack -- allow multiple artifacts */
+       /* Mega-Hack -- allow multiple artifacts */
        if (object_is_fixed_artifact(o_ptr)) a_info[o_ptr->name1].cur_num = 0;
 
 
@@ -1106,30 +1094,22 @@ static void wiz_statistics(object_type *o_ptr)
                                /* Allow interupt */
                                if (inkey())
                                {
-                                       /* Flush */
                                        flush();
-
-                                       /* Stop rolling */
-                                       break;
+                                       break; // stop rolling
                                }
 
                                /* Dump the stats */
                                prt(format(q, i, correct, matches, better, worse, other), 0, 0);
                                Term_fresh();
                        }
-
-
-                       /* Get local object */
                        q_ptr = &forge;
-
-                       /* Wipe the object */
                        object_wipe(q_ptr);
 
                        /* Create an object */
                        make_object(q_ptr, mode);
 
 
-                       /* XXX XXX XXX Mega-Hack -- allow multiple artifacts */
+                       /* Mega-Hack -- allow multiple artifacts */
                        if (object_is_fixed_artifact(q_ptr)) a_info[q_ptr->name1].cur_num = 0;
 
 
@@ -1287,7 +1267,6 @@ static void do_cmd_wiz_play(void)
        cptr q, s;
 
        item_tester_no_ryoute = TRUE;
-       /* Get an item */
        q = "Play with which object? ";
        s = "You have nothing to play with.";
        if (!get_item(&item, q, s, (USE_EQUIP | USE_INVEN | USE_FLOOR))) return;
@@ -1311,8 +1290,6 @@ static void do_cmd_wiz_play(void)
        /* Save the screen */
        screen_save();
 
-
-       /* Get local object */
        q_ptr = &forge;
 
        /* Copy object */
@@ -1386,7 +1363,6 @@ static void do_cmd_wiz_play(void)
                /* Combine / Reorder the pack (later) */
                p_ptr->notice |= (PN_COMBINE | PN_REORDER);
 
-               /* Window stuff */
                p_ptr->window |= (PW_INVEN | PW_EQUIP | PW_SPELL | PW_PLAYER);
        }
 
@@ -1451,8 +1427,6 @@ static void wiz_create_item(void)
                        return;
                }
        }
-
-       /* Get local object */
        q_ptr = &forge;
 
        /* Create the item */
@@ -1585,7 +1559,6 @@ static void do_cmd_wiz_learn(void)
                /* Induce awareness */
                if (k_ptr->level <= command_arg)
                {
-                       /* Get local object */
                        q_ptr = &forge;
 
                        /* Prepare object */
@@ -1621,7 +1594,7 @@ static void do_cmd_wiz_summon(int num)
  * @param r_idx モンスター種族ID
  * @return なし
  * @details
- * XXX XXX XXX This function is rather dangerous
+ * This function is rather dangerous
  */
 static void do_cmd_wiz_named(MONRACE_IDX r_idx)
 {
@@ -1635,7 +1608,7 @@ static void do_cmd_wiz_named(MONRACE_IDX r_idx)
  * @param r_idx モンスター種族ID
  * @return なし
  * @details
- * XXX XXX XXX This function is rather dangerous
+ * This function is rather dangerous
  */
 static void do_cmd_wiz_named_friendly(MONRACE_IDX r_idx)
 {
@@ -1768,10 +1741,7 @@ static void do_cmd_wiz_create_feature(void)
        else if (have_flag(f_ptr->flags, FF_MIRROR))
                c_ptr->info |= (CAVE_GLOW | CAVE_OBJECT);
 
-       /* Notice */
        note_spot(y, x);
-
-       /* Redraw */
        lite_spot(y, x);
 
        /* Update some things */
@@ -1806,7 +1776,6 @@ static void do_cmd_dump_options(void)
        /* Open the file */
        fff = my_fopen(buf, "a");
 
-       /* Oops */
        if (!fff)
        {
                msg_format(_("ファイル %s を開けませんでした。", "Failed to open file %s."), buf);
@@ -1990,11 +1959,9 @@ void do_cmd_debug(void)
                do_cmd_rerate(TRUE);
                break;
 
-#ifdef MONSTER_HORDES
        case 'H':
                do_cmd_summon_horde();
                break;
-#endif /* MONSTER_HORDES */
 
        /* Identify */
        case 'i':