/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2005, 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
*
* ---
*
- * See the "LEGAL", "LICENSE", "CREDITS" and "README" files for all the
- * related information and legal notices. It is expected that any future
- * projects/authors will amend these files as needed.
+ * See files README, COPYING and CREDITS in the root of the source
+ * tree for related information and legal notices. It is expected
+ * that future projects/authors will amend these files as needed.
*
* ---
*
*
*/
-#ifndef _MAP_H_
-#define _MAP_H_
+#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 s_char *routech[7][2];
-
-extern void blankfill(s_char *, register struct range *, int);
-/* src/lib/subs/border.c */
-extern int map_set(natid, coord, coord, s_char, int);
+extern void blankfill(char *, struct range *, int);
+/* 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 border(struct range *, s_char *, s_char *);
+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 /* _MAP_H_ */
+#endif