(genitem_ca, ship_ca, plane_ca, land_ca): Remove selector "sell".
(comstr, trdstr): Members trd_price, com_price have no effect. Use
them instead of trd_maxprice, com_maxprice and remove the latter.
(commodity_ca, trade_ca): Remove selector "maxprice".
int com_amount;
float com_price;
int com_maxbidder;
- float com_maxprice;
time_t com_markettime;
coord com_x;
coord com_y;
s_char type;
s_char effic;
s_char mobil;
- short sell;
short tech;
s_char group;
coord opx, opy;
s_char lnd_type; /* index in lchr[] */
s_char lnd_effic; /* 0% to 100% */
s_char lnd_mobil; /* mobility units made int for RS/6000 */
- short lnd_sell; /* pointer to trade file */
short lnd_tech; /* tech level ship was built at */
s_char lnd_army; /* group membership */
coord lnd_opx, lnd_opy; /* Op sector coords */
s_char pln_type; /* index in plchr[] */
s_char pln_effic; /* actually "training" */
s_char pln_mobil; /* plane mobility */
- short pln_sell; /* index into trade file */
short pln_tech; /* plane's tech level */
s_char pln_wing; /* like fleet */
coord pln_opx; /* Op sector coords */
s_char shp_type; /* index in mchr[] */
s_char shp_effic; /* 0% to 100% */
s_char shp_mobil; /* mobility units */
- short shp_sell; /* pointer to trade file */
short shp_tech; /* tech level ship was built at */
s_char shp_fleet; /* group membership */
coord shp_opx, shp_opy; /* Op sector coords */
short trd_unitid;
long trd_price;
int trd_maxbidder;
- int trd_maxprice;
time_t trd_markettime;
coord trd_x;
coord trd_y;
ship.shp_nchoppers = 0;
ship.shp_fleet = ' ';
ship.shp_nv = 0;
- ship.shp_sell = 0;
ship.shp_tech = tlev;
techdiff = (int)(tlev - mp->m_tech);
} else {
land.lnd_mobil = 0;
}
- land.lnd_sell = 0;
land.lnd_tech = tlev;
land.lnd_uid = nstr.cur;
land.lnd_army = ' ';
(vec[I_CIVIL] + vec[I_MILIT] + vec[I_UW])+1;
if ((vec[I_FOOD]-max_amt) < food_needed)
max_amt = (vec[I_FOOD]-food_needed);
-
+
if (max_amt < 0)
max_amt = 0;
-
+
vec[I_FOOD] -= max_amt;
-
+
memset(lvec, 0, sizeof(lvec));
getvec(VT_ITEM, lvec, (s_char *)&land, EF_LAND);
lvec[I_FOOD] += max_amt;
plane.pln_uid = nstr.cur;
plane.pln_nuketype = -1;
plane.pln_harden = 0;
- plane.pln_sell = 0;
plane.pln_flags = 0;
makenotlost(EF_PLANE, plane.pln_own, plane.pln_uid, plane.pln_x,
plane.pln_y);
for (q = 0; gettrade(q, &tmpt); q++) {
if (tmpt.trd_maxbidder == player->cnum &&
tmpt.trd_unitid >= 0 && tmpt.trd_owner != player->cnum) {
- tally += tmpt.trd_maxprice * tradetax;
+ tally += tmpt.trd_price * tradetax;
}
}
for (q = 0; getcomm(q, &comt); q++) {
if (comt.com_maxbidder == player->cnum &&
comt.com_owner != 0 && comt.com_owner != player->cnum) {
- tally += (comt.com_maxprice * comt.com_amount) * buytax;
+ tally += (comt.com_price * comt.com_amount) * buytax;
}
}
canspend = natp->nat_money - tally;
pr("That lot has been taken off the market.\n");
return RET_FAIL;
}
- if (bid > 0.04 + comm.com_maxprice) {
- comm.com_maxprice = bid;
+ if (bid > 0.04 + comm.com_price) {
+ comm.com_price = bid;
/* Add five minutes to the time if less than 5 minutes */
time(&now);
if (((MARK_DELAY - (now - comm.com_markettime)) < 300) &&
monleft = 0;
- price = comm.com_maxprice * comm.com_amount * buytax;
- gain = comm.com_maxprice * comm.com_amount;
+ price = comm.com_price * comm.com_amount * buytax;
+ gain = comm.com_price * comm.com_amount;
natp = getnatp(comm.com_maxbidder);
tmoney = natp->nat_money;
tleft = 0.0;
pr(" %3d $%12.2f %2d %5.2f hrs (%3d) %c %6d ",
comm->com_uid,
- comm->com_maxprice,
+ comm->com_price,
comm->com_maxbidder,
tleft, comm->com_owner, comm->com_type, comm->com_amount);
if (comm->com_owner == player->cnum || player->god)
continue;
if (cheapest_items[i] != -1) {
getcomm(cheapest_items[i], &comm2);
- if (comm.com_maxprice < comm2.com_maxprice) {
+ if (comm.com_price < comm2.com_price) {
cheapest_items[i] = sellers;
}
} else {
land.lnd_type = type;
land.lnd_effic = 100;
land.lnd_mobil = land_mob_max;
- land.lnd_sell = 0;
land.lnd_tech = tlev;
land.lnd_uid = nstr.cur;
land.lnd_army = ' ';
comm.com_price = price;
(void)time(&now);
comm.com_markettime = now;
- if ((int)price < comm.com_maxprice)
- comm.com_maxprice = (int)price;
if (!putcomm(number_set, &comm)) {
pr("Problems with the commodities file, Call the Deity\n");
return RET_OK;
comm.com_owner = player->cnum;
comm.com_price = price;
comm.com_maxbidder = player->cnum;
- comm.com_maxprice = price;
comm.com_markettime = now;
comm.com_amount = totalcom;
comm.com_x = 0;
(void)time(&now);
trade.trd_markettime = now;
trade.trd_maxbidder = player->cnum;
- trade.trd_maxprice = 0;
puttrade(ni_trade.cur, &trade);
} else if (price > 0) {
trade.trd_x = item.gen.trg_x;
(void)time(&now);
trade.trd_markettime = now;
trade.trd_maxbidder = player->cnum;
- trade.trd_maxprice = price;
if (foundslot >= 0)
id = foundslot;
else if (freeslot >= 0)
TRADE_DELAY / 3600.0 - (now - trade.trd_markettime) / 3600.0;
if (tleft < 0.0)
tleft = 0.0;
- pr("$%7d %2d %5.2f hrs ", trade.trd_maxprice,
+ pr("$%7d %2d %5.2f hrs ", trade.trd_price,
trade.trd_maxbidder, tleft);
(void)trade_desc(&trade, &tg); /* XXX */
pr("\n");
pr("You can't buy from yourself!\n");
return RET_OK;
}
- price = trade.trd_maxprice;
+ price = trade.trd_price;
natp = getnatp(player->cnum);
if (natp->nat_money < price) {
pr("You don't have %.2f to spend!\n", price);
for (q = 0; gettrade(q, &tmpt); q++) {
if (tmpt.trd_maxbidder == player->cnum &&
tmpt.trd_unitid >= 0 && tmpt.trd_owner != player->cnum) {
- tally += tmpt.trd_maxprice * tradetax;
+ tally += tmpt.trd_price * tradetax;
}
}
for (q = 0; getcomm(q, &comt); q++) {
if (comt.com_maxbidder == player->cnum &&
comt.com_owner != 0 && comt.com_owner != player->cnum) {
- tally += (comt.com_maxprice * comt.com_amount) * buytax;
+ tally += (comt.com_price * comt.com_amount) * buytax;
}
}
canspend = natp->nat_money - tally;
pr("You don't have %.2f to spend!\n", price);
return RET_OK;
}
- if (bid > trade.trd_maxprice) {
+ if (bid > trade.trd_price) {
/* Add five minutes to the time if less than 5 minutes left. */
time(&now);
if (((TRADE_DELAY - (now - trade.trd_markettime)) < 300) &&
trade.trd_maxbidder != player->cnum)
trade.trd_markettime += 300;
- trade.trd_maxprice = bid;
+ trade.trd_price = bid;
trade.trd_maxbidder = player->cnum;
trade.trd_x = sx;
trade.trd_y = sy;
}
monleft = 0;
- price = trade.trd_maxprice;
+ price = trade.trd_price;
natp = getnatp(trade.trd_maxbidder);
if (natp->nat_money <= 0)
monleft = price;
{ NSC_UCHAR | NSC_OFF | fldoff(genitem, type), "type", 0},\
{ NSC_UCHAR | NSC_OFF | fldoff(genitem, effic), "effic", 0},\
{ NSC_CHAR | NSC_OFF | fldoff(genitem, mobil), "mobil", 0},\
-{ NSC_SHORT | NSC_OFF | fldoff(genitem, sell), "sell", 0},\
{ NSC_SHORT | NSC_OFF | fldoff(genitem, tech), "tech", 0},\
{ NSC_CHAR | NSC_OFF | fldoff(genitem, group), "group", 0},\
{ NSC_XCOORD | NSC_OFF | fldoff(genitem, opx), "opx", 0},\
{NSC_UCHAR | NSC_OFF | fldoff(comstr, com_type), "type", 0},
{NSC_INT | NSC_OFF | fldoff(comstr, com_amount), "amount", 0},
{NSC_INT | NSC_OFF | fldoff(comstr, com_maxbidder), "maxbidder", 0},
- {NSC_FLOAT | NSC_OFF | fldoff(comstr, com_maxprice), "maxprice", 0},
{NSC_TIME | NSC_OFF | fldoff(comstr, com_markettime), "markettime", 0},
/* could let maxbidder access these, but we can't express that yet: */
{NSC_DEITY | NSC_INT | NSC_OFF | fldoff(comstr, com_x), "xbuy", 0},
{NSC_SHORT | NSC_OFF | fldoff(trdstr, trd_unitid), "unitid", 0},
{NSC_LONG | NSC_OFF | fldoff(trdstr, trd_price), "price", 0},
{NSC_INT | NSC_OFF | fldoff(trdstr, trd_maxbidder), "maxbidder", 0},
- {NSC_INT | NSC_OFF | fldoff(trdstr, trd_maxprice), "maxprice", 0},
{NSC_TIME | NSC_OFF | fldoff(trdstr, trd_markettime), "markettime", 0},
+ /* could let the owner access these, but we can't express that yet: */
{NSC_DEITY | NSC_XCOORD | NSC_OFF | fldoff(trdstr, trd_x), "xloc", 0},
{NSC_DEITY | NSC_YCOORD | NSC_OFF | fldoff(trdstr, trd_y), "yloc", 0},
{0, 0, 0}