From 36e3caf97eb73cc86a24cd3000e4c2f7277f8faf Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Sat, 23 Jul 2016 23:16:07 +0200 Subject: [PATCH] subs: Simplify move_in_land() Signed-off-by: Markus Armbruster --- src/lib/subs/attsub.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/lib/subs/attsub.c b/src/lib/subs/attsub.c index 5b9ba9de..59f7258f 100644 --- a/src/lib/subs/attsub.c +++ b/src/lib/subs/attsub.c @@ -2309,8 +2309,6 @@ move_in_land(int combat_mode, struct combat *off, struct emp_qelem *olist, struct ulist *llp; char buf[512]; - if (QEMPTY(olist)) - return; for (qp = olist->q_forw; qp != olist; qp = next) { next = qp->q_forw; llp = (struct ulist *)qp; @@ -2324,8 +2322,7 @@ move_in_land(int combat_mode, struct combat *off, struct emp_qelem *olist, else llp->unit.land.lnd_ship = -1; } - if (QEMPTY(olist)) - return; + if (def->type == EF_SECTOR) { if (opt_INTERDICT_ATT) { lnd_sweep(olist, 0, 0, player->cnum); @@ -2335,15 +2332,13 @@ move_in_land(int combat_mode, struct combat *off, struct emp_qelem *olist, } else { sprintf(buf, "boards %s", prcom(0, def)); } - if (QEMPTY(olist)) - return; + for (qp = olist->q_forw; qp != olist; qp = next) { next = qp->q_forw; llp = (struct ulist *)qp; lnd_print(player->cnum, llp, buf); } - if (QEMPTY(olist)) - return; + lnd_put(olist); }