Update copyright notice.

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

diff --git a/src/lib/subs/trdsub.c b/src/lib/subs/trdsub.c
index bb2c3471d5df30f63f4d278bd64b002591bca933..b687fa8a3765244a40e284326cd703f0cc8df610 100644 (file)
--- a/src/lib/subs/trdsub.c
+++ b/src/lib/subs/trdsub.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2006, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2007, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -35,57 +35,58 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "sect.h"
-#include "nat.h"
+#include "empobj.h"
+#include "file.h"
 #include "item.h"
-#include "ship.h"
 #include "land.h"
+#include "loan.h"
+#include "misc.h"
+#include "nat.h"
+#include "nsc.h"
 #include "nuke.h"
+#include "optlist.h"
 #include "plane.h"
+#include "player.h"
+#include "prototypes.h"
+#include "sect.h"
+#include "ship.h"
 #include "trade.h"
 #include "xy.h"
-#include "nsc.h"
-#include "file.h"
-#include "loan.h"
-#include "prototypes.h"
-#include "optlist.h"
 
 int
-trade_check_ok(struct trdstr *tp, union trdgenstr *tgp)
+trade_check_ok(struct trdstr *tp, union empobj_storage *tgp)
 {
     return check_trade_ok(tp) && trade_check_item_ok(tgp);
 }
 
 int
-trade_check_item_ok(union trdgenstr *tgp)
+trade_check_item_ok(union empobj_storage *tgp)
 {
     if (tgp->gen.ef_type == EF_LAND)
-       return check_land_ok(&tgp->lnd);
+       return check_land_ok(&tgp->land);
     if (tgp->gen.ef_type == EF_PLANE)
-       return check_plane_ok(&tgp->pln);
+       return check_plane_ok(&tgp->plane);
     if (tgp->gen.ef_type == EF_SHIP)
-       return check_ship_ok(&tgp->shp);
+       return check_ship_ok(&tgp->ship);
     if (tgp->gen.ef_type == EF_NUKE)
-       return check_nuke_ok(&tgp->nuk);
+       return check_nuke_ok(&tgp->nuke);
     CANT_REACH();
     pr("Trade lot went bad!\n");
     return 0;
 }
 
 char *
-trade_nameof(struct trdstr *tp, union trdgenstr *tgp)
+trade_nameof(struct trdstr *tp, union empobj_storage *tgp)
 {
     switch (tp->trd_type) {
     case EF_NUKE:
-       return nchr[(int)tgp->nuk.nuk_type].n_name;
+       return nchr[(int)tgp->nuke.nuk_type].n_name;
     case EF_PLANE:
-       return plchr[(int)tgp->pln.pln_type].pl_name;
+       return plchr[(int)tgp->plane.pln_type].pl_name;
     case EF_SHIP:
-       return mchr[(int)tgp->shp.shp_type].m_name;
+       return mchr[(int)tgp->ship.shp_type].m_name;
     case EF_LAND:
-       return lchr[(int)tgp->lnd.lnd_type].l_name;
+       return lchr[(int)tgp->land.lnd_type].l_name;
     }
     return "Bad trade type, get help";
 }
@@ -96,30 +97,28 @@ trade_nameof(struct trdstr *tp, union trdgenstr *tgp)
  * Return 1 on success, 0 on error
  */
 int
-trade_desc(struct trdstr *tp, union trdgenstr *tgp)
+trade_desc(struct trdstr *tp, union empobj_storage *tgp)
 {
-    int i;
     i_type it;
     struct sctstr sect;
     struct nukstr *np;
     struct shpstr *sp;
     struct plnstr *pp;
     struct lndstr *lp;
-    int needcomma;
     struct nstr_item ni;
     struct plnstr plane;
     struct lndstr land;
 
     switch (tp->trd_type) {
     case EF_NUKE:
-       np = &tgp->nuk;
+       np = &tgp->nuke;
        tp->trd_owner = np->nuk_own;
        pr("(%3d)  tech %d %d%% %s #%d",
           tp->trd_owner, np->nuk_tech, np->nuk_effic,
           nchr[(int)np->nuk_type].n_name, tp->trd_unitid);
        break;
     case EF_SHIP:
-       sp = &tgp->shp;
+       sp = &tgp->ship;
        tp->trd_owner = sp->shp_own;
        pr("(%3d)  tech %d %d%% %s [",
           tp->trd_owner, sp->shp_tech, sp->shp_effic, prship(sp));
@@ -170,13 +169,13 @@ trade_desc(struct trdstr *tp, union trdgenstr *tgp)
        }
        getsect(sp->shp_x, sp->shp_y, &sect);
        if (sect.sct_type != SCT_WATER)
-           pr(" in a %s %s", cname(sect.sct_own),
-              dchr[sect.sct_type].d_name);
+           pr(" in a %s %s",
+              cname(sect.sct_own), dchr[sect.sct_type].d_name);
        else
            pr(" at sea");
        break;
     case EF_LAND:
-       lp = &tgp->lnd;
+       lp = &tgp->land;
        tp->trd_owner = lp->lnd_own;
        pr("(%3d)  tech %d %d%% %s [",
           tp->trd_owner,
@@ -203,7 +202,7 @@ trade_desc(struct trdstr *tp, union trdgenstr *tgp)
        getsect(lp->lnd_x, lp->lnd_y, &sect);
        break;
     case EF_PLANE:
-       pp = &tgp->pln;
+       pp = &tgp->plane;
        tp->trd_owner = pp->pln_own;
        pr("(%3d)  tech %d %d%% %s #%d",
           tp->trd_owner,
@@ -222,7 +221,7 @@ trade_desc(struct trdstr *tp, union trdgenstr *tgp)
 }
 
 int
-trade_getitem(struct trdstr *tp, union trdgenstr *tgp)
+trade_getitem(struct trdstr *tp, union empobj_storage *tgp)
 {
     if (!ef_read(tp->trd_type, tp->trd_unitid, tgp))
        return 0;