Drop trade_desc()'s first argument

diff --git a/include/trade.h b/include/trade.h
index f6a85776768a73ecec715ba9e25d2dce67f21f8a..f12fc97be6544448e911a87abbdb649490b81464 100644 (file)
--- a/include/trade.h
+++ b/include/trade.h
@@ -59,7 +59,7 @@ struct trdstr {
 
 extern int trade_check_ok(struct trdstr *, struct empobj *);
 extern char *trade_nameof(struct trdstr *, struct empobj *);
 
 extern int trade_check_ok(struct trdstr *, struct empobj *);
 extern char *trade_nameof(struct trdstr *, struct empobj *);

-extern int trade_desc(struct trdstr *, struct empobj *);
+extern int trade_desc(struct empobj *);

 extern int trade_getitem(struct trdstr *, union empobj_storage *);
 
 #define gettrade(n, p) ef_read(EF_TRADE, (n), (p))
 extern int trade_getitem(struct trdstr *, union empobj_storage *);
 
 #define gettrade(n, p) ef_read(EF_TRADE, (n), (p))

diff --git a/src/lib/commands/trad.c b/src/lib/commands/trad.c
index 0a9b33baeca5c4c9202ff2b2d8e6236113bad52a..f934a96b54fe67506ace45725b8e075027d421ce 100644 (file)
--- a/src/lib/commands/trad.c
+++ b/src/lib/commands/trad.c
@@ -103,7 +103,7 @@ trad(void)
            tleft = 0.0;
        pr("$%7ld  %2d %5.2f hrs ",
           trade.trd_price, trade.trd_maxbidder, tleft);
            tleft = 0.0;
        pr("$%7ld  %2d %5.2f hrs ",
           trade.trd_price, trade.trd_maxbidder, tleft);

-       trade_desc(&trade, &tg.gen);    /* XXX */
+       trade_desc(&tg.gen);    /* XXX */

        pr("\n");
        if (trade.trd_owner == player->cnum && !player->god)
            pr(" (your own lot)\n");
        pr("\n");
        if (trade.trd_owner == player->cnum && !player->god)
            pr(" (your own lot)\n");

diff --git a/src/lib/subs/trdsub.c b/src/lib/subs/trdsub.c
index 7833a6e66d3717f1fa8aaa9bbe30517864a469e7..93391497c9b0f30a8fcb0cd85af01465d41cc428 100644 (file)
--- a/src/lib/subs/trdsub.c
+++ b/src/lib/subs/trdsub.c
@@ -78,7 +78,7 @@ trade_nameof(struct trdstr *tp, struct empobj *tgp)
  * Return 1 on success, 0 on error
  */
 int
  * Return 1 on success, 0 on error
  */
 int

-trade_desc(struct trdstr *tp, struct empobj *tgp)
+trade_desc(struct empobj *tgp)

 {
     i_type it;
     struct sctstr sect;
 {
     i_type it;
     struct sctstr sect;


@@ -91,12 +91,12 @@ trade_desc(struct trdstr *tp, struct empobj *tgp)
     struct lndstr land;
     struct nukstr nuke;
 
     struct lndstr land;
     struct nukstr nuke;
 

-    switch (tp->trd_type) {
+    switch (tgp->ef_type) {

     case EF_NUKE:
        np = (struct nukstr *)tgp;
        pr("(%3d)  tech %d %d%% %s #%d",
           np->nuk_own, np->nuk_tech, np->nuk_effic,
     case EF_NUKE:
        np = (struct nukstr *)tgp;
        pr("(%3d)  tech %d %d%% %s #%d",
           np->nuk_own, np->nuk_tech, np->nuk_effic,

-          nchr[(int)np->nuk_type].n_name, tp->trd_unitid);
+          nchr[(int)np->nuk_type].n_name, np->nuk_uid);

        break;
     case EF_SHIP:
        sp = (struct shpstr *)tgp;
        break;
     case EF_SHIP:
        sp = (struct shpstr *)tgp;


@@ -107,7 +107,7 @@ trade_desc(struct trdstr *tp, struct empobj *tgp)
            if (sp->shp_item[it])
                pr("%c:%d ", ichr[it].i_mnem, sp->shp_item[it]);
        }
            if (sp->shp_item[it])
                pr("%c:%d ", ichr[it].i_mnem, sp->shp_item[it]);
        }

-       pr("] #%d", tp->trd_unitid);
+       pr("] #%d", sp->shp_uid);

        snxtitem_cargo(&ni, EF_PLANE, EF_SHIP, sp->shp_uid);
        while (nxtitem(&ni, &plane)) {
            pr("\n\t\t\t\t    tech %3d %3d%% %s #%d",
        snxtitem_cargo(&ni, EF_PLANE, EF_SHIP, sp->shp_uid);
        while (nxtitem(&ni, &plane)) {
            pr("\n\t\t\t\t    tech %3d %3d%% %s #%d",


@@ -152,7 +152,7 @@ trade_desc(struct trdstr *tp, struct empobj *tgp)
            if (lp->lnd_item[it])
                pr("%c:%d ", ichr[it].i_mnem, lp->lnd_item[it]);
        }
            if (lp->lnd_item[it])
                pr("%c:%d ", ichr[it].i_mnem, lp->lnd_item[it]);
        }

-       pr("] #%d", tp->trd_unitid);
+       pr("] #%d", lp->lnd_uid);

        break;
     case EF_PLANE:
        pp = (struct plnstr *)tgp;
        break;
     case EF_PLANE:
        pp = (struct plnstr *)tgp;


@@ -160,12 +160,12 @@ trade_desc(struct trdstr *tp, struct empobj *tgp)
           pp->pln_own,
           pp->pln_tech,
           pp->pln_effic,
           pp->pln_own,
           pp->pln_tech,
           pp->pln_effic,

-          plchr[(int)pp->pln_type].pl_name, tp->trd_unitid);
+          plchr[(int)pp->pln_type].pl_name, pp->pln_uid);

        if (getnuke(nuk_on_plane(pp), &nuke))
            pr("(%s)", nchr[nuke.nuk_type].n_name);
        break;
     default:
        if (getnuke(nuk_on_plane(pp), &nuke))
            pr("(%s)", nchr[nuke.nuk_type].n_name);
        break;
     default:

-       pr("flaky unit type %d", tp->trd_type);
+       pr("flaky unit type %d", tgp->uid);

        break;
     }
     return 1;
        break;
     }
     return 1;