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

(nati): Remove weird code to round max safe population that has no

Browse source 
effect unless your floating-point arithmetic is hopelessly broken.
This code appeared in Chainsaw 3.2 or so.  Also remove some redundant
casts.
This commit is contained in:
Markus Armbruster 2006-05-20 08:43:24 +00:00
parent 89cd9b7ca0
commit d5eee2175b
1 changed files with 6 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/lib/commands/nati.c
View file

@ -89,37 +89,24 @@ nati(void)
pr(" The treasury has $%.2f", (double)natp->nat_money); pr(" The treasury has $%.2f", (double)natp->nat_money);
pr(" Military reserves: %ld\n", natp->nat_reserve); pr(" Military reserves: %ld\n", natp->nat_reserve);
pr("Education..........%6.2f Happiness.......%6.2f\n", pr("Education..........%6.2f Happiness.......%6.2f\n",
(double)natp->nat_level[NAT_ELEV], natp->nat_level[NAT_ELEV], natp->nat_level[NAT_HLEV]);
(double)natp->nat_level[NAT_HLEV]);
pr("Technology.........%6.2f Research........%6.2f\n", pr("Technology.........%6.2f Research........%6.2f\n",
(double)natp->nat_level[NAT_TLEV], natp->nat_level[NAT_TLEV], natp->nat_level[NAT_RLEV]);
(double)natp->nat_level[NAT_RLEV]);
pr("Technology factor :%6.2f%%", tfact(cnum, 100.)); pr("Technology factor :%6.2f%%", tfact(cnum, 100.));
if (opt_NO_PLAGUE) if (opt_NO_PLAGUE)
pfac = 0.0; pfac = 0.0;
else else
pfac = ((double)natp->nat_level[NAT_TLEV] + 100.) / pfac = (natp->nat_level[NAT_TLEV] + 100.0) /
((double)natp->nat_level[NAT_RLEV] + 100.); (natp->nat_level[NAT_RLEV] + 100.0);
pr(" Plague factor : %6.2f%%\n", pfac); pr(" Plague factor : %6.2f%%\n", pfac);
pr("\n"); pr("\n");
poplimit = max_population(natp->nat_level[NAT_RLEV], SCT_MINE, 0); poplimit = max_population(natp->nat_level[NAT_RLEV], SCT_MINE, 0);
pr("Max population : %d\n", poplimit); pr("Max population : %d\n", poplimit);
safepop = safepop = (int)(poplimit / (1.0 + obrate * (double)etu_per_update));
(int)((double)poplimit / (1.0 + obrate * (double)etu_per_update)); uwpop = (int)(poplimit / (1.0 + uwbrate * (double)etu_per_update));
uwpop =
(int)((double)poplimit / (1.0 + uwbrate * (double)etu_per_update));
safepop++;
if (((double)safepop * (1.0 + obrate * (double)etu_per_update)) >
((double)poplimit + 0.0000001))
safepop--;
uwpop++;
if (((double)uwpop * (1.0 + uwbrate * (double)etu_per_update)) >
((double)poplimit + 0.0000001))
uwpop--;
pr("Max safe population for civs/uws: %d/%d\n", safepop, uwpop); pr("Max safe population for civs/uws: %d/%d\n", safepop, uwpop);
hap = hap_req(natp); hap = hap_req(natp);