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

Remove superfluous parenthesis.

Browse source
This commit is contained in:
Markus Armbruster 2007-12-14 07:49:58 +00:00
parent 45b9d65129
commit 265e71efa8
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -183,7 +183,7 @@ plague_people(struct natstr *np, short *vec,
} }
if (*ptime <= 0) { if (*ptime <= 0) {
*pstage -= 1; *pstage -= 1;
*ptime = (etus / 2) + (random() % etus); *ptime = etus / 2 + random() % etus;
} }
return stage; return stage;
} }

5
src/lib/update/sect.c
View file

@ -79,6 +79,7 @@ upd_buildeff(struct natstr *np, struct sctstr *sp, int *workp,
*cost += work_cost; *cost += work_cost;
if (!n && IS_BIG_CITY(old_type) && if (!n && IS_BIG_CITY(old_type) &&
!IS_BIG_CITY(*desig)) { !IS_BIG_CITY(*desig)) {
// FIXME use trunc_people() and total_work()
int maxpop = max_population(np->nat_level[NAT_RLEV], *desig, n); int maxpop = max_population(np->nat_level[NAT_RLEV], *desig, n);
if (vec[I_CIVIL] > maxpop) if (vec[I_CIVIL] > maxpop)
vec[I_CIVIL] = maxpop; vec[I_CIVIL] = maxpop;
@ -137,9 +138,9 @@ enlist(short *vec, int etu, int *cost)
/* Need to check treaties here */ /* Need to check treaties here */
enlisted = 0; enlisted = 0;
maxmil = (vec[I_CIVIL] / 2) - vec[I_MILIT]; maxmil = vec[I_CIVIL] / 2 - vec[I_MILIT];
if (maxmil > 0) { if (maxmil > 0) {
enlisted = (etu * (10 + vec[I_MILIT]) * 0.05); enlisted = etu * (10 + vec[I_MILIT]) * 0.05;
if (enlisted > maxmil) if (enlisted > maxmil)
enlisted = maxmil; enlisted = maxmil;
vec[I_CIVIL] -= enlisted; vec[I_CIVIL] -= enlisted;