Update copyright notice.

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

diff --git a/src/lib/commands/coll.c b/src/lib/commands/coll.c
index 312e33e5d484f82bce2c28d27673087f4a769b8a..495fbb1995f1f554c0c19a1b045d952e9e921d90 100644 (file)
--- a/src/lib/commands/coll.c
+++ b/src/lib/commands/coll.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2000, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2007, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -19,9 +19,9 @@
  *
  *  ---
  *
- *  See the "LEGAL", "LICENSE", "CREDITS" and "README" files for all the
- *  related information and legal notices. It is expected that any future
- *  projects/authors will amend these files as needed.
+ *  See files README, COPYING and CREDITS in the root of the source
+ *  tree for related information and legal notices.  It is expected
+ *  that future projects/authors will amend these files as needed.
  *
  *  ---
  *
@@ -32,40 +32,29 @@
  *     Steve McClure, 1996-2000
  */
 
-#include <math.h>
-#include "misc.h"
-#include "player.h"
-#include "var.h"
-#include "file.h"
-#include "sect.h"
+#include <config.h>
+
+#include "commands.h"
 #include "item.h"
 #include "loan.h"
+#include "lost.h"
 #include "news.h"
-#include "nat.h"
-#include "xy.h"
-#include "commands.h"
 #include "optlist.h"
 
 int
 coll(void)
 {
-    register int arg;
-    register int i;
-    register int val;
+    int arg;
+    int i;
+    int val;
     time_t now;
-    s_char *p;
+    char *p;
     struct lonstr loan;
     struct sctstr sect;
     coord x, y;
-    long due;
-    long last;
-    long rdur;
-    long xdur;
-    double rate;
     double owed;
     double pay;
-    s_char buf[1024];
-    int vec[I_MAX + 1];
+    char buf[1024];
 
     if (!opt_LOANS) {
        pr("Loans are not enabled.\n");
@@ -82,31 +71,12 @@ coll(void)
     }
     /* If we got here, we check to see if it's been defaulted on.  We
        already know it's owed to this player. */
-    (void)time(&now);
-    due = loan.l_duedate;
-    if (now <= due) {
+    owed = loan_owed(&loan, time(&now));
+    if (now <= loan.l_duedate) {
        pr("There has been no default on loan %d\n", arg);
        return RET_FAIL;
     }
-    last = loan.l_lastpay;
-    if (last < due && due < now) {
-       rdur = due - last;
-       xdur = now - due;
-    } else if (due < last) {
-       rdur = 0;
-       xdur = now - last;
-    }
-    rate = loan.l_irate / (loan.l_ldur * 8.64e6);
 
-/* changed following to avoid overflow 3/27/89 bailey@math-cs.kent.edu
-       owed = ((rdur * rate) + (xdur * rate * 2.0) + 1.0) * loan.l_amtdue;
-   Begin overflow fix */
-    owed = ((rdur * rate) + (xdur * rate * 2.0) + 1.0);
-    if (((1 << 30) / owed) < loan.l_amtdue)
-       owed = (1 << 30);
-    else
-       owed *= loan.l_amtdue;
-/* End overflow fix */
     pr("You are owed $%.2f on that loan.\n", owed);
     if (!(p = getstarg(player->argp[2],
                       "What sector do you wish to confiscate? ", buf)))
@@ -124,11 +94,11 @@ coll(void)
           xyas(x, y, player->cnum), cname(loan.l_lonee));
        return RET_FAIL;
     }
-    pay = dchr[sect.sct_type].d_value * ((float)sect.sct_effic + 100.0);
+    pay = dchr[sect.sct_type].d_value * (sect.sct_effic + 100.0);
     for (i = 0; ichr[i].i_name; i++) {
-       if (ichr[i].i_value == 0 || ichr[i].i_vtype == 0)
+       if (ichr[i].i_value == 0 || ichr[i].i_uid == I_NONE)
            continue;
-       val = getvar(ichr[i].i_vtype, (s_char *)&sect, EF_SECTOR);
+       val = sect.sct_item[ichr[i].i_uid];
        pay += val * ichr[i].i_value;
     }
     pr("That sector (and its contents) is valued at $%.2f\n", pay);
@@ -138,7 +108,7 @@ coll(void)
     }
     if (sect.sct_type == SCT_CAPIT || sect.sct_type == SCT_MOUNT)
        caploss(&sect, sect.sct_own, "that was %s's capital!\n");
-    putvar(V_MILIT, 1, (s_char *)&sect, EF_SECTOR);
+    sect.sct_item[I_MILIT] = 1;        /* FIXME now where did this guy come from? */
 
 /* Consider modifying takeover to take a "no che" argument and
    putting using it here again. */
@@ -147,15 +117,15 @@ coll(void)
     makenotlost(EF_SECTOR, player->cnum, 0, sect.sct_x, sect.sct_y);
     sect.sct_own = player->cnum;
 
-    memset(vec, 0, sizeof(vec));
-    putvec(VT_DIST, vec, (s_char *)&sect, EF_SECTOR);
-    putvec(VT_DEL, vec, (s_char *)&sect, EF_SECTOR);
+    memset(sect.sct_dist, 0, sizeof(sect.sct_dist));
+    memset(sect.sct_del, 0, sizeof(sect.sct_del));
     sect.sct_off = 1;
     sect.sct_dist_x = sect.sct_x;
     sect.sct_dist_y = sect.sct_y;
 
     putsect(&sect);
     nreport(player->cnum, N_SEIZE_SECT, loan.l_lonee, 1);
+    owed = loan_owed(&loan, time(&now));
     if (pay >= owed) {
        loan.l_ldur = 0;
        nreport(loan.l_lonee, N_REPAY_LOAN, player->cnum, 1);