Use XYOFFSET() instead of sctoff() in sector iterators

Old code didn't check value of sctoff() for success.  But it can't
fail, because we already took care of the condition that can make it
fail.  Moreover, the arguments are already normalized.  Therefore, we
can just call XYOFFSET().

diff --git a/src/lib/subs/maps.c b/src/lib/subs/maps.c
index 6d5957e748465e7b00b0ed461a4a57ab4c5c2528..5e2a6a476c09835a5953073166a6421bb2a84449 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 = sctoff(np->x, np->y);
+       np->id = XYOFFSET(np->x, np->y);
        return 1;
     }
     /*NOTREACHED*/

diff --git a/src/lib/subs/nxtsct.c b/src/lib/subs/nxtsct.c
index 6ad13e6c949d26b13150bbeb18fd0388aba4fa31..bbce16279d211d7583e4dedad880a04b809d317c 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 = sctoff(np->x, np->y);
+       np->id = XYOFFSET(np->x, np->y);
        if (!np->read(EF_SECTOR, np->id, sp))
            continue;
        if (np->ncond == 0)