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

Use the new path finder for sea & air, drop bestownedpath()

Browse source 
bestownedpath() is a rather simple-minded breadth-first search.  It's
slower than the new path finder, and maintaining it in addition to the
new path finder makes no sense.
This commit is contained in:
Markus Armbruster 2011-02-22 07:18:41 +01:00
parent bbd6e9182f
commit 04363a92db
5 changed files with 57 additions and 234 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/lib/common/path.c
View file

@ -86,16 +86,29 @@ BestDistPath(char *path,
char *
BestShipPath(char *path, int fx, int fy, int tx, int ty, int owner)
{
char *map;
size_t len;
map = ef_ptr(EF_BMAP, owner);
if (!map)
if (path_find(fx, fy, tx, ty, owner, MOB_SAIL) < 0)
return NULL;
return bestownedpath(path, map, fx, fy, tx, ty, owner);
len = path_find_route(path, 100, fx, fy, tx, ty);
if (len >= 100)
return NULL;
if (len == 0)
strcpy(path, "h");
return path;
}
char *
BestAirPath(char *path, int fx, int fy, int tx, int ty)
{
return bestownedpath(path, NULL, fx, fy, tx, ty, -1);
size_t len;
if (path_find(fx, fy, tx, ty, 0, MOB_FLY) < 0)
return NULL;
len = path_find_route(path, 100, fx, fy, tx, ty);
if (len >= 100)
return NULL;
if (len == 0)
strcpy(path, "h");
return path;
}