Fix pre-tax unit market price loss of precision

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

diff --git a/src/lib/commands/trad.c b/src/lib/commands/trad.c
index 50c05b50c12e468ce4ecb4cef83a8c0778e2736c..fa122e8b0d11e629bc414a964f0bdf7f0ba3c2f1 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-2013, 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"
@@ -101,9 +103,9 @@ trad(void)
            TRADE_DELAY / 3600.0 - (now - trade.trd_markettime) / 3600.0;
        if (tleft < 0.0)
            tleft = 0.0;
-       pr("$%7ld  %2d %5.2f hrs ",
+       pr("$%7d  %2d %5.2f hrs ",
           trade.trd_price, trade.trd_maxbidder, tleft);
-       (void)trade_desc(&trade, &tg);  /* XXX */
+       trade_desc(&tg.gen);    /* XXX */
        pr("\n");
        if (trade.trd_owner == player->cnum && !player->god)
            pr(" (your own lot)\n");
@@ -182,7 +184,7 @@ trad(void)
        || (trade.trd_type == EF_NUKE)) {
        while (1) {
            p = getstring("Destination sector: ", buf);
-           if (!trade_check_ok(&trade, &tg))
+           if (!trade_check_ok(&trade, &tg.gen))
                return RET_FAIL;
            if (!p) {
                return RET_FAIL;
@@ -210,7 +212,7 @@ trad(void)
     } else if (trade.trd_type == EF_LAND) {
        while (1) {
            p = getstring("Destination sector: ", buf);
-           if (!trade_check_ok(&trade, &tg))
+           if (!trade_check_ok(&trade, &tg.gen))
                return RET_FAIL;
            if (!p) {
                return RET_FAIL;
@@ -242,7 +244,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)
@@ -281,8 +283,9 @@ check_trade(void)
     union empobj_storage tg;
     time_t now;
     double tleft;
-    float price;
+    int price;
     int saveid;
+    natid seller;
 
     for (n = 0; gettrade(n, &trade); n++) {
        if (trade.trd_unitid < 0)
@@ -315,6 +318,7 @@ check_trade(void)
            continue;
 
        saveid = trade.trd_unitid;
+       seller = trade.trd_owner;
        trade.trd_owner = 0;
        trade.trd_unitid = -1;
        if (!puttrade(n, &trade)) {
@@ -325,17 +329,17 @@ check_trade(void)
        price = trade.trd_price;
        natp = getnatp(trade.trd_maxbidder);
        if (natp->nat_money < price) {
-           nreport(trade.trd_maxbidder, N_WELCH_DEAL, trade.trd_owner, 1);
-           wu(0, trade.trd_owner,
+           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, trade.trd_owner, "   but couldn't afford it.\n");
-           wu(0, trade.trd_owner,
+           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(trade.trd_owner),
+              "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;
@@ -346,7 +350,7 @@ check_trade(void)
        natp->nat_money -= price;
        putnat(natp);
 
-       natp = getnatp(trade.trd_owner);
+       natp = getnatp(seller);
        natp->nat_money += roundavg(price * tradetax);
        putnat(natp);
 
@@ -394,13 +398,13 @@ check_trade(void)
        unit_give_away(&tg.gen, trade.trd_maxbidder, 0);
        put_empobj(trade.trd_type, saveid, &tg.gen);
 
-       nreport(trade.trd_owner, N_MAKE_SALE, trade.trd_maxbidder, 1);
-       wu(0, trade.trd_owner, "%s bought a %s #%d from you for $%.2f\n",
-          cname(trade.trd_maxbidder), trade_nameof(&trade, &tg),
+       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.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(trade.trd_owner),
+          "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;