Update copyright notice

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

diff --git a/src/lib/commands/trad.c b/src/lib/commands/trad.c
index 6a850568a76796dd151c2613100bb0804e4f891a..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-2013, 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
@@ -69,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];
@@ -96,15 +95,14 @@ 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;
+       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)
@@ -184,11 +182,10 @@ trad(void)
        || (trade.trd_type == EF_NUKE)) {
        while (1) {
            p = getstring("Destination sector: ", buf);
-           if (!trade_check_ok(&trade, &tg.gen))
+           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;
@@ -212,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.gen))
+           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;
@@ -281,7 +277,6 @@ check_trade(void)
     struct trdstr trade;
     union empobj_storage tg;
     time_t now;
-    double tleft;
     int price;
     int saveid;
     natid seller;
@@ -309,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;
@@ -430,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;
@@ -443,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;