Move map flags from map.h to maps.c, and reorder

Not useful elsewhere.  Since I'm touching them anyway, put them in the
usual ship, plane, land, nuke order.

diff --git a/include/map.h b/include/map.h
index c1cc560bb09c6423b3e7b6f86a3e02129c9849c0..5497923a9f87e262b1498b518cecd021c9bdabf1 100644 (file)
--- 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 52dcd5810f60a79e653f6b52bd18f965a229a0a9..0c03b7eee46252ab0a222ce8f6c7ac4107262152 100644 (file)
--- 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);