Update copyright notice

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

diff --git a/src/lib/subs/disloan.c b/src/lib/subs/disloan.c
index c567bf72c34597fffbda1c519337cdc0664914de..c04a199681abb79dd978a219adf1e03c83212c04 100644 (file)
--- a/src/lib/subs/disloan.c
+++ b/src/lib/subs/disloan.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2000, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2021, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *                Ken Stevens, Steve McClure, Markus Armbruster
  *
- *  This program is free software; you can redistribute it and/or modify
+ *  Empire is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
+ *  the Free Software Foundation, either version 3 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
@@ -14,23 +14,23 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  *  ---
  *
- *  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.
  *
  *  ---
  *
  *  disloan.c: Display a loan
- * 
+ *
  *  Known contributors to this file:
  *     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.
@@ -38,29 +38,20 @@
  * some kind of payment plan...like house payments
  * and such, where the bucks just get paid up each
  * update or so.
- *
- * I'd have made this more like treaty if I weren't
- * so disgusted with how it works.
  */
 
-#include "misc.h"
-#include "player.h"
+#include <config.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 due;
-    time_t lastpaydate;
-    time_t normaltime;
-    time_t doubletime;
     time_t accept;
-    double rate;
-    double owe;
 
     if (loan->l_status == LS_FREE)
        return 0;
@@ -85,29 +76,12 @@ disloan(int n, register struct lonstr *loan)
        pr("Loan must be accepted by %s", ctime(&accept));
        return 1;
     }
-    due = loan->l_duedate;
-    lastpaydate = loan->l_lastpay;
-    if (now < due) {
-       normaltime = now - lastpaydate;
-       doubletime = 0;
-    }
-    if (lastpaydate < due && due < now) {
-       normaltime = due - lastpaydate;
-       doubletime = now - due;
-    }
-    if (due < lastpaydate) {
-       normaltime = 0;
-       doubletime = now - lastpaydate;
-    }
-    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 $%d\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 * ((due - lastpaydate) * rate + 1.0));
+          loan_owed(loan, loan->l_duedate));
        pr("Due date is %s", ctime(&loan->l_duedate));
     } else
        pr(" ** In Arrears **\n");