/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2012, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ * Copyright (C) 1986-2013, Dave Pare, Jeff Bailey, Thomas Ruschak,
* Ken Stevens, Steve McClure, Markus Armbruster
*
* Empire is free software: you can redistribute it and/or modify
* 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);
trade_desc(&tg.gen); /* XXX */
pr("\n");
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;
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",
+ "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");
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",
+ "The bidding is over & you bought %s #%d from %s for $%d\n",
trade_nameof(&trade, &tg.gen), saveid, cname(seller),
price);
}