Most of the English spell descriptions use a third person singular verb with an impli...

[hengband/hengband.git] / src / realm-hissatsu.c

diff --git a/src/realm-hissatsu.c b/src/realm-hissatsu.c
index b6989f9..cd8e90a 100644 (file)
--- a/src/realm-hissatsu.c
+++ b/src/realm-hissatsu.c
@@ -210,13 +210,13 @@ concptr do_hissatsu_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mo
 
                        py_attack(caster_ptr, y, x, 0);
 
-                       if (!player_can_enter(caster_ptr, caster_ptr->current_floor_ptr->grid_array[y][x].feat, 0) || is_trap(caster_ptr->current_floor_ptr->grid_array[y][x].feat))
+                       if (!player_can_enter(caster_ptr, caster_ptr->current_floor_ptr->grid_array[y][x].feat, 0) || is_trap(caster_ptr, caster_ptr->current_floor_ptr->grid_array[y][x].feat))
                                break;
 
                        y += ddy[dir];
                        x += ddx[dir];
 
-                       if (player_can_enter(caster_ptr, caster_ptr->current_floor_ptr->grid_array[y][x].feat, 0) && !is_trap(caster_ptr->current_floor_ptr->grid_array[y][x].feat) && !caster_ptr->current_floor_ptr->grid_array[y][x].m_idx)
+                       if (player_can_enter(caster_ptr, caster_ptr->current_floor_ptr->grid_array[y][x].feat, 0) && !is_trap(caster_ptr, caster_ptr->current_floor_ptr->grid_array[y][x].feat) && !caster_ptr->current_floor_ptr->grid_array[y][x].m_idx)
                        {
                                msg_print(NULL);
                                (void)move_player_effect(caster_ptr, y, x, MPE_FORGET_FLOW | MPE_HANDLE_STUFF | MPE_DONT_PICKUP);
@@ -275,7 +275,7 @@ concptr do_hissatsu_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mo
 
        case 10:
                if (name) return _("裂風剣", "Wind Blast");
-               if (desc) return _("攻撃した相手を後方へ吹き飛ばす。", "Attacks an adjacent monster, and blow it away.");
+               if (desc) return _("攻撃した相手を後方へ吹き飛ばす。", "Attacks an adjacent monster, and blows it away.");
 
                if (cast)
                {
@@ -313,7 +313,7 @@ concptr do_hissatsu_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mo
                                {
                                        y += ddy[dir];
                                        x += ddx[dir];
-                                       if (cave_empty_bold(caster_ptr->current_floor_ptr, y, x))
+                                       if (is_cave_empty_bold(caster_ptr, y, x))
                                        {
                                                ty = y;
                                                tx = x;
@@ -359,7 +359,7 @@ concptr do_hissatsu_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mo
 
        case 12:
                if (name) return _("破岩斬", "Rock Smash");
-               if (desc) return _("岩を壊し、岩石系のモンスターに大ダメージを与える。", "Breaks rock. Or greatly damage a monster made by rocks.");
+               if (desc) return _("岩を壊し、岩石系のモンスターに大ダメージを与える。", "Breaks rock. Or greatly damages a monster made by rocks.");
 
                if (cast)
                {
@@ -678,7 +678,7 @@ concptr do_hissatsu_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mo
                                m_ptr = &caster_ptr->current_floor_ptr->m_list[m_idx];
 
                                /* Monster cannot move back? */
-                               if (!monster_can_enter(ny, nx, &r_info[m_ptr->r_idx], 0))
+                               if (!monster_can_enter(caster_ptr, ny, nx, &r_info[m_ptr->r_idx], 0))
                                {
                                        /* -more- */
                                        if (i < 2) msg_print(NULL);
@@ -866,7 +866,7 @@ concptr do_hissatsu_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mo
 
                        if (d_info[caster_ptr->dungeon_idx].flags1 & DF1_NO_MELEE)
                        {
-                               msg_print(_("なぜか攻撃することができない。", "Something prevent you from attacking."));
+                               msg_print(_("なぜか攻撃することができない。", "Something prevents you from attacking."));
                                return "";
                        }
                        msg_print(_("武器を大きく振り下ろした。", "You swing your weapon downward."));