From 0c8f7793560300c2daad7c37d227d1a26b95d2ea Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Sat, 1 Oct 2005 16:39:41 +0000 Subject: [PATCH] (att_get_combat): Fix test whether land unit exists. Closes #1034283. (att_fight): Fix bad line break. --- src/lib/subs/attsub.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/lib/subs/attsub.c b/src/lib/subs/attsub.c index e20b8d49..12c92cbb 100644 --- a/src/lib/subs/attsub.c +++ b/src/lib/subs/attsub.c @@ -221,7 +221,7 @@ att_get_combat(struct combat *com, int isdef) y = com->y; break; case EF_LAND: - if (!getland(com->lnd_uid, &land)) { + if (!getland(com->lnd_uid, &land) || !land.lnd_own) { if (isdef) pr("Land unit #%d is not in the same sector!\n", 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) off[n].mobcost += min(20, - min(1, - off[n].mob - damage(off[n].mob, - 100 * (a_troops[n] - - off[n].troops) / - off[n].mil))); + off[n].mob - damage(off[n].mob, + 100 * (a_troops[n] - off[n].troops) + / off[n].mil)); off[n].mil -= a_troops[n] - off[n].troops; }