From 4f3d6792e328ec9fe407b06df382dfd8f8ddb900 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Sun, 1 Jul 2012 13:03:05 +0200 Subject: [PATCH] Drop unclean assignments in trade_desc() Assigning to tp->trd_owner is unclean. Can be dropped safely, because it has no effect: prior check_trade() drops all trades where the assignment would change anything. --- src/lib/subs/trdsub.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/lib/subs/trdsub.c b/src/lib/subs/trdsub.c index 645785a5d..7833a6e66 100644 --- a/src/lib/subs/trdsub.c +++ b/src/lib/subs/trdsub.c @@ -94,16 +94,14 @@ trade_desc(struct trdstr *tp, struct empobj *tgp) switch (tp->trd_type) { case EF_NUKE: np = (struct nukstr *)tgp; - tp->trd_owner = np->nuk_own; pr("(%3d) tech %d %d%% %s #%d", - tp->trd_owner, np->nuk_tech, np->nuk_effic, + np->nuk_own, np->nuk_tech, np->nuk_effic, nchr[(int)np->nuk_type].n_name, tp->trd_unitid); break; case EF_SHIP: sp = (struct shpstr *)tgp; - tp->trd_owner = sp->shp_own; pr("(%3d) tech %d %d%% %s [", - tp->trd_owner, sp->shp_tech, sp->shp_effic, prship(sp)); + sp->shp_own, sp->shp_tech, sp->shp_effic, prship(sp)); for (it = I_NONE + 1; it <= I_MAX; ++it) { if (sp->shp_item[it]) @@ -147,9 +145,8 @@ trade_desc(struct trdstr *tp, struct empobj *tgp) break; case EF_LAND: lp = (struct lndstr *)tgp; - tp->trd_owner = lp->lnd_own; pr("(%3d) tech %d %d%% %s [", - tp->trd_owner, + lp->lnd_own, lp->lnd_tech, lp->lnd_effic, lchr[(int)lp->lnd_type].l_name); for (it = I_NONE + 1; it <= I_MAX; ++it) { if (lp->lnd_item[it]) @@ -159,9 +156,8 @@ trade_desc(struct trdstr *tp, struct empobj *tgp) break; case EF_PLANE: pp = (struct plnstr *)tgp; - tp->trd_owner = pp->pln_own; pr("(%3d) tech %d %d%% %s #%d", - tp->trd_owner, + pp->pln_own, pp->pln_tech, pp->pln_effic, plchr[(int)pp->pln_type].pl_name, tp->trd_unitid); -- 2.43.0