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

Use path_find() directly where only cost is needed

Browse source 
dist(), att_reacting_units() and s_commod() are only interested in
cost, not the actual path.  BestLandPath() and BestDistPath() compute
both cost and path.  Use path_find() directly instead.

Destinations are no longer treated as unreachable when the best path
is longer than 1023 characters.
This commit is contained in:
Markus Armbruster 2011-03-21 20:26:02 +01:00
parent 04363a92db
commit aef27e3521
3 changed files with 17 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/lib/commands/dist.c
View file

@ -30,6 +30,7 @@
* Dave Pare, 1986
* Thomas Ruschak, 1993 (rewritten)
* Steve McClure, 1998
* Markus Armbruster, 2008-2011
*/
#include <config.h>
@ -46,7 +47,7 @@ dist(void)
struct sctstr sect, dsect, tsect;
struct nstr_sect nstr;
char *p;
double move_cost = 0.0;
double move_cost;
coord dstx, dsty;
char buf[1024];
@ -90,7 +91,9 @@ dist(void)
pr("Warning: you don't own %s!\n",
xyas(dsect.sct_x, dsect.sct_y, player->cnum));
if (!BestDistPath(buf, &sect, &dsect, &move_cost)) {
move_cost = path_find(sect.sct_x, sect.sct_y, dstx, dsty,
player->cnum, MOB_MOVE);
if (move_cost < 0) {
pr("No owned path from %s to %s.\n",
xyas(dsect.sct_x, dsect.sct_y, player->cnum),
xyas(sect.sct_x, sect.sct_y, player->cnum));