From: Pasi Kallinen <paxed@alt.org>
Date: Wed, 13 Jan 2016 08:22:41 +0000 (+0200)
Subject: Make getpos monster/object coord picker deterministic
X-Git-Tag: NetHack-3.6.1_RC01~1029
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ef3ce49dd4a7ee07df4374bdd65f269cfa7d0024;p=nethack

Make getpos monster/object coord picker deterministic

...and make it pick coordinates top-left to bottom-right.
---

diff --git a/src/do_name.c b/src/do_name.c
index aca4df3d2..bd6d5e195 100644
--- a/src/do_name.c
+++ b/src/do_name.c
@@ -88,10 +88,13 @@ const void *b;
 
     dx = u.ux - c1->x;
     dy = u.uy - c1->y;
-    dist_1 = dx * dx + dy * dy;
+    dist_1 = max(abs(dx), abs(dy));
     dx = u.ux - c2->x;
     dy = u.uy - c2->y;
-    dist_2 = dx * dx + dy * dy;
+    dist_2 = max(abs(dx), abs(dy));
+
+    if (dist_1 == dist_2)
+        return (c1->y != c2->y) ? (c1->y - c2->y) : (c1->x - c2->x);
 
     return dist_1 - dist_2;
 }