[Refactor] #37353 時間停止時のコマンド制限処理を cmd_limit_time_walk() に統合。 / Integrate command...

diff --git a/src/cmd-activate.c b/src/cmd-activate.c
index 0dc1c83..6ae04fc 100644 (file)
--- a/src/cmd-activate.c
+++ b/src/cmd-activate.c
@@ -119,13 +119,7 @@ void do_cmd_activate_aux(INVENTORY_IDX item)
        if (fail < USE_DEVICE) fail = USE_DEVICE;
        if (chance < USE_DEVICE) chance = USE_DEVICE;
 
-       if (world_player)
-       {
-               if (flush_failure) flush();
-               msg_print(_("止まった時の中ではうまく働かないようだ。", "It shows no reaction."));
-               sound(SOUND_FAIL);
-               return;
-       }
+       if(cmd_limit_time_walk(p_ptr)) return;
 
        if (p_ptr->pclass == CLASS_BERSERKER) success = FALSE;
        else if (chance > fail)

diff --git a/src/cmd-read.c b/src/cmd-read.c
index d789a1b..87dfce4 100644 (file)
--- a/src/cmd-read.c
+++ b/src/cmd-read.c
@@ -47,16 +47,8 @@ void do_cmd_read_scroll_aux(INVENTORY_IDX item, bool known)
                o_ptr = &o_list[0 - item];\r
        }\r
 \r
-\r
        p_ptr->energy_use = 100;\r
-\r
-       if (world_player)\r
-       {\r
-               if (flush_failure) flush();\r
-               msg_print(_("止まった時の中ではうまく働かないようだ。", "Nothing happen."));\r
-               sound(SOUND_FAIL);\r
-               return;\r
-       }\r
+       if (cmd_limit_time_walk(p_ptr)) return;\r
 \r
        if (p_ptr->pclass == CLASS_BERSERKER)\r
        {\r

diff --git a/src/cmd-usestaff.c b/src/cmd-usestaff.c
index 0ed28b4..0746f5a 100644 (file)
--- a/src/cmd-usestaff.c
+++ b/src/cmd-usestaff.c
@@ -319,13 +319,7 @@ void do_cmd_use_staff_aux(INVENTORY_IDX item)
                chance = USE_DEVICE;\r
        }\r
 \r
-       if (world_player)\r
-       {\r
-               if (flush_failure) flush();\r
-               msg_print(_("止まった時の中ではうまく働かないようだ。", "Nothing happen. Maybe this staff is freezing too."));\r
-               sound(SOUND_FAIL);\r
-               return;\r
-       }\r
+       if (cmd_limit_time_walk(p_ptr)) return;\r
 \r
        /* Roll for usage */\r
        if ((chance < USE_DEVICE) || (randint1(chance) < USE_DEVICE) || (p_ptr->pclass == CLASS_BERSERKER))\r

diff --git a/src/cmd-zaprod.c b/src/cmd-zaprod.c
index f6d2cfa..c04f948 100644 (file)
--- a/src/cmd-zaprod.c
+++ b/src/cmd-zaprod.c
@@ -314,13 +314,7 @@ void do_cmd_zap_rod_aux(INVENTORY_IDX item)
        if (fail < USE_DEVICE) fail = USE_DEVICE;
        if (chance < USE_DEVICE) chance = USE_DEVICE;
 
-       if (world_player)
-       {
-               if (flush_failure) flush();
-               msg_print(_("止まった時の中ではうまく働かないようだ。", "Nothing happen. Maybe this rod is freezing too."));
-               sound(SOUND_FAIL);
-               return;
-       }
+       if (cmd_limit_time_walk(p_ptr)) return;
 
        if (p_ptr->pclass == CLASS_BERSERKER) success = FALSE;
        else if (chance > fail)

diff --git a/src/cmd-zapwand.c b/src/cmd-zapwand.c
index 192a139..f87cc17 100644 (file)
--- a/src/cmd-zapwand.c
+++ b/src/cmd-zapwand.c
@@ -375,13 +375,7 @@ void do_cmd_aim_wand_aux(INVENTORY_IDX item)
                chance = USE_DEVICE;
        }
 
-       if (world_player)
-       {
-               if (flush_failure) flush();
-               msg_print(_("止まった時の中ではうまく働かないようだ。", "Nothing happen. Maybe this wand is freezing too."));
-               sound(SOUND_FAIL);
-               return;
-       }
+       if (cmd_limit_time_walk(p_ptr)) return;
 
        /* Roll for usage */
        if ((chance < USE_DEVICE) || (randint1(chance) < USE_DEVICE) || (p_ptr->pclass == CLASS_BERSERKER))

diff --git a/src/cmd2.c b/src/cmd2.c
index b033ff4..8a193f0 100644 (file)
--- a/src/cmd2.c
+++ b/src/cmd2.c
@@ -64,6 +64,18 @@ bool cmd_limit_arena(player_type *creature_ptr)
        return FALSE;
 }
 
+bool cmd_limit_time_walk(player_type *creature_ptr)
+{
+       if (world_player)
+       {
+               if (flush_failure) flush();
+               msg_print(_("止まった時の中ではうまく働かないようだ。", "It shows no reaction."));
+               sound(SOUND_FAIL);
+               return TRUE;
+       }
+       return FALSE;
+}
+
 /*!
  * @brief 階段を使って階層を昇る処理 / Go up one level
  * @return なし

diff --git a/src/externs.h b/src/externs.h
index cad74e5..bceae5f 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -543,6 +543,7 @@ extern void travel_step(void);
 
 /* cmd2.c */
 extern bool cmd_limit_arena(player_type *creature_ptr);
+extern bool cmd_limit_time_walk(player_type *creature_ptr);
 extern void forget_travel_flow(void);
 extern bool confirm_leave_level(bool down_stair);
 extern void do_cmd_go_up(void);

diff --git a/src/mane.c b/src/mane.c
index 86ad761..4bfe464 100644 (file)
--- a/src/mane.c
+++ b/src/mane.c
@@ -672,11 +672,9 @@ static bool use_mane(int spell)
                msg_print(NULL);
 
                /* Hack */
-               p_ptr->energy_need -= 1000 + (100 + randint1(200)+200)*TURNS_PER_TICK/10;
-
+               p_ptr->energy_need -= 1000 + (100 + randint1(200) + 200) * TURNS_PER_TICK / 10;
                p_ptr->redraw |= (PR_MAP);
                p_ptr->update |= (PU_MONSTERS);
-
                p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON);
 
                handle_stuff();