diff --git a/include/map.h b/include/map.h index c1cc560b..5497923a 100644 --- a/include/map.h +++ b/include/map.h @@ -60,11 +60,4 @@ extern void writemap(natid); extern void blankfill(char *, struct range *, int); extern void border(struct range *, char *, char *); -#define MAP_SHIP bit(0) -#define MAP_LAND bit(1) -#define MAP_PLANE bit(2) -#define MAP_NUKE bit(3) -#define MAP_HIGH bit(4) -#define MAP_ALL MAP_SHIP | MAP_LAND | MAP_PLANE | MAP_NUKE - #endif diff --git a/src/lib/subs/maps.c b/src/lib/subs/maps.c index 52dcd581..0c03b7ee 100644 --- a/src/lib/subs/maps.c +++ b/src/lib/subs/maps.c @@ -53,6 +53,16 @@ #include "ship.h" #include "xy.h" +/* Flags for draw_map() */ +/* whether to put ships, planes, land units or nukes on the map */ +#define MAP_SHIP bit(0) +#define MAP_PLANE bit(1) +#define MAP_LAND bit(2) +#define MAP_NUKE bit(3) +#define MAP_ALL (MAP_SHIP | MAP_PLANE | MAP_LAND | MAP_NUKE) +/* whether to highlight own sectors */ +#define MAP_HIGH bit(4) + static int draw_map(int, char, int, struct nstr_sect *); static int bmnxtsct(struct nstr_sect *); static char map_char(int, natid, int);