Use new snxtitem_cargo() to simplify a couple of loops

[empserver] / src / lib / subs / trdsub.c

diff --git a/src/lib/subs/trdsub.c b/src/lib/subs/trdsub.c
index 80ba1b8964b255afd3100dba4f7cc92044eb106b..512b2fbcf2a14f0c5aec4d3e3b3fafd0b544c516 100644 (file)
--- a/src/lib/subs/trdsub.c
+++ b/src/lib/subs/trdsub.c
@@ -130,37 +130,31 @@ trade_desc(struct trdstr *tp, union empobj_storage *tgp)
        }
        pr("] #%d", tp->trd_unitid);
        if (opt_SHOWPLANE) {
-           snxtitem_all(&ni, EF_PLANE);
+           snxtitem_cargo(&ni, EF_PLANE, EF_SHIP, sp->shp_uid);
            while (nxtitem(&ni, &plane)) {
-               if (plane.pln_ship == sp->shp_uid && plane.pln_own != 0) {
-                   pr("\n\t\t\t\t    tech %3d %3d%% %s #%d",
-                      plane.pln_tech,
-                      plane.pln_effic,
-                      plchr[(int)plane.pln_type].pl_name, plane.pln_uid);
-                   if (getnuke(nuk_on_plane(&plane), &nuke))
-                       pr("(%s)", nchr[nuke.nuk_type].n_name);
-               }
+               pr("\n\t\t\t\t    tech %3d %3d%% %s #%d",
+                  plane.pln_tech,
+                  plane.pln_effic,
+                  plchr[(int)plane.pln_type].pl_name, plane.pln_uid);
+               if (getnuke(nuk_on_plane(&plane), &nuke))
+                   pr("(%s)", nchr[nuke.nuk_type].n_name);
            }
-           snxtitem_all(&ni, EF_LAND);
+           snxtitem_cargo(&ni, EF_LAND, EF_SHIP, sp->shp_uid);
            while (nxtitem(&ni, &land)) {
-               if (land.lnd_ship == sp->shp_uid && land.lnd_own != 0) {
-                   pr("\n\t\t\t\t    tech %3d %3d%% %s #%d",
-                      land.lnd_tech,
-                      land.lnd_effic,
-                      lchr[(int)land.lnd_type].l_name, land.lnd_uid);
-                   if (pln_first_on_land(&land) >= 0) {
-                       snxtitem_all(&ni, EF_PLANE);
-                       while (nxtitem(&ni, &plane)) {
-                           if (plane.pln_land == land.lnd_uid) {
-                               pr("\n\t\t\t\t    tech %3d %3d%% %s #%d",
-                                  plane.pln_tech,
-                                  plane.pln_effic,
-                                  plchr[(int)plane.pln_type].pl_name,
-                                  plane.pln_uid);
-                               if (getnuke(nuk_on_plane(&plane), &nuke))
-                                   pr("(%s)", nchr[nuke.nuk_type].n_name);
-                           }
-                       }
+               pr("\n\t\t\t\t    tech %3d %3d%% %s #%d",
+                  land.lnd_tech,
+                  land.lnd_effic,
+                  lchr[(int)land.lnd_type].l_name, land.lnd_uid);
+               if (pln_first_on_land(&land) >= 0) {
+                   snxtitem_cargo(&ni, EF_PLANE, EF_LAND, land.lnd_uid);
+                   while (nxtitem(&ni, &plane)) {
+                       pr("\n\t\t\t\t    tech %3d %3d%% %s #%d",
+                          plane.pln_tech,
+                          plane.pln_effic,
+                          plchr[(int)plane.pln_type].pl_name,
+                          plane.pln_uid);
+                       if (getnuke(nuk_on_plane(&plane), &nuke))
+                           pr("(%s)", nchr[nuke.nuk_type].n_name);
                    }
                }
            }
@@ -184,16 +178,14 @@ trade_desc(struct trdstr *tp, union empobj_storage *tgp)
        }
        pr("] #%d", tp->trd_unitid);
        if (opt_SHOWPLANE) {
-           snxtitem_all(&ni, EF_PLANE);
+           snxtitem_cargo(&ni, EF_PLANE, EF_LAND, lp->lnd_uid);
            while (nxtitem(&ni, &plane)) {
-               if (plane.pln_land == lp->lnd_uid && plane.pln_own != 0) {
-                   pr("\n\t\t\t\t    tech %3d %3d%% %s #%d",
-                      plane.pln_tech,
-                      plane.pln_effic,
-                      plchr[(int)plane.pln_type].pl_name, plane.pln_uid);
-                   if (getnuke(nuk_on_plane(&plane), &nuke))
-                       pr("(%s)", nchr[nuke.nuk_type].n_name);
-               }
+               pr("\n\t\t\t\t    tech %3d %3d%% %s #%d",
+                  plane.pln_tech,
+                  plane.pln_effic,
+                  plchr[(int)plane.pln_type].pl_name, plane.pln_uid);
+               if (getnuke(nuk_on_plane(&plane), &nuke))
+                   pr("(%s)", nchr[nuke.nuk_type].n_name);
            }
        }
        getsect(lp->lnd_x, lp->lnd_y, &sect);