/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2009, Dave Pare, Jeff Bailey, Thomas Ruschak,
- * Ken Stevens, Steve McClure
+ * Copyright (C) 1986-2013, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ * Ken Stevens, Steve McClure, Markus Armbruster
*
- * This program is free software; you can redistribute it and/or modify
+ * Empire is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* ---
*
* Dave Pare, 1986
* Pat Loney, 1992
* Steve McClure, 1996-2000
+ * Markus Armbruster, 2004-2013
*/
#include <config.h>
#include <ctype.h>
+#include "chance.h"
#include "commands.h"
#include "commodity.h"
#include "empobj.h"
TRADE_DELAY / 3600.0 - (now - trade.trd_markettime) / 3600.0;
if (tleft < 0.0)
tleft = 0.0;
- pr("$%7ld %2d %5.2f hrs ",
+ pr("$%7d %2d %5.2f hrs ",
trade.trd_price, trade.trd_maxbidder, tleft);
- (void)trade_desc(&trade, &tg); /* XXX */
+ trade_desc(&tg.gen); /* XXX */
pr("\n");
if (trade.trd_owner == player->cnum && !player->god)
pr(" (your own lot)\n");
}
}
canspend = natp->nat_money - tally;
- /*
- * Find the destination sector for the plane before the trade is
- * actually made, except for satellites in orbit. Must be owned
- * and must be a 60% airfield (except for VTOL planes).
- */
+
+ /* Find the destination sector for the trade */
if (((trade.trd_type == EF_PLANE) && !pln_is_in_orbit(&tg.plane))
|| (trade.trd_type == EF_NUKE)) {
while (1) {
p = getstring("Destination sector: ", buf);
- if (!trade_check_ok(&trade, &tg))
+ if (!trade_check_ok(&trade, &tg.gen))
return RET_FAIL;
if (!p) {
return RET_FAIL;
}
break;
}
- }
- if (trade.trd_type == EF_LAND) {
+ } else if (trade.trd_type == EF_LAND) {
while (1) {
p = getstring("Destination sector: ", buf);
- if (!trade_check_ok(&trade, &tg))
+ if (!trade_check_ok(&trade, &tg.gen))
return RET_FAIL;
if (!p) {
return RET_FAIL;
}
break;
}
+ } else {
+ /* This trade doesn't teleport; make destination invalid */
+ sx = 1;
+ sy = 0;
}
p = getstring("How much do you bid: ", buf);
if (!p || !*p)
return RET_OK;
- if (!trade_check_ok(&trade, &tg))
+ if (!trade_check_ok(&trade, &tg.gen))
return RET_FAIL;
bid = atoi(p);
if (bid < price)
return RET_OK;
}
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) &&
+ if (trade.trd_markettime + TRADE_DELAY - now < minutes(5) &&
trade.trd_maxbidder != player->cnum)
- trade.trd_markettime += 300;
+ trade.trd_markettime = now + minutes(5) - TRADE_DELAY;
trade.trd_price = bid;
trade.trd_maxbidder = player->cnum;
trade.trd_x = sx;
union empobj_storage tg;
time_t now;
double tleft;
- float price;
+ int price;
int saveid;
+ natid seller;
for (n = 0; gettrade(n, &trade); n++) {
if (trade.trd_unitid < 0)
continue;
saveid = trade.trd_unitid;
+ seller = trade.trd_owner;
trade.trd_owner = 0;
trade.trd_unitid = -1;
if (!puttrade(n, &trade)) {
price = trade.trd_price;
natp = getnatp(trade.trd_maxbidder);
if (natp->nat_money < price) {
- nreport(trade.trd_maxbidder, N_WELCH_DEAL, trade.trd_owner, 1);
- wu(0, trade.trd_owner,
+ nreport(trade.trd_maxbidder, N_WELCH_DEAL, seller, 1);
+ wu(0, seller,
"%s tried to buy a %s #%d from you for $%.2f\n",
- cname(trade.trd_maxbidder), trade_nameof(&trade, &tg),
+ cname(trade.trd_maxbidder), trade_nameof(&trade, &tg.gen),
saveid, price * tradetax);
- wu(0, trade.trd_owner, " but couldn't afford it.\n");
- wu(0, trade.trd_owner,
+ wu(0, seller, " but couldn't afford it.\n");
+ wu(0, seller,
" Your item was taken off the market.\n");
wu(0, trade.trd_maxbidder,
- "You tried to buy %s #%d from %s for $%.2f\n",
- trade_nameof(&trade, &tg), saveid, cname(trade.trd_owner),
+ "You tried to buy %s #%d from %s for $%d\n",
+ trade_nameof(&trade, &tg.gen), saveid, cname(seller),
price);
wu(0, trade.trd_maxbidder, "but couldn't afford it.\n");
continue;
natp->nat_money -= price;
putnat(natp);
- natp = getnatp(trade.trd_owner);
+ natp = getnatp(seller);
natp->nat_money += roundavg(price * tradetax);
putnat(natp);
unit_give_away(&tg.gen, trade.trd_maxbidder, 0);
put_empobj(trade.trd_type, saveid, &tg.gen);
- nreport(trade.trd_owner, N_MAKE_SALE, trade.trd_maxbidder, 1);
- wu(0, trade.trd_owner, "%s bought a %s #%d from you for $%.2f\n",
- cname(trade.trd_maxbidder), trade_nameof(&trade, &tg),
+ nreport(seller, N_MAKE_SALE, trade.trd_maxbidder, 1);
+ wu(0, seller, "%s bought %s #%d from you for $%.2f\n",
+ cname(trade.trd_maxbidder), trade_nameof(&trade, &tg.gen),
saveid, price * tradetax);
wu(0, trade.trd_maxbidder,
- "The bidding is over & you bought %s #%d from %s for $%.2f\n",
- trade_nameof(&trade, &tg), saveid, cname(trade.trd_owner),
+ "The bidding is over & you bought %s #%d from %s for $%d\n",
+ trade_nameof(&trade, &tg.gen), saveid, cname(seller),
price);
- }
+ }
return RET_OK;
}
projects / empserver / blobdiff