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

(total_work): Remove redundant conversion to int.

Browse source 
(total_work): New parameter maxpop.  Callers changed.
(newe, prod): Use total_work().  Old code failed to limit military
workers, thus didn't match the update.
(do_feed): Simplify.
This commit is contained in:
Markus Armbruster 2005-02-20 19:36:41 +00:00
parent 43d07b458d
commit 5ba8cab9b5
6 changed files with 40 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -172,7 +172,8 @@ upd_ship(struct shpstr *sp, int etus,
oil_gained = roundavg(total_work(100, etus,
sp->shp_item[I_CIVIL],
sp->shp_item[I_MILIT],
sp->shp_item[I_UW])
sp->shp_item[I_UW],
ITEM_MAX)
* (double)sp->shp_effic / 100.0
* (double)sectp->sct_oil / 100.0
* prod_eff(product, sp->shp_tech));
@ -190,13 +191,15 @@ upd_ship(struct shpstr *sp, int etus,
}
if ((mp->m_flags & M_FOOD) && sectp->sct_type == SCT_WATER) {
product = &pchr[P_FOOD];
sp->shp_item[I_FOOD] += roundavg(total_work(100, etus,
sp->shp_item[I_CIVIL],
sp->shp_item[I_MILIT],
sp->shp_item[I_UW])
* (double)sp->shp_effic / 100.0
* (double)sectp->sct_fertil / 100.0
* prod_eff(product, sp->shp_tech));
sp->shp_item[I_FOOD]
+= roundavg(total_work(100, etus,
sp->shp_item[I_CIVIL],
sp->shp_item[I_MILIT],
sp->shp_item[I_UW],
ITEM_MAX)
* sp->shp_effic / 100.0
* sectp->sct_fertil / 100.0
* prod_eff(product, sp->shp_tech));
}
if ((n = feed_ship(sp, etus, &needed, 1)) > 0) {
wu(0, sp->shp_own, "%d starved on %s\n", n, prship(sp));