* Dave Pare, 1986
* Pat Loney, 1992
* Steve McClure, 1996-2000
+ * Markus Armbruster, 2004-2013
*/
#include <config.h>
int m;
int n;
time_t now;
- double tleft;
double gain;
double price;
if (comm.com_maxbidder == comm.com_owner || comm.com_owner == 0)
continue;
(void)time(&now);
- tleft = MARK_DELAY / 3600.0 - (now - comm.com_markettime) / 3600.0;
- if (tleft < 0)
- tleft = 0;
- if (tleft > 0.0)
+ if (comm.com_markettime + MARK_DELAY > now)
continue;
if (CANT_HAPPEN(comm.com_type <= I_NONE || comm.com_type > I_MAX))
continue;
* Dave Pare, 1986
* Pat Loney, 1992
* Steve McClure, 1996
+ * Markus Armbruster, 2004-2013
*/
#include <config.h>
static void
pr_mark(struct comstr *comm)
{
- time_t now;
- double tleft;
+ time_t now, tleft;
(void)time(&now);
- tleft = MARK_DELAY / 3600.0 - (now - comm->com_markettime) / 3600.0;
- if (tleft < 0.0)
- tleft = 0.0;
+ tleft = comm->com_markettime + MARK_DELAY - now;
+ if (tleft < 0)
+ tleft = 0;
pr(" %3d $%12.2f %2d %5.2f hrs (%3d) %c %6d ",
- comm->com_uid, comm->com_price, comm->com_maxbidder, tleft,
+ comm->com_uid, comm->com_price, comm->com_maxbidder, tleft / 3600.0,
comm->com_owner, ichr[comm->com_type].i_mnem, comm->com_amount);
if (comm->com_owner == player->cnum || player->god)
pr("%s", xyas(comm->sell_x, comm->sell_y, player->cnum));
struct trdstr tmpt;
union empobj_storage tg;
double canspend;
- time_t now;
+ time_t now, tleft;
int bid;
- double tleft;
double tally;
int i;
char buf[1024];
};
pr(" %3d ", ni.cur);
(void)time(&now);
- tleft =
- TRADE_DELAY / 3600.0 - (now - trade.trd_markettime) / 3600.0;
- if (tleft < 0.0)
- tleft = 0.0;
+ tleft = trade.trd_markettime + TRADE_DELAY - now;
+ if (tleft < 0)
+ tleft = 0;
pr("$%7d %2d %5.2f hrs ",
- trade.trd_price, trade.trd_maxbidder, tleft);
+ trade.trd_price, trade.trd_maxbidder, tleft / 3600.0);
trade_desc(&tg.gen); /* XXX */
pr("\n");
if (trade.trd_owner == player->cnum && !player->god)
struct trdstr trade;
union empobj_storage tg;
time_t now;
- double tleft;
int price;
int saveid;
natid seller;
continue;
(void)time(&now);
- tleft =
- TRADE_DELAY / 3600.0 - (now - trade.trd_markettime) / 3600.0;
- if (tleft < 0.0)
- tleft = 0.0;
- if (tleft > 0.0)
+ if (trade.trd_markettime + TRADE_DELAY > now)
continue;
saveid = trade.trd_unitid;