In English description for "Vampire's Fang" change "to" to "on" to be more idiomatic.

[hengbandforosx/hengbandosx.git] / src / xtra2.c

diff --git a/src/xtra2.c b/src/xtra2.c
index 637c8c4..33deb9f 100644 (file)
--- a/src/xtra2.c
+++ b/src/xtra2.c
@@ -402,20 +402,13 @@ static void target_set_prepare(BIT_FLAGS mode)
        /* Set the sort hooks */
        if (mode & (TARGET_KILL))
        {
-               /* Target the nearest monster for shooting */
-               ang_sort_comp = ang_sort_comp_distance;
-               ang_sort_swap = ang_sort_swap_distance;
+               ang_sort(tmp_pos.x, tmp_pos.y, tmp_pos.n, ang_sort_comp_distance, ang_sort_swap_distance);
        }
        else
        {
-               /* Look important grids first in Look command */
-               ang_sort_comp = ang_sort_comp_importance;
-               ang_sort_swap = ang_sort_swap_distance;
+               ang_sort(tmp_pos.x, tmp_pos.y, tmp_pos.n, ang_sort_comp_importance, ang_sort_swap_distance);
        }
 
-       /* Sort the positions */
-       ang_sort(tmp_pos.x, tmp_pos.y, tmp_pos.n);
-
        if (p_ptr->riding && target_pet && (tmp_pos.n > 1) && (mode & (TARGET_KILL)))
        {
                POSITION tmp;
@@ -1757,7 +1750,7 @@ bool get_direction(DIRECTION *dp, bool allow_under, bool with_steed)
                        monster_desc(m_name, m_ptr, 0);
                        if (MON_CONFUSED(m_ptr))
                        {
-                               msg_format(_("%sは混乱している。", "%^s is confusing."), m_name);
+                               msg_format(_("%sは混乱している。", "%^s is confused."), m_name);
                        }
                        else
                        {
@@ -1902,7 +1895,7 @@ bool get_rep_dir(DIRECTION *dp, bool under)
                        monster_desc(m_name, m_ptr, 0);
                        if (MON_CONFUSED(m_ptr))
                        {
-                               msg_format(_("%sは混乱している。", "%^s is confusing."), m_name);
+                               msg_format(_("%sは混乱している。", "%^s is confused."), m_name);
                        }
                        else
                        {
@@ -1983,12 +1976,8 @@ static void tgt_pt_prepare(void)
                }
        }
 
-       /* Target the nearest monster for shooting */
-       ang_sort_comp = ang_sort_comp_distance;
-       ang_sort_swap = ang_sort_swap_distance;
-
        /* Sort the positions */
-       ang_sort(tmp_pos.x, tmp_pos.y, tmp_pos.n);
+       ang_sort(tmp_pos.x, tmp_pos.y, tmp_pos.n, ang_sort_comp_distance, ang_sort_swap_distance);
 }
 
 /*