Update copyright notice

[empserver] / include / map.h

diff --git a/include/map.h b/include/map.h
index bc7f471cb2cba7179431055518f67191f1fff279..9550c940bb42f1ab24fd7dce20e1c15d4589f61d 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,10 +34,9 @@
 #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/bigmap.c */
@@ -47,10 +46,11 @@ extern void writemap(natid);
 /* src/lib/subs/border.c */
 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