Update copyright notice.

[empserver] / src / lib / subs / disloan.c

diff --git a/src/lib/subs/disloan.c b/src/lib/subs/disloan.c
index 625de08c5bcc04c5887baa15807ff9826b9b584b..c5c15d804e29ae4b7d8ea4db045e6a0aebe66c76 100644 (file)
--- a/src/lib/subs/disloan.c
+++ b/src/lib/subs/disloan.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.
  *
  *  ---
  *
@@ -31,6 +31,7 @@
  *     Pat Loney, 1992
  *     Steve McClure, 1996
  */
+
 /*
  * Display a loan; there's a lot of stuff going
  * on here to figure out how much people owe.
@@ -43,22 +44,19 @@
  * so disgusted with how it works.
  */
 
-#include "misc.h"
-#include "player.h"
+#include <config.h>
+
+#include "file.h"
 #include "loan.h"
 #include "nat.h"
-#include "file.h"
+#include "player.h"
 #include "prototypes.h"
 
 int
-disloan(int n, register struct lonstr *loan)
+disloan(int n, struct lonstr *loan)
 {
     time_t now;
-    time_t normaltime;
-    time_t doubletime;
     time_t accept;
-    double rate;
-    double owe;
 
     if (loan->l_status == LS_FREE)
        return 0;
@@ -84,26 +82,11 @@ disloan(int n, register struct lonstr *loan)
        return 1;
     }
 
-    /*
-     * split duration now - l_lastpay into regular (up to l_duedate)
-     * and extended (beyond l_duedate)
-     */
-    normaltime = loan->l_duedate - loan->l_lastpay;
-    doubletime = now - loan->l_duedate;
-    if (normaltime < 0) {
-       doubletime += normaltime;
-       normaltime = 0;
-    }
-
-    rate = ((double)loan->l_irate / 100.0) / (loan->l_ldur * SECS_PER_DAY);
-    owe = ((double)loan->l_amtdue *
-          (((double)normaltime * rate + 1.0) +
-           ((double)doubletime * rate * 2.0))) + 0.5;
     pr("Amount paid to date $%ld\n", loan->l_amtpaid);
-    pr("Amount due (if paid now) $%.2f", owe);
-    if (doubletime == 0) {
+    pr("Amount due (if paid now) $%.2f", loan_owed(loan, now));
+    if (now <= loan->l_duedate) {
        pr(" (if paid on due date) $%.2f\n",
-          loan->l_amtdue * ((loan->l_duedate - loan->l_lastpay) * rate + 1.0));
+          loan_owed(loan, loan->l_duedate));
        pr("Due date is %s", ctime(&loan->l_duedate));
     } else
        pr(" ** In Arrears **\n");