From 265e71efa87de07bcadb4bf9cf180ba737af7157 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Fri, 14 Dec 2007 07:49:58 +0000 Subject: [PATCH] Remove superfluous parenthesis. --- src/lib/update/plague.c | 2 +- src/lib/update/sect.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/lib/update/plague.c b/src/lib/update/plague.c index 38d5f985a..5563d5512 100644 --- a/src/lib/update/plague.c +++ b/src/lib/update/plague.c @@ -183,7 +183,7 @@ plague_people(struct natstr *np, short *vec, } if (*ptime <= 0) { *pstage -= 1; - *ptime = (etus / 2) + (random() % etus); + *ptime = etus / 2 + random() % etus; } return stage; } diff --git a/src/lib/update/sect.c b/src/lib/update/sect.c index 0befb2ee3..613d2340f 100644 --- a/src/lib/update/sect.c +++ b/src/lib/update/sect.c @@ -79,6 +79,7 @@ upd_buildeff(struct natstr *np, struct sctstr *sp, int *workp, *cost += work_cost; if (!n && IS_BIG_CITY(old_type) && !IS_BIG_CITY(*desig)) { + // FIXME use trunc_people() and total_work() int maxpop = max_population(np->nat_level[NAT_RLEV], *desig, n); if (vec[I_CIVIL] > maxpop) vec[I_CIVIL] = maxpop; @@ -137,9 +138,9 @@ enlist(short *vec, int etu, int *cost) /* Need to check treaties here */ enlisted = 0; - maxmil = (vec[I_CIVIL] / 2) - vec[I_MILIT]; + maxmil = vec[I_CIVIL] / 2 - vec[I_MILIT]; if (maxmil > 0) { - enlisted = (etu * (10 + vec[I_MILIT]) * 0.05); + enlisted = etu * (10 + vec[I_MILIT]) * 0.05; if (enlisted > maxmil) enlisted = maxmil; vec[I_CIVIL] -= enlisted; -- 2.43.0