Update copyright notice.

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

diff --git a/src/lib/commands/fina.c b/src/lib/commands/fina.c
index 8b0c3b05869327671d37511fe1f3ac2d8ccb0f72..9ca0383e695109feff5ce3027a6079ad00f9ea7b 100644 (file)
--- a/src/lib/commands/fina.c
+++ b/src/lib/commands/fina.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-2004, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -52,12 +52,6 @@ fina(void)
     struct lonstr loan;
     struct nstr_item ni;
     time_t now;
-    int rdur;
-    int xdur;
-    double rate;
-    double amt;
-    time_t due;
-    time_t last;
 
     if (!opt_LOANS) {
        pr("Loans are not enabled.\n");
@@ -70,46 +64,15 @@ fina(void)
     prdate();
     pr("Loan       From            To        Rate   Dur     Paid      Total\n");
     snxtitem(&ni, EF_LOAN, "*");
-    while (nxtitem(&ni, (s_char *)&loan)) {
+    while (nxtitem(&ni, &loan)) {
        if (loan.l_status != LS_SIGNED)
            continue;
-       due = loan.l_duedate;
-       last = loan.l_lastpay;
-       rdur = 0;
-       xdur = 0;
-       if (now < due) {
-           rdur = now - last;
-           xdur = 0;
-       }
-       if (last < due && due < now) {
-           rdur = due - last;
-           xdur = now - due;
-       }
-       if (due < last) {
-           rdur = 0;
-           xdur = now - last;
-       }
-       if (loan.l_ldur == 0) {
-           logerror("loan #%d has zero duration", ni.cur);
-           continue;
-       }
-       rate = loan.l_irate / (loan.l_ldur * 8640000.0);
-
-/* changed following to avoid overflow 3/27/89 bailey@math-cs.kent.edu
-               amt = (rdur * rate + xdur * rate * 2.0 + 1.0) * loan.l_amtdue;
-   Begin overflow fix */
-       amt = (rdur * rate + xdur * rate * 2.0 + 1.0);
-       if (((1 << 30) / amt) < loan.l_amtdue)
-           amt = (1 << 30);
-       else
-           amt *= loan.l_amtdue;
-/* End overflow fix */
-
        pr(" %-2d  (%3d) %-8.8s  (%3d) %-8.8s  ", ni.cur,
           loan.l_loner, cname(loan.l_loner),
           loan.l_lonee, cname(loan.l_lonee));
-       pr("%3d%%   %3d    %5d    %7d",
-          loan.l_irate, loan.l_ldur, loan.l_amtpaid, (int)amt);
+       pr("%3d%%   %3d    %5ld    %7.0f",
+          loan.l_irate, loan.l_ldur, loan.l_amtpaid,
+          ceil(loan_owed(&loan, now)));
        if (now > loan.l_duedate)
            pr(" (in arrears)\n");
        else