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

xy.h: Move declaration of sctoff() from sect.h to xy.h

Browse source 
Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2013-01-27 10:13:11 +01:00
parent 5497126d05
commit f2b1ea3161
5 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
include/sect.h
View file

@ -164,9 +164,6 @@ struct dchrstr {
#define getsectp(x, y) (struct sctstr *)ef_ptr(EF_SECTOR, sctoff((x), (y))) #define getsectp(x, y) (struct sctstr *)ef_ptr(EF_SECTOR, sctoff((x), (y)))
#define getsectid(id) (struct sctstr *)ef_ptr(EF_SECTOR, (id)) #define getsectid(id) (struct sctstr *)ef_ptr(EF_SECTOR, (id))
/* things relating to sectors */
extern int sctoff(coord x, coord y);
extern struct dchrstr dchr[SCT_TYPE_MAX + 2]; extern struct dchrstr dchr[SCT_TYPE_MAX + 2];
#define IS_BIG_CITY(type) (dchr[(type)].d_pkg == UPKG) #define IS_BIG_CITY(type) (dchr[(type)].d_pkg == UPKG)

1
include/xy.h
View file

@ -64,6 +64,7 @@ extern coord strtox(char *str, char **end);
extern coord strtoy(char *str, char **end); extern coord strtoy(char *str, char **end);
extern coord xabs(struct natstr *np, coord relx); extern coord xabs(struct natstr *np, coord relx);
extern coord yabs(struct natstr *np, coord rely); extern coord yabs(struct natstr *np, coord rely);
extern int sctoff(coord x, coord y);
extern coord xnorm(coord x); extern coord xnorm(coord x);
extern coord ynorm(coord y); extern coord ynorm(coord y);
extern int xyinrange(coord x, coord y, struct range *rp); extern int xyinrange(coord x, coord y, struct range *rp);

2
src/lib/subs/bigmap.c
View file

@ -35,7 +35,7 @@
#include "file.h" #include "file.h"
#include "map.h" #include "map.h"
#include "sect.h" #include "xy.h"
/* values of only_bmap: /* values of only_bmap:
* 0 = update both maps * 0 = update both maps

1
src/lib/subs/coastal.c
View file

@ -36,6 +36,7 @@
#include "path.h" #include "path.h"
#include "prototypes.h" #include "prototypes.h"
#include "sect.h" #include "sect.h"
#include "xy.h"
static int static int
update_coastal_flag(coord x, coord y, coord ign_x, coord ign_y) update_coastal_flag(coord x, coord y, coord ign_x, coord ign_y)

1
src/lib/subs/neigh.c
View file

@ -36,6 +36,7 @@
#include "path.h" #include "path.h"
#include "prototypes.h" #include "prototypes.h"
#include "sect.h" #include "sect.h"
#include "xy.h"
int int
neigh(coord x, coord y, natid own) neigh(coord x, coord y, natid own)