empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
Not useful elsewhere.  Since I'm touching them anyway, put them in the
usual ship, plane, land, nuke order.
This commit is contained in:
Markus Armbruster 2011-04-09 08:56:01 +02:00
parent 0f0b5605e9
commit 8dc69a9a84
2 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
include/map.h
View file

@ -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

10
src/lib/subs/maps.c
View file

@ -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);