commands: Rename the command functions

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

diff --git a/src/lib/commands/trad.c b/src/lib/commands/trad.c
index fa122e8b0d11e629bc414a964f0bdf7f0ba3c2f1..e29388af354465d5d1b1e25e4c4f176bc662b92f 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-2021, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                Ken Stevens, Steve McClure, Markus Armbruster
  *
  *  Empire is free software: you can redistribute it and/or modify
@@ -30,7 +30,7 @@
  *     Dave Pare, 1986
  *     Pat Loney, 1992
  *     Steve McClure, 1996-2000
- *     Markus Armbruster, 2004-2013
+ *     Markus Armbruster, 2004-2018
  */
 
 #include <config.h>
@@ -54,7 +54,7 @@
  * format: trade
  */
 int
-trad(void)
+c_trade(void)
 {
     struct sctstr sect;
     struct natstr *natp;
@@ -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)
@@ -125,18 +123,13 @@ trad(void)
        pr("Bad lot number\n");
        return RET_OK;
     }
-    if (!gettrade(lotno, &trade)) {
+    if (!gettrade(lotno, &trade) || !trade.trd_owner) {
        pr("No such lot number\n");
        return RET_OK;
     }
-    if (trade.trd_unitid < 0) {
-       pr("Invalid lot number.\n");
-       return RET_OK;
-    }
     if (!trade_getitem(&trade, &tg)) {
        pr("Can't find trade #%d!\n", trade.trd_unitid);
        trade.trd_owner = 0;
-       trade.trd_unitid = -1;
        if (!puttrade(lotno, &trade)) {
            logerror("trad: can't write trade");
            pr("Couldn't save after getitem failed; get help!\n");
@@ -166,8 +159,10 @@ trad(void)
     }
     tally = 0.0;
     for (i = 0; gettrade(i, &tmpt); i++) {
+       if (!tmpt.trd_owner)
+           continue;
        if (tmpt.trd_maxbidder == player->cnum &&
-           tmpt.trd_unitid >= 0 && tmpt.trd_owner != player->cnum) {
+           tmpt.trd_owner != player->cnum) {
            tally += tmpt.trd_price * tradetax;
        }
     }
@@ -184,11 +179,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 +206,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;
@@ -254,11 +247,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;
@@ -282,26 +274,23 @@ check_trade(void)
     struct trdstr trade;
     union empobj_storage tg;
     time_t now;
-    double tleft;
     int price;
     int saveid;
     natid seller;
 
     for (n = 0; gettrade(n, &trade); n++) {
-       if (trade.trd_unitid < 0)
+       if (!trade.trd_owner)
            continue;
        if (!trade_getitem(&trade, &tg))
            continue;
-       if (tg.gen.own == 0) {
-           trade.trd_owner = 0;
-           trade.trd_unitid = -1;
-           puttrade(n, &trade);
-           continue;
-       }
+       /*
+        * FIXME We fail to delete trades right away when the thing on
+        * sale dies.  Instead, we delete it here.  Doesn't work if it
+        * has been rebuilt by the same owner; in that case, the new
+        * one takes the dead one's place on the market.
+        */
        if (tg.gen.own != trade.trd_owner) {
-           logerror("Something weird, tg.gen.own != trade.trd_owner!\n");
            trade.trd_owner = 0;
-           trade.trd_unitid = -1;
            puttrade(n, &trade);
            continue;
        }
@@ -310,17 +299,12 @@ 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;
        seller = trade.trd_owner;
        trade.trd_owner = 0;
-       trade.trd_unitid = -1;
        if (!puttrade(n, &trade)) {
            logerror("Couldn't save trade after purchase; get help!\n");
            continue;
@@ -368,7 +352,7 @@ check_trade(void)
            if (opt_MOB_ACCESS) {
                tg.plane.pln_mobil = -(etu_per_update / sect_mob_neg_factor);
                game_tick_to_now(&tg.plane.pln_access);
-           } else {
+           } else if (tg.plane.pln_mobil > 0) {
                tg.plane.pln_mobil = 0;
            }
            tg.plane.pln_harden = 0;
@@ -383,7 +367,7 @@ check_trade(void)
            if (opt_MOB_ACCESS) {
                tg.land.lnd_mobil = -(etu_per_update / sect_mob_neg_factor);
                game_tick_to_now(&tg.land.lnd_access);
-           } else {
+           } else if (tg.plane.pln_mobil > 0) {
                tg.land.lnd_mobil = 0;
            }
            tg.land.lnd_harden = 0;
@@ -418,7 +402,7 @@ ontradingblock(int type, void *ptr)
     int n;
 
     for (n = 0; gettrade(n, &trade); n++) {
-       if (trade.trd_unitid < 0)
+       if (!trade.trd_owner)
            continue;
        if (!trade_getitem(&trade, &tg))
            continue;
@@ -431,26 +415,24 @@ 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;
     int n;
 
     for (n = 0; gettrade(n, &trade); n++) {
-       if (trade.trd_unitid < 0)
+       if (!trade.trd_owner)
            continue;
        if (!trade_getitem(&trade, &tg))
            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;
        trade.trd_owner = newown;
-       if (newown == 0)
-           trade.trd_unitid = -1;
        puttrade(n, &trade);
        return;
     }