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

(att_get_combat): Fix test whether land unit exists. Closes #1034283.

Browse source 
(att_fight): Fix bad line break.
This commit is contained in:
Markus Armbruster 2005-10-01 16:39:41 +00:00
parent caac6e41ca
commit 0c8f779356
1 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/lib/subs/attsub.c
View file

@ -221,7 +221,7 @@ att_get_combat(struct combat *com, int isdef)
y = com->y; y = com->y;
break; break;
case EF_LAND: case EF_LAND:
if (!getland(com->lnd_uid, &land)) { if (!getland(com->lnd_uid, &land) || !land.lnd_own) {
if (isdef) if (isdef)
pr("Land unit #%d is not in the same sector!\n", pr("Land unit #%d is not in the same sector!\n",
com->lnd_uid); com->lnd_uid);
@ -1969,11 +1969,9 @@ att_fight(int combat_mode, struct combat *off, struct emp_qelem *olist,
if (off[n].type == EF_SECTOR && off[n].mil) if (off[n].type == EF_SECTOR && off[n].mil)
off[n].mobcost += off[n].mobcost +=
min(20, min(20,
min(1, off[n].mob - damage(off[n].mob,
off[n].mob - damage(off[n].mob, 100 * (a_troops[n] - off[n].troops)
100 * (a_troops[n] - / off[n].mil));
off[n].troops) /
off[n].mil)));
off[n].mil -= a_troops[n] - off[n].troops; off[n].mil -= a_troops[n] - off[n].troops;
} }