]> git.pond.sub.org Git - empserver/commitdiff
Simplify draw_map()
authorMarkus Armbruster <armbru@pond.sub.org>
Tue, 19 Aug 2008 00:47:58 +0000 (20:47 -0400)
committerMarkus Armbruster <armbru@pond.sub.org>
Wed, 20 Aug 2008 11:40:51 +0000 (07:40 -0400)
No functional change.

src/lib/subs/maps.c

index 50964262e161e5bc14ee224ac979240dcfdceb5e..c9c2e8c163a2825c3a5d02fecc34736ddb0e8388 100644 (file)
@@ -240,14 +240,12 @@ draw_map(int bmap, char origin, int map_flags, struct nstr_sect *nsp)
     i = 0;
     while (ef_mappable[i] != EF_BAD) {
        if (map_flags & ef_unit_map[i]) {
-           snxtitem_all(&ni, ef_mappable[i]);
+           snxtitem_area(&ni, ef_mappable[i], &nsp->range);
            while (nxtitem(&ni, &unit)) {
                if (unit.gen.own == 0)
                    continue;
                if (unit.gen.own != player->cnum && !player->god)
                    continue;
-               if (!xyinrange(unit.gen.x, unit.gen.y, &nsp->range))
-                   continue;
 
                x = deltx(&nsp->range, unit.gen.x);
                y = delty(&nsp->range, unit.gen.y);