\r
#include "angband.h"\r
#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
+#include "spells-object.h"\r
+#include "spells-summon.h"\r
+#include "spells-status.h"\r
+\r
/*!\r
* @brief 巻物を読むコマンドのサブルーチン\r
* Read a scroll (from the pack or floor).\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
+ take_turn(p_ptr, 100);;\r
+ if (cmd_limit_time_walk(p_ptr)) return;\r
\r
if (p_ptr->pclass == CLASS_BERSERKER)\r
{\r
set_action(ACTION_NONE);\r
}\r
\r
- /* Check some conditions */\r
- if (p_ptr->blind)\r
- {\r
- msg_print(_("目が見えない。", "You can't see anything."));\r
- return;\r
- }\r
- if (no_lite())\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_blind(p_ptr)) return;\r
+ if (cmd_limit_confused(p_ptr)) return;\r
\r
/* Restrict choices to scrolls */\r
item_tester_hook = item_tester_hook_readable;\r