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

(do_demo): Simplify.

Browse source
This commit is contained in:
Markus Armbruster 2004-09-17 12:54:14 +00:00
parent 44433afac6
commit 5cb994b4fe
1 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/lib/commands/demo.c
View file

@ -100,10 +100,8 @@ do_demo(struct natstr *natp, struct nstr_sect nstr, int number, s_char *p,
if (sect.sct_own != sect.sct_oldown) if (sect.sct_own != sect.sct_oldown)
continue; continue;
civ = sect.sct_item[I_CIVIL]; civ = sect.sct_item[I_CIVIL];
if (number < 0) { deltamil = number < 0 ? mil + number : min(mil, number);
if ((deltamil = mil + number) <= 0) if (deltamil <= 0)
continue;
} else if ((deltamil = min(mil, number)) <= 0)
continue; continue;
if (deltamil > ITEM_MAX - civ) if (deltamil > ITEM_MAX - civ)
deltamil = ITEM_MAX - civ; deltamil = ITEM_MAX - civ;