New info Hvy-Plastic

[empserver] / include / path.h

diff --git a/include/path.h b/include/path.h
index 1d592505fcb41b6105884994c08712d9f9765ede..43477fba3df8bcafbdc135cfcd52d58dd155d0b4 100644 (file)
--- a/include/path.h
+++ b/include/path.h
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2010, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2011, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *                Ken Stevens, Steve McClure, Markus Armbruster
  *
- *  This program is free software; you can redistribute it and/or modify
+ *  Empire is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
+ *  the Free Software Foundation, either version 3 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
@@ -14,8 +14,7 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  *  ---
  *
@@ -28,12 +27,13 @@
  *  path.h: Definitions for directions, paths, etc.
  *
  *  Known contributors to this file:
- *
+ *     Markus Armbruster, 2005-2011
  */
 
 #ifndef PATH_H
 #define PATH_H
 
+#include <stddef.h>
 #include "types.h"
 
        /* direction indices */
@@ -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,23 +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/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/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);
+#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 *,