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

(BestDistPath): All callers pass MOB_ROAD to parameter mob_type,

Browse source 
remove it.  Callers changed.
This commit is contained in:
Markus Armbruster 2006-06-04 16:49:24 +00:00
parent 0ea38208d1
commit 20c02295a6
5 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/prototypes.h
View file

@ -320,7 +320,7 @@ extern void bp_enable_cachepath(void);
extern void bp_disable_cachepath(void); extern void bp_disable_cachepath(void);
extern void bp_clear_cachepath(void); extern void bp_clear_cachepath(void);
extern char *BestDistPath(char *, struct sctstr *, struct sctstr *, extern char *BestDistPath(char *, struct sctstr *, struct sctstr *,
double *, int); double *);
extern char *BestLandPath(char *, struct sctstr *, struct sctstr *, extern char *BestLandPath(char *, struct sctstr *, struct sctstr *,
double *, int); double *, int);
extern char *BestShipPath(char *, int, int, int, int, int); extern char *BestShipPath(char *, int, int, int, int, int);

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

@ -100,7 +100,7 @@ dist(void)
pr("Warning: you don't own %s!\n", pr("Warning: you don't own %s!\n",
xyas(dsect.sct_x, dsect.sct_y, player->cnum)); xyas(dsect.sct_x, dsect.sct_y, player->cnum));
if (!BestDistPath(buf, &sect, &dsect, &move_cost, MOB_ROAD)) { if (!BestDistPath(buf, &sect, &dsect, &move_cost)) {
pr("No owned path from %s to %s.\n", pr("No owned path from %s to %s.\n",
xyas(dsect.sct_x, dsect.sct_y, player->cnum), xyas(dsect.sct_x, dsect.sct_y, player->cnum),
xyas(sect.sct_x, sect.sct_y, player->cnum)); xyas(sect.sct_x, sect.sct_y, player->cnum));

2
src/lib/commands/path.c
View file

@ -74,7 +74,7 @@ path(void)
return RET_FAIL; return RET_FAIL;
} }
getsect(sect.sct_dist_x, sect.sct_dist_y, &dsect); getsect(sect.sct_dist_x, sect.sct_dist_y, &dsect);
pp = BestDistPath(buf, &sect, &dsect, &move_cost, MOB_ROAD); pp = BestDistPath(buf, &sect, &dsect, &move_cost);
if (!pp) { if (!pp) {
pr("No path possible from %s to distribution sector %s\n", pr("No path possible from %s to distribution sector %s\n",
xyas(sect.sct_x, sect.sct_y, player->cnum), xyas(sect.sct_x, sect.sct_y, player->cnum),

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

@ -337,9 +337,9 @@ pathcost(struct sctstr *start, char *path, int mob_type)
char * char *
BestDistPath(char *path, BestDistPath(char *path,
struct sctstr *from, struct sctstr *from,
struct sctstr *to, double *cost, int mob_type) struct sctstr *to, double *cost)
{ {
return BestLandPath(path, from, to, cost, mob_type); return BestLandPath(path, from, to, cost, MOB_ROAD);
} }
char * char *

2
src/lib/update/finish.c
View file

@ -200,7 +200,7 @@ assemble_dist_paths(struct distinfo *distptrs)
/* Now, get the best distribution path over roads */ /* Now, get the best distribution path over roads */
/* Note we go from the dist center to the sector. This gives /* Note we go from the dist center to the sector. This gives
us the import path for that sector. */ us the import path for that sector. */
path = BestDistPath(buf, dist, sp, &d, MOB_ROAD); path = BestDistPath(buf, dist, sp, &d);
/* Now, we have a path */ /* Now, we have a path */
if (path != NULL) { if (path != NULL) {