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

Remove redundant casts of argument to (prototyped) double parameter.

Browse source
This commit is contained in:
Markus Armbruster 2006-05-01 12:34:16 +00:00
parent 7c3899bf89
commit 7ed308526c
19 changed files with 82 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/lib/update/land.c
View file

@ -279,12 +279,12 @@ landrepair(struct lndstr *land, struct natstr *np,
leftp = ((float)left / 100.0);
memset(mvec, 0, sizeof(mvec));
mvec[I_LCM] = lcm_needed = ldround((double)(lp->l_lcm * leftp), 1);
mvec[I_HCM] = hcm_needed = ldround((double)(lp->l_hcm * leftp), 1);
mvec[I_LCM] = lcm_needed = ldround(lp->l_lcm * leftp, 1);
mvec[I_HCM] = hcm_needed = ldround(lp->l_hcm * leftp, 1);
/*
mvec[I_GUN] = gun_needed = ldround((double)(lp->l_gun * leftp),1);
mvec[I_MILIT] = mil_needed = ldround((double)(lp->l_mil * leftp),1);
mvec[I_SHELL] = shell_needed = ldround((double)(lp->l_shell *leftp),1);
mvec[I_GUN] = gun_needed = ldround(lp->l_gun * leftp, 1);
mvec[I_MILIT] = mil_needed = ldround(lp->l_mil * leftp, 1);
mvec[I_SHELL] = shell_needed = ldround(lp->l_shell *leftp, 1);
*/
mvec[I_GUN] = gun_needed = 0;
mvec[I_MILIT] = mil_needed = 0;
@ -305,15 +305,15 @@ landrepair(struct lndstr *land, struct natstr *np,
if (mvec[I_SHELL] < shell_needed)
buildp = MIN(buildp, ((float)mvec[I_SHELL] / (float)lp->l_shell));
build = ldround((double)(buildp * 100.0), 1);
build = ldround(buildp * 100.0, 1);
memset(mvec, 0, sizeof(mvec));
mvec[I_LCM] = lcm_needed = roundavg((double)(lp->l_lcm * buildp));
mvec[I_HCM] = hcm_needed = roundavg((double)(lp->l_hcm * buildp));
mvec[I_LCM] = lcm_needed = roundavg(lp->l_lcm * buildp);
mvec[I_HCM] = hcm_needed = roundavg(lp->l_hcm * buildp);
/*
mvec[I_GUN] = gun_needed = roundavg((double)(lp->l_gun * buildp));
mvec[I_MILIT] = mil_needed = roundavg((double)(lp->l_mil * buildp));
mvec[I_SHELL] = shell_needed = roundavg((double)(lp->l_shell *buildp));
mvec[I_GUN] = gun_needed = roundavg(lp->l_gun * buildp);
mvec[I_MILIT] = mil_needed = roundavg(lp->l_mil * buildp);
mvec[I_SHELL] = shell_needed = roundavg(lp->l_shell *buildp);
*/
mvec[I_GUN] = gun_needed = 0;
mvec[I_MILIT] = mil_needed = 0;

20
src/lib/update/plane.c
View file

@ -193,12 +193,9 @@ prod_plane(int etus, int natnum, int *bp, int buildem)
leftp = ((float)left / 100.0);
memset(mvec, 0, sizeof(mvec));
mvec[I_MILIT] = mil_needed =
ldround((double)(plp->pl_crew * leftp), 1);
mvec[I_LCM] = lcm_needed =
ldround((double)(plp->pl_lcm * leftp), 1);
mvec[I_HCM] = hcm_needed =
ldround((double)(plp->pl_hcm * leftp), 1);
mvec[I_MILIT] = mil_needed = ldround(plp->pl_crew * leftp, 1);
mvec[I_LCM] = lcm_needed = ldround(plp->pl_lcm * leftp, 1);
mvec[I_HCM] = hcm_needed = ldround(plp->pl_hcm * leftp, 1);
get_materials(sp, bp, mvec, 0);
@ -215,14 +212,11 @@ prod_plane(int etus, int natnum, int *bp, int buildem)
buildp = MIN(buildp, ((float)mvec[I_HCM] /
(float)plp->pl_hcm));
build = ldround((double)(buildp * 100.0), 1);
build = ldround(buildp * 100.0, 1);
memset(mvec, 0, sizeof(mvec));
mvec[I_MILIT] = mil_needed =
roundavg((double)(plp->pl_crew * buildp));
mvec[I_LCM] = lcm_needed =
roundavg((double)(plp->pl_lcm * buildp));
mvec[I_HCM] = hcm_needed =
roundavg((double)(plp->pl_hcm * buildp));
mvec[I_MILIT] = mil_needed = roundavg(plp->pl_crew * buildp);
mvec[I_LCM] = lcm_needed = roundavg(plp->pl_lcm * buildp);
mvec[I_HCM] = hcm_needed = roundavg(plp->pl_hcm * buildp);
get_materials(sp, bp, mvec, 1);

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

@ -78,7 +78,7 @@ populace(struct natstr *np, struct sctstr *sp, int etu)
tech = np->nat_level[NAT_TLEV];
pct = (double)((tech - 40) / 40.0 + edu / 3.0);
if (sp->sct_own == sp->sct_oldown && hap < pct &&
chance((double)(((double)pct - (double)hap) / (double)5.0))) {
chance(((double)pct - (double)hap) / (double)5.0)) {
/*
* zap the loyalty of unhappy civilians.
* there is a 20% chance per hap point below the

10
src/lib/update/ship.c
View file

@ -347,8 +347,8 @@ shiprepair(struct shpstr *ship, struct natstr *np,
leftp = ((float)left / 100.0);
memset(mvec, 0, sizeof(mvec));
mvec[I_LCM] = lcm_needed = ldround((double)(mp->m_lcm * leftp), 1);
mvec[I_HCM] = hcm_needed = ldround((double)(mp->m_hcm * leftp), 1);
mvec[I_LCM] = lcm_needed = ldround(mp->m_lcm * leftp, 1);
mvec[I_HCM] = hcm_needed = ldround(mp->m_hcm * leftp, 1);
get_materials(sp, bp, mvec, 0);
@ -359,10 +359,10 @@ shiprepair(struct shpstr *ship, struct natstr *np,
if (mvec[I_HCM] < hcm_needed)
buildp = MIN(buildp, ((float)mvec[I_HCM] / (float)mp->m_hcm));
build = ldround((double)(buildp * 100.0), 1);
build = ldround(buildp * 100.0, 1);
memset(mvec, 0, sizeof(mvec));
mvec[I_LCM] = lcm_needed = roundavg((double)(mp->m_lcm * buildp));
mvec[I_HCM] = hcm_needed = roundavg((double)(mp->m_hcm * buildp));
mvec[I_LCM] = lcm_needed = roundavg(mp->m_lcm * buildp);
mvec[I_HCM] = hcm_needed = roundavg(mp->m_hcm * buildp);
get_materials(sp, bp, mvec, 1);