New info Hvy-Plastic

[empserver] / include / path.h

diff --git a/include/path.h b/include/path.h
index 7eb70ad5d693c14174a9f37a3752d2bf57dc437f..43477fba3df8bcafbdc135cfcd52d58dd155d0b4 100644 (file)
--- a/include/path.h
+++ b/include/path.h
@@ -52,12 +52,8 @@
 #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() */
-};
+#define MOB_SAIL       3
+#define MOB_FLY                4
 
 /* src/lib/global/dir.c */
 extern signed char dirindex['z'-'a'+1];
@@ -65,29 +61,22 @@ 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/findpath.c */
 extern void path_find_from(coord, coord, natid, int);
 extern double path_find_to(coord, coord);
 extern double path_find(coord, coord, coord, coord, natid, int);
 extern size_t path_find_route(char *, size_t, coord, coord, coord, coord);
-
-/* 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);
+#ifdef PATH_FIND_DEBUG
+extern void path_find_visualize(coord, coord, coord, coord);
+#endif
+#ifdef PATH_FIND_STATS
+extern void path_find_print_stats(void);
+#else
+#define path_find_print_stats() ((void)0)
+#endif
 
 /* src/lib/subs/paths.c */
-extern char *getpath(char *, char *, coord, coord, int, int, enum p_mode);
+extern char *getpath(char *, char *, coord, coord, int, int, int);
 extern double fcost(struct sctstr *, natid);
 extern double ncost(struct sctstr *, natid);
 extern double pathtoxy(char *, coord *, coord *,