/*
* 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
*
* ---
*
- * 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.
*
* ---
*
*
*/
+#include <config.h>
+
#include <math.h>
#include "misc.h"
#include "player.h"
struct natstr *natp;
struct natstr *loaner;
int loan_num;
- long payment;
- long owe;
- s_char *cp;
- s_char buf[1024];
+ int payment;
+ long newdue;
+ char *cp;
+ time_t now;
+ char buf[1024];
if (!opt_LOANS) {
pr("Loans are not enabled.\n");
pr("You don't owe anything on that loan.\n");
return RET_FAIL;
}
- owe = (long)loan_owed(&loan, time(NULL));
if ((cp = getstarg(player->argp[2], "amount? ", buf)) == 0)
return RET_SYN;
if (!check_loan_ok(&loan))
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;
}
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;
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)) {