COPYING duplicates information from README. Remove. Move GPL from

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

diff --git a/src/lib/commands/repa.c b/src/lib/commands/repa.c
index 24dfa3421962d661c378eb2c8fa97d6a6b549fce..f426433c57925ca9b33a39475264b1596912e38c 100644 (file)
--- a/src/lib/commands/repa.c
+++ b/src/lib/commands/repa.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-2006, 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,8 @@
  *     
  */
 
+#include <config.h>
+
 #include <math.h>
 #include "misc.h"
 #include "player.h"
@@ -48,16 +50,11 @@ repa(void)
     struct natstr *natp;
     struct natstr *loaner;
     int loan_num;
-    long payment;
-    long owe;
-    long due;
-    long last_payment;
-    long normaltime;
-    long doubletime;
-    double rate_per_sec, amt;
-    s_char *cp;
+    int payment;
+    long newdue;
+    char *cp;
     time_t now;
-    s_char buf[1024];
+    char buf[1024];
 
     if (!opt_LOANS) {
        pr("Loans are not enabled.\n");
@@ -75,35 +72,6 @@ repa(void)
        pr("You don't owe anything on that loan.\n");
        return RET_FAIL;
     }
-    (void)time(&now);
-    due = loan.l_duedate;
-    last_payment = loan.l_lastpay;
-    if (now < due) {
-       normaltime = now - last_payment;
-       doubletime = 0;
-    }
-    if (last_payment < due && due < now) {
-       normaltime = due - last_payment;
-       doubletime = now - due;
-    }
-    if (due < last_payment) {
-       normaltime = 0;
-       doubletime = now - last_payment;
-    }
-    rate_per_sec = loan.l_irate /
-       ((double)loan.l_ldur * SECS_PER_DAY * 100.0);
-
-    owe = (long)(loan.l_amtdue *
-                ((double)normaltime * rate_per_sec + 1.0 +
-                 (double)doubletime * rate_per_sec * 2.0) + 0.5);
-    amt = ((double)normaltime * rate_per_sec + 1.0 +
-          (double)doubletime * rate_per_sec * 2.0);
-    if (((1 << 30) / amt) < loan.l_amtdue)
-       owe = (1 << 30);
-    else
-       owe = (long)(loan.l_amtdue *
-                    ((double)normaltime * rate_per_sec + 1.0 +
-                     (double)doubletime * rate_per_sec * 2.0) + 0.5);
     if ((cp = getstarg(player->argp[2], "amount? ", buf)) == 0)
        return RET_SYN;
     if (!check_loan_ok(&loan))
@@ -111,7 +79,9 @@ repa(void)
     payment = atoi(cp);
     if (payment <= 0)
        return RET_SYN;
-    if (payment > owe) {
+
+    newdue = (long)ceil(loan_owed(&loan, time(&now)) - payment);
+    if (newdue < 0) {
        pr("You don't owe that much.\n");
        return RET_FAIL;
     }
@@ -123,9 +93,9 @@ repa(void)
     loaner = getnatp(loan.l_loner);
     loaner->nat_money += payment;
     putnat(loaner);
-    (void)time(&loan.l_lastpay);
-    if (owe <= payment) {
-       wu(0, loan.l_loner, "Country #%d paid off loan #%d with $%ld\n",
+    loan.l_lastpay = now;
+    if (newdue == 0) {
+       wu(0, loan.l_loner, "Country #%d paid off loan #%d with $%d\n",
           player->cnum, loan_num, payment);
        nreport(player->cnum, N_REPAY_LOAN, loan.l_loner, 1);
        loan.l_status = LS_FREE;
@@ -133,9 +103,9 @@ repa(void)
        pr("Congratulations, you've paid off the loan!\n");
     } else {
        wu(0, loan.l_loner,
-          "Country #%d paid $%.2f on loan %d\n", player->cnum,
-          (double)payment, loan_num);
-       loan.l_amtdue = owe - payment;
+          "Country #%d paid $%d on loan %d\n",
+          player->cnum, payment, loan_num);
+       loan.l_amtdue = newdue;
        loan.l_amtpaid += payment;
     }
     if (!putloan(loan_num, &loan)) {