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))
{
void ang_sort_swap_hook(vptr u, vptr v, int a, int b)
{
u16b *who = (u16b*)(u);
-
u16b holder;
/* Unused */
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名前): ",
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))
{
return;\r
}\r
\r
- if (p_ptr->inside_arena)\r
- {\r
- msg_print(_("アリーナが魔法を吸収した!", "The arena absorbs all attempted magic!"));\r
- msg_print(NULL);\r
- return;\r
- }\r
+ if (cmd_limit_arena(p_ptr)) return;\r
\r
if (p_ptr->special_defense & (KATA_MUSOU | KATA_KOUKIJIN))\r
{\r
return;\r
}\r
\r
- if (p_ptr->inside_arena)\r
- {\r
- msg_print(_("アリーナが魔法を吸収した!", "The arena absorbs all attempted magic!"));\r
- msg_print(NULL);\r
- return;\r
- }\r
+ if (cmd_limit_arena(p_ptr)) return;\r
\r
if (p_ptr->special_defense & (KATA_MUSOU | KATA_KOUKIJIN))\r
{\r
return;\r
}\r
\r
- if (p_ptr->inside_arena)\r
- {\r
- msg_print(_("アリーナが魔法を吸収した!", "The arena absorbs all attempted magic!"));\r
- msg_print(NULL);\r
- return;\r
- }\r
+ if (cmd_limit_arena(p_ptr)) return;\r
\r
if (p_ptr->special_defense & (KATA_MUSOU | KATA_KOUKIJIN))\r
{\r
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))
{
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;
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 なし
#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);