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

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>

diff --git a/include/sect.h b/include/sect.h
index 563714d51a4af0a9d928b9fcfa757ead71dbce84..84646248a39f3ada396e5031babee28685b6089a 100644 (file)
--- a/include/sect.h
+++ b/include/sect.h
@@ -164,9 +164,6 @@ struct dchrstr {
 #define getsectp(x, y) (struct sctstr *)ef_ptr(EF_SECTOR, sctoff((x), (y)))
 #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];
 #define IS_BIG_CITY(type) (dchr[(type)].d_pkg == UPKG)
 

diff --git a/include/xy.h b/include/xy.h
index d31cbf9ea2669873cfe4011ac44f47fd555ad4df..c230c13b46ef69856c10c10425d54b21b650849e 100644 (file)
--- a/include/xy.h
+++ b/include/xy.h
@@ -64,6 +64,7 @@ extern coord strtox(char *str, char **end);
 extern coord strtoy(char *str, char **end);
 extern coord xabs(struct natstr *np, coord relx);
 extern coord yabs(struct natstr *np, coord rely);
+extern int sctoff(coord x, coord y);
 extern coord xnorm(coord x);
 extern coord ynorm(coord y);
 extern int xyinrange(coord x, coord y, struct range *rp);

diff --git a/src/lib/subs/bigmap.c b/src/lib/subs/bigmap.c
index d1ceddb9190a3fb4267631674a88f099fbc66a05..d4f1287e642ea7e99b420d55e1c4e1891866e265 100644 (file)
--- a/src/lib/subs/bigmap.c
+++ b/src/lib/subs/bigmap.c
@@ -35,7 +35,7 @@
 
 #include "file.h"
 #include "map.h"
-#include "sect.h"
+#include "xy.h"
 
 /* values of only_bmap:
  * 0 = update both maps

diff --git a/src/lib/subs/coastal.c b/src/lib/subs/coastal.c
index c6b1bd2f70a1774c03943354f42c776fb7bd3ad0..74cf58381ff43016de7e50d39e0c7bc03a99b3a3 100644 (file)
--- a/src/lib/subs/coastal.c
+++ b/src/lib/subs/coastal.c
@@ -36,6 +36,7 @@
 #include "path.h"
 #include "prototypes.h"
 #include "sect.h"
+#include "xy.h"
 
 static int
 update_coastal_flag(coord x, coord y, coord ign_x, coord ign_y)

diff --git a/src/lib/subs/neigh.c b/src/lib/subs/neigh.c
index 32628728469e332381765516d56169e4215c2f8b..ff4c16c8e7617240165cde8384bac252db5c705a 100644 (file)
--- a/src/lib/subs/neigh.c
+++ b/src/lib/subs/neigh.c
@@ -36,6 +36,7 @@
 #include "path.h"
 #include "prototypes.h"
 #include "sect.h"
+#include "xy.h"
 
 int
 neigh(coord x, coord y, natid own)