From b912b31bf9cedd4ecd88cac942738f882b257a1f Mon Sep 17 00:00:00 2001 From: Deskull Date: Sun, 5 Nov 2017 10:45:21 +0900 Subject: [PATCH] =?utf8?q?#37287=20#37353=20(2.2.0.89)=20=E5=9E=8B?= =?utf8?q?=E3=81=AE=E7=BD=AE=E6=8F=9B=E3=82=92=E7=B6=99=E7=B6=9A=E4=B8=AD?= =?utf8?q?=E3=80=82sort=E3=81=AE=E3=82=A8=E3=83=B3=E3=83=90=E3=82=B0?= =?utf8?q?=E3=81=AB=E5=AF=BE=E5=BF=9C=E3=80=82=20/=20Ongoing=20type=20repl?= =?utf8?q?acement.=20Fix=20new=20bugs=20of=20sorting.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/xtra2.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/src/xtra2.c b/src/xtra2.c index 2b99d52e4..0b4b85e63 100644 --- a/src/xtra2.c +++ b/src/xtra2.c @@ -2598,10 +2598,10 @@ bool target_okay(void) */ static bool ang_sort_comp_distance(vptr u, vptr v, int a, int b) { - byte *x = (byte*)(u); - byte *y = (byte*)(v); + POSITION *x = (POSITION*)(u); + POSITION *y = (POSITION*)(v); - int da, db, kx, ky; + POSITION da, db, kx, ky; /* Absolute distance components */ kx = x[a]; kx -= p_ptr->x; kx = ABS(kx); @@ -2630,8 +2630,8 @@ static bool ang_sort_comp_distance(vptr u, vptr v, int a, int b) */ static bool ang_sort_comp_importance(vptr u, vptr v, int a, int b) { - byte *x = (byte*)(u); - byte *y = (byte*)(v); + POSITION *x = (POSITION*)(u); + POSITION *y = (POSITION*)(v); cave_type *ca_ptr = &cave[y[a]][x[a]]; cave_type *cb_ptr = &cave[y[b]][x[b]]; monster_type *ma_ptr = &m_list[ca_ptr->m_idx]; @@ -2699,10 +2699,10 @@ static bool ang_sort_comp_importance(vptr u, vptr v, int a, int b) */ static void ang_sort_swap_distance(vptr u, vptr v, int a, int b) { - byte *x = (byte*)(u); - byte *y = (byte*)(v); + POSITION *x = (POSITION*)(u); + POSITION *y = (POSITION*)(v); - byte temp; + POSITION temp; /* Swap "x" */ temp = x[a]; @@ -3587,13 +3587,9 @@ bool target_set(int mode) POSITION x = p_ptr->x; bool done = FALSE; - bool flag = TRUE; - char query; - char info[80]; - char same_key; cave_type *c_ptr; -- 2.11.0