Use nstr_sect member id instead of recomputing it

bmnxtsct() sets it.  The old code recomputed it with sctoff() without
checking for failure.  Not a bug, because it can't actually fail, just
confusing.

diff --git a/src/lib/subs/maps.c b/src/lib/subs/maps.c
index 5e2a6a476c09835a5953073166a6421bb2a84449..06fa2abb84417fb928c04710cef57217835329ee 100644 (file)
--- a/src/lib/subs/maps.c
+++ b/src/lib/subs/maps.c
@@ -177,21 +177,21 @@ draw_map(int bmap, char origin, int map_flags, struct nstr_sect *nsp)
            /* fall through */
        case 'b':
            while (bmnxtsct(nsp) && !player->aborted) {
-               if (0 != (c = player->bmap[sctoff(nsp->x, nsp->y)]))
+               if (0 != (c = player->bmap[nsp->id]))
                    wmap[nsp->dy][nsp->dx] = c;
            }
            break;
        case 't':
            while (bmnxtsct(nsp) && !player->aborted) {
-               if (0 != (c = player->map[sctoff(nsp->x, nsp->y)]))
+               if (0 != (c = player->map[nsp->id]))
                    wmap[nsp->dy][nsp->dx] = c;
            }
            break;
        case 'r':
            while (bmnxtsct(nsp) && !player->aborted) {
-               player->bmap[sctoff(nsp->x, nsp->y)] =
-                   player->map[sctoff(nsp->x, nsp->y)];
-               if (0 != (c = player->bmap[sctoff(nsp->x, nsp->y)]))
+               player->bmap[nsp->id] =
+                   player->map[nsp->id];
+               if (0 != (c = player->bmap[nsp->id]))
                    wmap[nsp->dy][nsp->dx] = c;
            }
            ef_write(EF_BMAP, player->cnum, player->bmap);