From 791ba26c5ebe3d33808e04061bfd697a871ea699 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Fri, 18 Feb 2011 19:07:31 +0100 Subject: [PATCH] Merge dodistribute() parameters dist_i_cost, dist_e_cost Only one of them is used, depending on argument imex. Replace them by a single parameter path_cost. --- include/prototypes.h | 2 +- src/lib/update/distribute.c | 11 +++++------ src/lib/update/finish.c | 4 ++-- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/include/prototypes.h b/include/prototypes.h index 3c0748b55..d7e62b80f 100644 --- a/include/prototypes.h +++ b/include/prototypes.h @@ -694,7 +694,7 @@ extern void delete_old_announcements(void); /* deliver.c */ extern void dodeliver(struct sctstr *); /* distribute.c */ -extern int dodistribute(struct sctstr *, int, double, double); +extern int dodistribute(struct sctstr *, int, double); /* finish.c */ extern void finish_sects(int); /* human.c */ diff --git a/src/lib/update/distribute.c b/src/lib/update/distribute.c index 7f86179e7..ddc88bdd5 100644 --- a/src/lib/update/distribute.c +++ b/src/lib/update/distribute.c @@ -51,8 +51,7 @@ #define IMPORT_BONUS 10.0 int -dodistribute(struct sctstr *sp, int imex, - double dist_i_cost, double dist_e_cost) +dodistribute(struct sctstr *sp, int imex, double path_cost) { struct ichrstr *ip; struct sctstr *dist; @@ -72,7 +71,7 @@ dodistribute(struct sctstr *sp, int imex, if ((sp->sct_dist_x == sp->sct_x) && (sp->sct_dist_y == sp->sct_y)) return 0; - if (dist_e_cost < 0.0) { + if (path_cost < 0.0) { if (sp->sct_own != 0) { if (imex == EXPORT) /* only want this once */ wu(0, sp->sct_own, "No path to dist sector for %s\n", @@ -87,7 +86,7 @@ dodistribute(struct sctstr *sp, int imex, DPRINTF("distribute: %d,%d to %d,%d pathcost %g\n", sp->sct_x, sp->sct_y, sp->sct_dist_x, sp->sct_dist_y, - imex == IMPORT ? dist_i_cost : dist_e_cost); + path_cost); lplague = rplague = changed = 0; for (item = I_NONE + 1; item <= I_MAX; item++) { @@ -138,7 +137,7 @@ dodistribute(struct sctstr *sp, int imex, continue; } pack = ip->i_pkg[dist_packing]; - mcost = dist_i_cost / pack * ip->i_lbs / IMPORT_BONUS; + mcost = path_cost / pack * ip->i_lbs / IMPORT_BONUS; if (dist->sct_mobil < mcost * amt) amt = dist->sct_mobil / mcost; @@ -169,7 +168,7 @@ dodistribute(struct sctstr *sp, int imex, if (amt > amt_sect) amt = amt_sect; pack = MAX(ip->i_pkg[sect_packing], ip->i_pkg[dist_packing]); - mcost = dist_e_cost / pack * ip->i_lbs / EXPORT_BONUS; + mcost = path_cost / pack * ip->i_lbs / EXPORT_BONUS; if (sp->sct_mobil < mcost * amt) amt = sp->sct_mobil / mcost; if (amt > ITEM_MAX - amt_dist) diff --git a/src/lib/update/finish.c b/src/lib/update/finish.c index 43e035557..1544f45da 100644 --- a/src/lib/update/finish.c +++ b/src/lib/update/finish.c @@ -122,7 +122,7 @@ finish_sects(int etu) continue; /* Get the pointer */ infptr = &g_distptrs[sp->sct_uid]; - dodistribute(sp, EXPORT, infptr->imcost, infptr->excost); + dodistribute(sp, EXPORT, infptr->excost); } logerror("done exporting\n"); @@ -135,7 +135,7 @@ finish_sects(int etu) np = getnatp(sp->sct_own); if (np->nat_money < 0) continue; - dodistribute(sp, IMPORT, infptr->imcost, infptr->excost); + dodistribute(sp, IMPORT, infptr->imcost); sp->sct_off = 0; } logerror("done importing\n"); -- 2.43.0