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

Replace common pattern by new LIMIT_TO()

Browse source 
Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2013-01-14 22:34:05 +01:00
parent aa870f5d91
commit 726b9380d1
11 changed files with 73 additions and 162 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -102,11 +102,7 @@ populace(struct natstr *np, struct sctstr *sp, int etu)
n -= roundavg(etu * 0.25);
else
n += roundavg(etu * 0.125);
if (n < 0)
n = 0;
else if (n > 127)
n = 127;
sp->sct_loyal = n;
sp->sct_loyal = LIMIT_TO(n, 0, 127);
if (sp->sct_loyal == 0) {
if (sp->sct_oldown != sp->sct_own) {
wu(0, sp->sct_own,