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

Remove superflous casts and parenthesis.

Browse source
This commit is contained in:
Markus Armbruster 2006-05-21 12:24:30 +00:00
parent f883710417
commit cd73a47dfa
28 changed files with 136 additions and 145 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/lib/common/move.c
View file

@ -51,9 +51,9 @@ sector_mcost(struct sctstr *sp, int do_bonus)
/* Note, the best you can get is a 1.0 here. */
if (do_bonus == MOB_ROAD) {
d = d / (1.0 + ((double)sp->sct_road / 122.0));
d = d / (1.0 + sp->sct_road / 122.0);
} else if (do_bonus == MOB_RAIL) {
d = d / (1.0 + ((double)sp->sct_rail / 100.0));
d = d / (1.0 + sp->sct_rail / 100.0);
} else {
if (d < 2.0)
d = 2.0;
@ -61,10 +61,10 @@ sector_mcost(struct sctstr *sp, int do_bonus)
if (d < 1.0)
d = 1.0;
if (dchr[sp->sct_type].d_mcst < 25)
d = (d * 100.0 - (double)sp->sct_effic) / 500.0;
/* d = (200.0 + (d - 3.0) * (double)sp->sct_effic) / 500.0;*/
d = (d * 100.0 - sp->sct_effic) / 500.0;
/* d = (200.0 + (d - 3.0) * sp->sct_effic) / 500.0;*/
else
d = (d * 10.0 - (double)sp->sct_effic) / 115;
d = (d * 10.0 - sp->sct_effic) / 115;
if (d <= 0.0 || d < MIN_MOBCOST)
return MIN_MOBCOST;

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

@ -265,8 +265,8 @@ bp_realcost(struct as_coord from, struct as_coord to, void *pp)
static double
bp_seccost(struct as_coord from, struct as_coord to, void *pp)
{
return (double)mapdist((coord)from.x, (coord)from.y,
(coord)to.x, (coord)to.y);
return mapdist((coord)from.x, (coord)from.y,
(coord)to.x, (coord)to.y);
}
/*