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().

diff --git a/src/lib/subs/maps.c b/src/lib/subs/maps.c
index 06fa2abb84417fb928c04710cef57217835329ee..4e5881289425e87e264671c980e60e6a6061c99b 100644 (file)
--- 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 bbce16279d211d7583e4dedad880a04b809d317c..6ad13e6c949d26b13150bbeb18fd0388aba4fa31 100644 (file)
--- 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)