Update copyright notice

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

diff --git a/src/lib/commands/trad.c b/src/lib/commands/trad.c
index 5047797fc9729209c71160c7c46f0421a140fb15..2e24a29b82d69c67b5c1f5587fef278af7065eae 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-2011, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2017, 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];
@@ -94,16 +95,15 @@ trad(void)
            continue;
        if (!trade_getitem(&trade, &tg)) {
            continue;
-       };
+       }
        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);
-       (void)trade_desc(&trade, &tg);  /* XXX */
+       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)
            pr(" (your own lot)\n");
@@ -182,11 +182,10 @@ trad(void)
        || (trade.trd_type == EF_NUKE)) {
        while (1) {
            p = getstring("Destination sector: ", buf);
-           if (!trade_check_ok(&trade, &tg))
+           if (!p)
                return RET_FAIL;
-           if (!p) {
+           if (!trade_check_ok(&trade, &tg.gen))
                return RET_FAIL;
-           }
            if (!sarg_xy(p, &sx, &sy) || !getsect(sx, sy, &sect)) {
                pr("Bad sector designation; try again!\n");
                continue;
@@ -210,11 +209,10 @@ trad(void)
     } else if (trade.trd_type == EF_LAND) {
        while (1) {
            p = getstring("Destination sector: ", buf);
-           if (!trade_check_ok(&trade, &tg))
+           if (!p)
                return RET_FAIL;
-           if (!p) {
+           if (!trade_check_ok(&trade, &tg.gen))
                return RET_FAIL;
-           }
            if (!sarg_xy(p, &sx, &sy) || !getsect(sx, sy, &sect)) {
                pr("Bad sector designation; try again!\n");
                continue;
@@ -242,7 +240,7 @@ trad(void)
     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)
@@ -252,11 +250,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 +277,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 +304,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;
@@ -330,14 +322,14 @@ check_trade(void)
            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, 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(seller),
+              "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;
@@ -398,11 +390,11 @@ check_trade(void)
 
        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),
+          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(seller),
+          "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;
@@ -429,7 +421,7 @@ ontradingblock(int type, void *ptr)
 }
 
 void
-trdswitchown(int type, void *ptr, int newown)
+trdswitchown(int type, struct empobj *obj, int newown)
 {
     struct trdstr trade;
     union empobj_storage tg;
@@ -442,7 +434,7 @@ trdswitchown(int type, void *ptr, int newown)
            continue;
        if (trade.trd_type != type)
            continue;
-       if (tg.gen.uid != ((struct empobj *)ptr)->uid)
+       if (tg.gen.uid != obj->uid)
            continue;
        if (trade.trd_owner == trade.trd_maxbidder)
            trade.trd_maxbidder = newown;