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

12
src/lib/subs/attsub.c
View file

@ -29,7 +29,7 @@
* Known contributors to this file:
* Ken Stevens, 1995
* Steve McClure, 1996-2000
* Markus Armbruster, 2006-2009
* Markus Armbruster, 2006-2011
*/
#include <config.h>
@ -1457,7 +1457,6 @@ att_reacting_units(struct combat *def, struct emp_qelem *list, int a_spy,
{
struct nstr_item ni;
struct lndstr land;
struct sctstr sect, dsect;
struct ulist *llp;
int dtotal;
double new_land = 0;
@ -1465,7 +1464,6 @@ att_reacting_units(struct combat *def, struct emp_qelem *list, int a_spy,
double pathcost;
int origx, origy;
double eff = att_combat_eff(def);
char buf[1024];
if (list)
dtotal = get_dtotal(def, list, 1.0, 1);
@ -1497,12 +1495,10 @@ att_reacting_units(struct combat *def, struct emp_qelem *list, int a_spy,
if (!in_oparea((struct empobj *)&land, def->x, def->y))
continue;
getsect(land.lnd_x, land.lnd_y, &sect);
getsect(def->x, def->y, &dsect);
if (!BestLandPath(buf, &sect, &dsect, &pathcost,
lnd_mobtype(&land)))
pathcost = path_find(land.lnd_x, land.lnd_y, def->x, def->y,
def->own, lnd_mobtype(&land));
if (pathcost < 0)
continue;
mobcost = lnd_pathcost(&land, pathcost);
if (land.lnd_mobil < mobcost)
continue;