(genstr): Redundant. Replace by struct genitem.

diff --git a/include/trade.h b/include/trade.h
index e3eb83f0e15d683bd0cef6d8db561f8476b3191d..81f71e07b66792647b85ffea7f104cb1a7b0ae52 100644 (file)
--- a/include/trade.h
+++ b/include/trade.h
@@ -56,17 +56,8 @@ struct trdstr {
     coord trd_y;
 };
 
-struct genstr {
-    short trg_ef_type;
-    natid trg_own;
-    short trg_uid;
-    coord trg_x;
-    coord trg_y;
-    s_char trg_type;
-};
-
 union trdgenstr {
-    struct genstr gen;
+    struct genitem gen;
     struct nukstr nuk;
     struct plnstr pln;
     struct lndstr lnd;

diff --git a/src/lib/commands/set.c b/src/lib/commands/set.c
index dd705238a9ee97415655d364c84e97ecdbf47a84..7f888e089df19716845d39c64a721b6e1730add4 100644 (file)
--- a/src/lib/commands/set.c
+++ b/src/lib/commands/set.c
@@ -90,7 +90,7 @@ set(void)
     while (nxtitem(&ni, &item)) {
        if (!player->owner && !player->god)
            continue;
-       getsect(item.gen.trg_x, item.gen.trg_y, &sect);
+       getsect(item.gen.x, item.gen.y, &sect);
        if (!military_control(&sect)) {
            pr("Military control required to sell goods.\n");
            return RET_FAIL;
@@ -134,8 +134,8 @@ set(void)
                ef_extend(EF_TRADE, 1);
                id = ni_trade.cur;
            }
-           trade.trd_x = item.gen.trg_x;
-           trade.trd_y = item.gen.trg_y;
+           trade.trd_x = item.gen.x;
+           trade.trd_y = item.gen.y;
            trade.trd_type = type;
            trade.trd_owner = player->cnum;
            trade.trd_uid = id;

diff --git a/src/lib/commands/trad.c b/src/lib/commands/trad.c
index 70c9dbd0e7b3e176c31444d13c05119e4d40abdd..abd8fc6f58ad1a686003011cd6428f9f07be010f 100644 (file)
--- a/src/lib/commands/trad.c
+++ b/src/lib/commands/trad.c
@@ -104,7 +104,7 @@ trad(void)
            continue;
        };
        /* fix up database if things get weird */
-       /*if (trade.trd_owner != tg.gen.trg_own) {
+       /*if (trade.trd_owner != tg.gen.own) {
           trade.trd_unitid = -1;
           (void) puttrade(ni.cur, &trade);
           continue;
@@ -314,13 +314,13 @@ check_trade(void)
            continue;
        if (!trade_getitem(&trade, &tg))
            continue;
-       if (tg.gen.trg_own == 0) {
+       if (tg.gen.own == 0) {
            trade.trd_unitid = -1;
            puttrade(n, &trade);
            continue;
        }
-       if (tg.gen.trg_own != trade.trd_owner) {
-           logerror("Something weird, tg.gen.trg_own != trade.trd_owner!\n");
+       if (tg.gen.own != trade.trd_owner) {
+           logerror("Something weird, tg.gen.own != trade.trd_owner!\n");
            trade.trd_unitid = -1;
            puttrade(n, &trade);
            continue;
@@ -509,7 +509,7 @@ ontradingblock(int type, int *ptr)
            continue;
        if (trade.trd_type != type)
            continue;
-       if (tg.gen.trg_uid == ((struct genstr *)ptr)->trg_uid)
+       if (tg.gen.uid == ((struct genitem *)ptr)->uid)
            return 1;
     }
     return 0;
@@ -530,7 +530,7 @@ trdswitchown(int type, int *ptr, int newown)
            continue;
        if (trade.trd_type != type)
            continue;
-       if (tg.gen.trg_uid != ((struct genstr *)ptr)->trg_uid)
+       if (tg.gen.uid != ((struct genitem *)ptr)->uid)
            continue;
        if (trade.trd_owner == trade.trd_maxbidder)
            trade.trd_maxbidder = newown;