From 2f5cad1997f58302ff9d1292b289e0651e9ad352 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Fri, 28 Mar 2008 07:17:17 +0100 Subject: [PATCH] Revert "Use XYOFFSET() instead of sctoff() in sector iterators" This reverts commit d2ca7d4ed2c9ab03ba20a18fa53613d7baaa9026. Turns out the arguments are not always normalized, e.g. after snxtitem_all(). --- src/lib/subs/maps.c | 2 +- src/lib/subs/nxtsct.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/subs/maps.c b/src/lib/subs/maps.c index 06fa2abb8..4e5881289 100644 --- a/src/lib/subs/maps.c +++ b/src/lib/subs/maps.c @@ -319,7 +319,7 @@ bmnxtsct(struct nstr_sect *np) if (np->curdist > np->dist) continue; } - np->id = XYOFFSET(np->x, np->y); + np->id = sctoff(np->x, np->y); return 1; } /*NOTREACHED*/ diff --git a/src/lib/subs/nxtsct.c b/src/lib/subs/nxtsct.c index bbce16279..6ad13e6c9 100644 --- a/src/lib/subs/nxtsct.c +++ b/src/lib/subs/nxtsct.c @@ -67,7 +67,7 @@ nxtsct(struct nstr_sect *np, struct sctstr *sp) if (np->curdist > np->dist) continue; } - np->id = XYOFFSET(np->x, np->y); + np->id = sctoff(np->x, np->y); if (!np->read(EF_SECTOR, np->id, sp)) continue; if (np->ncond == 0) -- 2.43.0