From bf9389a7a96123c6e52938fce798d912e618cb09 Mon Sep 17 00:00:00 2001
From: Markus Armbruster <armbru@pond.sub.org>
Date: Sun, 17 Aug 2008 07:51:23 -0400
Subject: [PATCH] Clean up and simplify snxtitem_dist() and snxtsct_dist()

No functional change.
---
 src/lib/subs/snxtitem.c | 10 +---------
 src/lib/subs/snxtsct.c  |  5 -----
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/src/lib/subs/snxtitem.c b/src/lib/subs/snxtitem.c
index c5bea17e..28aa2abf 100644
--- a/src/lib/subs/snxtitem.c
+++ b/src/lib/subs/snxtitem.c
@@ -152,25 +152,17 @@ void
 snxtitem_dist(struct nstr_item *np, int type, int cx, int cy,
 	      int dist)
 {
-    struct range range;
-
     memset(np, 0, sizeof(*np));
-    xydist_range(cx, cy, dist, &range);
+    xydist_range(cx, cy, dist, &np->range);
     np->cur = -1;
     np->type = type;
     np->sel = NS_DIST;
     np->cx = cx;
     np->cy = cy;
     np->index = -1;
-    np->range = range;
     np->dist = dist;
     np->read = ef_read;
     np->flags = ef_flags(type);
-#if 0
-    /* This is no longer proper. */
-    /* It did the wrong thing for small, hitech worlds. */
-    xysize_range(&np->range);
-#endif
 }
 
 void
diff --git a/src/lib/subs/snxtsct.c b/src/lib/subs/snxtsct.c
index 65aef15a..97992f70 100644
--- a/src/lib/subs/snxtsct.c
+++ b/src/lib/subs/snxtsct.c
@@ -152,11 +152,6 @@ snxtsct_dist(struct nstr_sect *np, coord cx, coord cy, int dist)
     np->y = np->range.ly;
     np->dx = -1;
     np->dy = 0;
-#if 0
-    /* This function is now done elsewhere. */
-    /* It was not doing the right thing when the world was small */
-    xysize_range(&np->range);
-#endif
 }
 
 void