empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(genstr): Redundant. Replace by struct genitem.

Browse source
This commit is contained in:
Markus Armbruster 2006-03-25 15:03:32 +00:00
parent 94d0c81e55
commit 05f64e8c3f
3 changed files with 10 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

11
include/trade.h
View file

@ -56,17 +56,8 @@ struct trdstr {
coord trd_y; 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 { union trdgenstr {
struct genstr gen; struct genitem gen;
struct nukstr nuk; struct nukstr nuk;
struct plnstr pln; struct plnstr pln;
struct lndstr lnd; struct lndstr lnd;

6
src/lib/commands/set.c
View file

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

12
src/lib/commands/trad.c
View file

@ -104,7 +104,7 @@ trad(void)
continue; continue;
}; };
/* fix up database if things get weird */ /* 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; trade.trd_unitid = -1;
(void) puttrade(ni.cur, &trade); (void) puttrade(ni.cur, &trade);
continue; continue;
@ -314,13 +314,13 @@ check_trade(void)
continue; continue;
if (!trade_getitem(&trade, &tg)) if (!trade_getitem(&trade, &tg))
continue; continue;
if (tg.gen.trg_own == 0) { if (tg.gen.own == 0) {
trade.trd_unitid = -1; trade.trd_unitid = -1;
puttrade(n, &trade); puttrade(n, &trade);
continue; continue;
} }
if (tg.gen.trg_own != trade.trd_owner) { if (tg.gen.own != trade.trd_owner) {
logerror("Something weird, tg.gen.trg_own != trade.trd_owner!\n"); logerror("Something weird, tg.gen.own != trade.trd_owner!\n");
trade.trd_unitid = -1; trade.trd_unitid = -1;
puttrade(n, &trade); puttrade(n, &trade);
continue; continue;
@ -509,7 +509,7 @@ ontradingblock(int type, int *ptr)
continue; continue;
if (trade.trd_type != type) if (trade.trd_type != type)
continue; continue;
if (tg.gen.trg_uid == ((struct genstr *)ptr)->trg_uid) if (tg.gen.uid == ((struct genitem *)ptr)->uid)
return 1; return 1;
} }
return 0; return 0;
@ -530,7 +530,7 @@ trdswitchown(int type, int *ptr, int newown)
continue; continue;
if (trade.trd_type != type) if (trade.trd_type != type)
continue; continue;
if (tg.gen.trg_uid != ((struct genstr *)ptr)->trg_uid) if (tg.gen.uid != ((struct genitem *)ptr)->uid)
continue; continue;
if (trade.trd_owner == trade.trd_maxbidder) if (trade.trd_owner == trade.trd_maxbidder)
trade.trd_maxbidder = newown; trade.trd_maxbidder = newown;