#include "object-hook.h"\r
#include "spells-summon.h"\r
#include "artifact.h"\r
+#include "avatar.h"\r
+#include "player-status.h"\r
+#include "spells-status.h"\r
+#include "rumor.h"\r
+#include "realm-hex.h"\r
\r
/*!\r
* @brief 巻物を読むコマンドのサブルーチン\r
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
case SV_SCROLL_CURSE_WEAPON:\r
{\r
k = 0;\r
- if (buki_motteruka(INVEN_RARM))\r
+ if (has_melee_weapon(INVEN_RARM))\r
{\r
k = INVEN_RARM;\r
- if (buki_motteruka(INVEN_LARM) && one_in_(2)) k = INVEN_LARM;\r
+ if (has_melee_weapon(INVEN_LARM) && one_in_(2)) k = INVEN_LARM;\r
}\r
- else if (buki_motteruka(INVEN_LARM)) k = INVEN_LARM;\r
+ else if (has_melee_weapon(INVEN_LARM)) k = INVEN_LARM;\r
if (k && curse_weapon(FALSE, k)) ident = TRUE;\r
break;\r
}\r
used_up=FALSE;\r
}\r
\r
-\r
- /* Combine / Reorder the pack (later) */\r
p_ptr->update |= (PU_COMBINE | PU_REORDER);\r
\r
if (!(object_is_aware(o_ptr)))\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
msg_print(_("明かりがないので、暗くて読めない。", "You have no light to read by."));\r
return;\r
}\r
- if (p_ptr->confused)\r
- {\r
- msg_print(_("混乱していて読めない。", "You are too confused!"));\r
- return;\r
- }\r
-\r
+ if (cmd_limit_confused(p_ptr)) return;\r
\r
/* Restrict choices to scrolls */\r
item_tester_hook = item_tester_hook_readable;\r