Get rid of src/lib/gen/copy.c

[empserver] / include / map.h

diff --git a/include/map.h b/include/map.h
index 386eee125a3076d70af0f7f9ef2f627909b7e331..8b3ce398f499191bc8d84b2bbaa9162eb6ef4102 100644 (file)
--- a/include/map.h
+++ b/include/map.h
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2006, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -34,23 +34,23 @@
 #ifndef MAP_H
 #define MAP_H
 
-#include "misc.h"
-#include "xy.h"
+#include "types.h"
 
-#define        MAPWIDTH(persec) ((WORLD_X/2)*(persec + 1)+1)
+#define        MAPWIDTH(persec) ((WORLD_X/2) * ((persec) + 1) + 1)
 
-extern void blankfill(char *, struct range *, int);
-/* src/lib/subs/border.c */
+/* src/lib/subs/bigmap.c */
 extern int map_set(natid, coord, coord, char, int);
 extern void writebmap(natid);
 extern void writemap(natid);
 /* src/lib/subs/border.c */
+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_HIGH       bit(3)
-#define MAP_ALL                MAP_SHIP | MAP_LAND | MAP_PLANE
+#define MAP_PLANE      bit(0) /* this order must match */
+#define MAP_SHIP       bit(1) /* priority of the map and */
+#define MAP_LAND       bit(2) /* ef_unit_list */
+#define MAP_NUKE       bit(3)
+#define MAP_HIGH       bit(4)
+#define MAP_ALL                MAP_SHIP | MAP_LAND | MAP_PLANE | MAP_NUKE
 
 #endif