Collect path-related stuff in path.h

diff --git a/include/path.h b/include/path.h
index d59b5dc0e64ce41b1df2442099f1181cca6859de..1d592505fcb41b6105884994c08712d9f9765ede 100644 (file)
--- a/include/path.h
+++ b/include/path.h
@@ -49,17 +49,37 @@
 #define DIR_FIRST      1
 #define DIR_LAST       6
 
 #define DIR_FIRST      1
 #define DIR_LAST       6
 

+#define MOB_MOVE       0
+#define MOB_MARCH      1
+#define MOB_RAIL       2
+

 enum p_mode {                  /* How to find path to destination */
     P_NONE,                    /* don't */
     P_FLYING,                  /* use BestAirPath() */
     P_SAILING                  /* use BestShipPath() */
 };
 
 enum p_mode {                  /* How to find path to destination */
     P_NONE,                    /* don't */
     P_FLYING,                  /* use BestAirPath() */
     P_SAILING                  /* use BestShipPath() */
 };
 

+/* src/lib/global/dir.c */

 extern signed char dirindex['z'-'a'+1];
 extern int diroff[DIR_MAP+1][2];
 extern char dirch[DIR_MAP+2];
 extern char *routech[DIR_LAST+1];
 
 extern signed char dirindex['z'-'a'+1];
 extern int diroff[DIR_MAP+1][2];
 extern char dirch[DIR_MAP+2];
 extern char *routech[DIR_LAST+1];
 

+/* src/lib/common/bestpath.c */
+extern char *bestownedpath(char *, char *, int, int, int, int, int);
+
+/* src/lib/common/path.c */
+extern void bp_enable_cachepath(void);
+extern void bp_disable_cachepath(void);
+extern void bp_clear_cachepath(void);
+extern char *BestDistPath(char *, struct sctstr *, struct sctstr *,
+                         double *);
+extern char *BestLandPath(char *, struct sctstr *, struct sctstr *,
+                         double *, int);
+extern char *BestShipPath(char *, int, int, int, int, int);
+extern char *BestAirPath(char *, int, int, int, int);
+extern double pathcost(struct sctstr *, char *, int);
+

 /* src/lib/subs/paths.c */
 extern char *getpath(char *, char *, coord, coord, int, int, enum p_mode);
 extern double fcost(struct sctstr *, natid);
 /* src/lib/subs/paths.c */
 extern char *getpath(char *, char *, coord, coord, int, int, enum p_mode);
 extern double fcost(struct sctstr *, natid);

diff --git a/include/prototypes.h b/include/prototypes.h
index f0ddb711b215adc8c89d4068597dd31130496598..8513b5e3e9846aa5b58a4290be43425c9cea7d7f 100644 (file)
--- a/include/prototypes.h
+++ b/include/prototypes.h
@@ -255,7 +255,7 @@ int zdon(void);
  * src/lib/common/ *.c
  */
 /* bestpath.c */
  * src/lib/common/ *.c
  */
 /* bestpath.c */

-extern char *bestownedpath(char *, char *, int, int, int, int, int);
+/* in path.h */

 /* conftab.c */
 extern int read_builtin_tables(void);
 extern int read_custom_tables(void);
 /* conftab.c */
 extern int read_builtin_tables(void);
 extern int read_custom_tables(void);


@@ -285,16 +285,7 @@ extern int mapdist(int, int, int, int);
 /* nstreval.c */
 /* in nsc.h */
 /* path.c */
 /* nstreval.c */
 /* in nsc.h */
 /* path.c */

-extern void bp_enable_cachepath(void);
-extern void bp_disable_cachepath(void);
-extern void bp_clear_cachepath(void);
-extern char *BestDistPath(char *, struct sctstr *, struct sctstr *,
-                         double *);
-extern char *BestLandPath(char *, struct sctstr *, struct sctstr *,
-                         double *, int);
-extern char *BestShipPath(char *, int, int, int, int, int);
-extern char *BestAirPath(char *, int, int, int, int);
-extern double pathcost(struct sctstr *, char *, int);
+/* in path.h */

 /* rdsched.c */
 extern int read_schedule(char *, time_t[], int, time_t, time_t);
 /* res_pop.c */
 /* rdsched.c */
 extern int read_schedule(char *, time_t[], int, time_t, time_t);
 /* res_pop.c */

diff --git a/include/sect.h b/include/sect.h
index 12a5e42175a3dcf11e78fbd73ba30cad858ecd8b..43d7be26e055d18223851f568a213d9e5b890f97 100644 (file)
--- a/include/sect.h
+++ b/include/sect.h
@@ -196,10 +196,6 @@ extern struct dchrstr dchr[SCT_TYPE_MAX + 2];
 #define SCT_LANDMINES(sp) \
     (SCT_MINES_ARE_SEAMINES((sp)) ? 0 : (sp)->sct_mines)
 
 #define SCT_LANDMINES(sp) \
     (SCT_MINES_ARE_SEAMINES((sp)) ? 0 : (sp)->sct_mines)
 

-#define MOB_MOVE       0
-#define MOB_MARCH      1
-#define MOB_RAIL       2
-

 #define INT_ROAD       0
 #define INT_RAIL       1
 #define INT_DEF                2
 #define INT_ROAD       0
 #define INT_RAIL       1
 #define INT_DEF                2

diff --git a/src/lib/subs/supply.c b/src/lib/subs/supply.c
index e7582aadca35f59f078a059111aa09dc7863e20f..4c0dba491a45c369b0b2b2ffd2eea3fb77f1866a 100644 (file)
--- a/src/lib/subs/supply.c
+++ b/src/lib/subs/supply.c
@@ -39,6 +39,7 @@
 #include "land.h"
 #include "nat.h"
 #include "optlist.h"
 #include "land.h"
 #include "nat.h"
 #include "optlist.h"

+#include "path.h"

 #include "player.h"
 #include "prototypes.h"
 #include "sect.h"
 #include "player.h"
 #include "prototypes.h"
 #include "sect.h"

diff --git a/src/lib/subs/unitsub.c b/src/lib/subs/unitsub.c
index 80cd98354b285bacfc6745fabee97cb4f9a3540c..fa986c0675fb3a31ce34dd4cac421486c3aca0c6 100644 (file)
--- a/src/lib/subs/unitsub.c
+++ b/src/lib/subs/unitsub.c
@@ -36,6 +36,7 @@
 
 #include "empobj.h"
 #include "file.h"
 
 #include "empobj.h"
 #include "file.h"

+#include "path.h"

 #include "player.h"
 #include "optlist.h"
 #include "prototypes.h"
 #include "player.h"
 #include "optlist.h"
 #include "prototypes.h"