]> git.pond.sub.org Git - empserver/commitdiff
subs: Simplify move_in_land()
authorMarkus Armbruster <armbru@pond.sub.org>
Sat, 23 Jul 2016 21:16:07 +0000 (23:16 +0200)
committerMarkus Armbruster <armbru@pond.sub.org>
Sun, 6 Aug 2017 18:09:18 +0000 (20:09 +0200)
Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
src/lib/subs/attsub.c

index 5b9ba9de84c35d2d5e20971c4e6254111ea18c98..59f7258fcc7776e6a94247ec3f171f67164206a1 100644 (file)
@@ -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);
 }