Use new snxtitem_cargo() to simplify a couple of loops

[empserver] / src / lib / update / ship.c

diff --git a/src/lib/update/ship.c b/src/lib/update/ship.c
index 59546ddb65687c71c879aa2858a2b0495a16f052..e1e7e0710f8c650ec7deb16b55360227fefb8638 100644 (file)
--- a/src/lib/update/ship.c
+++ b/src/lib/update/ship.c
@@ -388,10 +388,8 @@ feed_ship(struct shpstr *sp, int etus)
                                        needed - sp->shp_item[I_FOOD]);
     if (needed > sp->shp_item[I_FOOD]) {
        /* take from embarked land units, but don't starve them */
-       snxtitem_all(&ni, EF_LAND);
+       snxtitem_cargo(&ni, EF_LAND, EF_SHIP, sp->shp_uid);
        while ((lp = nxtitemp(&ni)) && needed > sp->shp_item[I_FOOD]) {
-           if (lp->lnd_ship != sp->shp_uid)
-               continue;
            give = lp->lnd_item[I_FOOD] - food_needed(lp->lnd_item, etus);
            if (give < 1.0)
                continue;