From 7bdabc50285d97192a7cd286ebf825c2329b9235 Mon Sep 17 00:00:00 2001 From: Deskull Date: Wed, 30 Jan 2019 00:58:35 +0900 Subject: [PATCH] =?utf8?q?[Refactor]=20#37353=20=E3=82=A2=E3=83=AA?= =?utf8?q?=E3=83=BC=E3=83=8A=E3=81=AE=E3=82=B3=E3=83=9E=E3=83=B3=E3=83=89?= =?utf8?q?=E5=88=B6=E9=99=90=E5=87=A6=E7=90=86=E3=82=92=20cmd=5Flimit=5Far?= =?utf8?q?ena()=20=E3=81=AB=E7=B5=B1=E5=90=88=E3=80=82=20/=20Integrate=20c?= =?utf8?q?ommand=20limitation=20of=20arena=20to=20cmd=5Flimit=5Farena().?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/cmd-activate.c | 8 +------- src/cmd-item.c | 28 +++++++++++----------------- src/cmd-quaff.c | 7 +------ src/cmd-read.c | 7 +------ src/cmd-usestaff.c | 7 +------ src/cmd-zaprod.c | 7 +------ src/cmd-zapwand.c | 8 +------- src/cmd2.c | 11 +++++++++++ src/externs.h | 1 + 9 files changed, 29 insertions(+), 55 deletions(-) diff --git a/src/cmd-activate.c b/src/cmd-activate.c index ede4f1644..0dc1c8380 100644 --- a/src/cmd-activate.c +++ b/src/cmd-activate.c @@ -373,13 +373,7 @@ void do_cmd_activate(void) concptr q, s; if (p_ptr->wild_mode) return; - - if (p_ptr->inside_arena) - { - msg_print(_("アリーナが魔法を吸収した！", "The arena absorbs all attempted magic!")); - msg_print(NULL); - return; - } + if (cmd_limit_arena(p_ptr)) return; if (p_ptr->special_defense & (KATA_MUSOU | KATA_KOUKIJIN)) { diff --git a/src/cmd-item.c b/src/cmd-item.c index ae3e71f1b..82f052106 100644 --- a/src/cmd-item.c +++ b/src/cmd-item.c @@ -1367,7 +1367,6 @@ bool ang_sort_comp_hook(vptr u, vptr v, int a, int b) void ang_sort_swap_hook(vptr u, vptr v, int a, int b) { u16b *who = (u16b*)(u); - u16b holder; /* Unused */ @@ -1402,19 +1401,19 @@ void do_cmd_query_symbol(void) IDX i; int n; MONRACE_IDX r_idx; - char sym, query; - char buf[128]; + char sym, query; + char buf[128]; - bool all = FALSE; - bool uniq = FALSE; - bool norm = FALSE; - bool ride = FALSE; - char temp[80] = ""; + bool all = FALSE; + bool uniq = FALSE; + bool norm = FALSE; + bool ride = FALSE; + char temp[80] = ""; - bool recall = FALSE; + bool recall = FALSE; - u16b why = 0; - IDX *who; + u16b why = 0; + MONRACE_IDX *who; /* Get a character, or abort */ if (!get_com(_("知りたい文字を入力して下さい(記号 or ^A全,^Uユ,^N非ユ,^R乗馬,^M名前): ", @@ -1671,12 +1670,7 @@ void do_cmd_use(void) return; } - if (p_ptr->inside_arena) - { - msg_print(_("アリーナが魔法を吸収した！", "The arena absorbs all attempted magic!")); - msg_print(NULL); - return; - } + if (cmd_limit_arena(p_ptr)) return; if (p_ptr->special_defense & (KATA_MUSOU | KATA_KOUKIJIN)) { diff --git a/src/cmd-quaff.c b/src/cmd-quaff.c index 8eabd9f5f..238da993a 100644 --- a/src/cmd-quaff.c +++ b/src/cmd-quaff.c @@ -591,12 +591,7 @@ void do_cmd_quaff_potion(void) return; } - if (p_ptr->inside_arena) - { - msg_print(_("アリーナが魔法を吸収した！", "The arena absorbs all attempted magic!")); - msg_print(NULL); - return; - } + if (cmd_limit_arena(p_ptr)) return; if (p_ptr->special_defense & (KATA_MUSOU | KATA_KOUKIJIN)) { diff --git a/src/cmd-read.c b/src/cmd-read.c index 2c30663c3..d789a1ba8 100644 --- a/src/cmd-read.c +++ b/src/cmd-read.c @@ -621,12 +621,7 @@ void do_cmd_read_scroll(void) return; } - if (p_ptr->inside_arena) - { - msg_print(_("アリーナが魔法を吸収した！", "The arena absorbs all attempted magic!")); - msg_print(NULL); - return; - } + if (cmd_limit_arena(p_ptr)) return; if (p_ptr->special_defense & (KATA_MUSOU | KATA_KOUKIJIN)) { diff --git a/src/cmd-usestaff.c b/src/cmd-usestaff.c index 68a0ea07d..0ed28b4fb 100644 --- a/src/cmd-usestaff.c +++ b/src/cmd-usestaff.c @@ -432,12 +432,7 @@ void do_cmd_use_staff(void) return; } - if (p_ptr->inside_arena) - { - msg_print(_("アリーナが魔法を吸収した！", "The arena absorbs all attempted magic!")); - msg_print(NULL); - return; - } + if (cmd_limit_arena(p_ptr)) return; if (p_ptr->special_defense & (KATA_MUSOU | KATA_KOUKIJIN)) { diff --git a/src/cmd-zaprod.c b/src/cmd-zaprod.c index dd1272734..f6d2cfa8d 100644 --- a/src/cmd-zaprod.c +++ b/src/cmd-zaprod.c @@ -402,12 +402,7 @@ void do_cmd_zap_rod(void) return; } - if (p_ptr->inside_arena) - { - msg_print(_("アリーナが魔法を吸収した！", "The arena absorbs all attempted magic!")); - msg_print(NULL); - return; - } + if (cmd_limit_arena(p_ptr)) return; if (p_ptr->special_defense & (KATA_MUSOU | KATA_KOUKIJIN)) { diff --git a/src/cmd-zapwand.c b/src/cmd-zapwand.c index 844ae977f..192a13987 100644 --- a/src/cmd-zapwand.c +++ b/src/cmd-zapwand.c @@ -455,13 +455,7 @@ void do_cmd_aim_wand(void) concptr q, s; if (p_ptr->wild_mode) return; - - if (p_ptr->inside_arena) - { - msg_print(_("アリーナが魔法を吸収した！", "The arena absorbs all attempted magic!")); - msg_print(NULL); - return; - } + if (cmd_limit_arena(p_ptr)) return; /* Restrict choices to wands */ item_tester_tval = TV_WAND; diff --git a/src/cmd2.c b/src/cmd2.c index 4157c7a12..b033ff487 100644 --- a/src/cmd2.c +++ b/src/cmd2.c @@ -53,6 +53,17 @@ bool confirm_leave_level(bool down_stair) return FALSE; } +bool cmd_limit_arena(player_type *creature_ptr) +{ + if (p_ptr->inside_arena) + { + msg_print(_("アリーナが魔法を吸収した！", "The arena absorbs all attempted magic!")); + msg_print(NULL); + return TRUE; + } + return FALSE; +} + /*! * @brief 階段を使って階層を昇る処理 / Go up one level * @return なし diff --git a/src/externs.h b/src/externs.h index 88693c3e4..cad74e5b8 100644 --- a/src/externs.h +++ b/src/externs.h @@ -542,6 +542,7 @@ extern void travel_step(void); #endif /* cmd2.c */ +extern bool cmd_limit_arena(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); -- 2.11.0