From 05f64e8c3ff5606c0d4f03e285f59f54e8e5625b Mon Sep 17 00:00:00 2001
From: Markus Armbruster <armbru@pond.sub.org>
Date: Sat, 25 Mar 2006 15:03:32 +0000
Subject: [PATCH] (genstr): Redundant.  Replace by struct genitem.

---
 include/trade.h         | 11 +----------
 src/lib/commands/set.c  |  6 +++---
 src/lib/commands/trad.c | 12 ++++++------
 3 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/include/trade.h b/include/trade.h
index e3eb83f0e..81f71e07b 100644
--- 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 dd705238a..7f888e089 100644
--- 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 70c9dbd0e..abd8fc6f5 100644
--- 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;
-- 
2.43.0