[Refactor] #38852 一部 do_cmd_*() をリファクタリング。 / Refactor do_cmd_*() partly.

diff --git a/src/cmd2.c b/src/cmd2.c
index 029deb4..eda14bb 100644 (file)
--- a/src/cmd2.c
+++ b/src/cmd2.c
@@ -738,6 +738,8 @@ void do_cmd_open(void)
 
        bool more = FALSE;
 
+       if (p_ptr->wild_mode) return;
+
        if (p_ptr->special_defense & KATA_MUSOU)
        {
                set_action(ACTION_NONE);
@@ -894,6 +896,8 @@ void do_cmd_close(void)
 
        bool more = FALSE;
 
+       if (p_ptr->wild_mode) return;
+
        if (p_ptr->special_defense & KATA_MUSOU)
        {
                set_action(ACTION_NONE);
@@ -1475,12 +1479,13 @@ void do_cmd_disarm(void)
 
        bool more = FALSE;
 
+       if (p_ptr->wild_mode) return;
+
        if (p_ptr->special_defense & KATA_MUSOU)
        {
                set_action(ACTION_NONE);
        }
 
-
        /* Option: Pick a direction */
        if (easy_disarm)
        {
@@ -1673,12 +1678,11 @@ static bool do_cmd_bash_aux(POSITION y, POSITION x, DIRECTION dir)
  */
 void do_cmd_bash(void)
 {
-       int                     y, x, dir;
-
+       int     y, x, dir;
        cave_type       *c_ptr;
-
        bool            more = FALSE;
 
+       if (p_ptr->wild_mode) return;
 
        if (p_ptr->special_defense & KATA_MUSOU)
        {
@@ -1894,13 +1898,15 @@ void do_cmd_spike(void)
 {
        DIRECTION dir;
 
+       if (p_ptr->wild_mode) return;
+
        if (p_ptr->special_defense & KATA_MUSOU)
        {
                set_action(ACTION_NONE);
        }
 
        /* Get a "repeated" direction */
-       if (get_rep_dir(&dir,FALSE))
+       if (get_rep_dir(&dir, FALSE))
        {
                POSITION y, x;
                INVENTORY_IDX item;

diff --git a/src/dungeon.c b/src/dungeon.c
index 3aa4148..ef592fb 100644 (file)
--- a/src/dungeon.c
+++ b/src/dungeon.c
@@ -4121,35 +4121,35 @@ static void process_command(void)
                /* Open a door or chest */
                case 'o':
                {
-                       if (!p_ptr->wild_mode) do_cmd_open();
+                       do_cmd_open();
                        break;
                }
 
                /* Close a door */
                case 'c':
                {
-                       if (!p_ptr->wild_mode) do_cmd_close();
+                       do_cmd_close();
                        break;
                }
 
                /* Jam a door with spikes */
                case 'j':
                {
-                       if (!p_ptr->wild_mode) do_cmd_spike();
+                       do_cmd_spike();
                        break;
                }
 
                /* Bash a door */
                case 'B':
                {
-                       if (!p_ptr->wild_mode) do_cmd_bash();
+                       do_cmd_bash();
                        break;
                }
 
                /* Disarm a trap or chest */
                case 'D':
                {
-                       if (!p_ptr->wild_mode) do_cmd_disarm();
+                       do_cmd_disarm();
                        break;
                }
 
@@ -4326,13 +4326,13 @@ static void process_command(void)
                {
                        if (!p_ptr->wild_mode)
                        {
-                       if (!p_ptr->inside_arena)
-                               do_cmd_aim_wand();
-                       else
-                       {
-                               msg_print(_("アリーナが魔法を吸収した！", "The arena absorbs all attempted magic!"));
-                               msg_print(NULL);
-                       }
+                               if (!p_ptr->inside_arena)
+                                       do_cmd_aim_wand();
+                               else
+                               {
+                                       msg_print(_("アリーナが魔法を吸収した！", "The arena absorbs all attempted magic!"));
+                                       msg_print(NULL);
+                               }
                        }
                        break;
                }