X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=src%2Fcmd%2Fcmd-activate.c;h=64dbce2b2b0a530e2daf1aa7ad25badbec4114e9;hb=c782a336ea86cd5d5c7f57943771559a7e361777;hp=dc5443a78e1d8fa3ee257636af1c2c4d59d6a91a;hpb=363bbd1cb7f04ce841316881462ef533f618c6c0;p=hengband%2Fhengband.git diff --git a/src/cmd/cmd-activate.c b/src/cmd/cmd-activate.c index dc5443a78..64dbce2b2 100644 --- a/src/cmd/cmd-activate.c +++ b/src/cmd/cmd-activate.c @@ -344,7 +344,7 @@ const activation_type activation_info[] = *
* Currently, only (some) artifacts, and Dragon Scale Mail, can be activated. * But one could, for example, easily make an activatable "Ring of Plasma". - * Note that it always takes a current_world_ptr->game_turn to activate an artifact, even if + * Note that it always takes a turn to activate an artifact, even if * the user hits "escape" at the "direction" prompt. **/ @@ -1010,7 +1010,7 @@ bool activate_artifact(player_type *user_ptr, object_type *o_ptr) { scatter(&y, &x, user_ptr->y, user_ptr->x, 4, 0); if (!cave_have_flag_bold(y, x, FF_PROJECT)) continue; - if (!player_bold(y, x)) break; + if (!player_bold(user_ptr, y, x)) break; } project(0, 3, y, x, 150, GF_ELEC, @@ -1479,7 +1479,7 @@ bool activate_artifact(player_type *user_ptr, object_type *o_ptr) case ACT_RUNE_EXPLO: { msg_print(_("æãã赤è²ã«è¼ãã¦ãã...", "It glows bright red...")); - explosive_rune(); + explosive_rune(user_ptr->current_floor_ptr, user_ptr->y, user_ptr->x); break; } @@ -1626,7 +1626,7 @@ bool activate_artifact(player_type *user_ptr, object_type *o_ptr) case ACT_DISP_CURSE_XTRA: { msg_format(_("%sãçå®ãç §ããåºã...", "The %s exhibits the truth..."), name); - (void)remove_all_curse(); + (void)remove_all_curse(user_ptr); (void)probing(); break; } @@ -1710,7 +1710,7 @@ bool activate_artifact(player_type *user_ptr, object_type *o_ptr) case ACT_TELEPORT_LEVEL: { if (!get_check(_("æ¬å½ã«ä»ã®éã«ãã¬ãã¼ããã¾ããï¼", "Are you sure? (Teleport Level)"))) return FALSE; - teleport_level(0); + teleport_level(user_ptr, 0); break; } @@ -1729,7 +1729,7 @@ bool activate_artifact(player_type *user_ptr, object_type *o_ptr) break; case ACT_INROU: - mitokohmon(); + mitokohmon(user_ptr); break; case ACT_MURAMASA: