Update copyright notice

[empserver] / src / lib / commands / trad.c

diff --git a/src/lib/commands/trad.c b/src/lib/commands/trad.c
index a524b65f8fccfa50dbf35c0b7165249bf642d93f..c3f7c09d10fc662d8e51b27d4d40e37aaaf545a2 100644 (file)
--- a/src/lib/commands/trad.c
+++ b/src/lib/commands/trad.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2013, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2014, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                Ken Stevens, Steve McClure, Markus Armbruster
  *
  *  Empire is free software: you can redistribute it and/or modify
@@ -30,11 +30,13 @@
  *     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"
@@ -67,9 +69,8 @@ trad(void)
     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];
@@ -97,12 +98,11 @@ trad(void)
        };
        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;
-       pr("$%7ld  %2d %5.2f hrs ",
-          trade.trd_price, trade.trd_maxbidder, tleft);
+       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 / 3600.0);
        trade_desc(&tg.gen);    /* XXX */
        pr("\n");
        if (trade.trd_owner == player->cnum && !player->god)
@@ -252,11 +252,10 @@ trad(void)
        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;
@@ -280,8 +279,7 @@ check_trade(void)
     struct trdstr trade;
     union empobj_storage tg;
     time_t now;
-    double tleft;
-    float price;
+    int price;
     int saveid;
     natid seller;
 
@@ -308,11 +306,7 @@ check_trade(void)
            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;
@@ -336,7 +330,7 @@ check_trade(void)
            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");
@@ -401,7 +395,7 @@ check_trade(void)
           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);
     }