/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2000, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ * Copyright (C) 1986-2008, 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.
*
* ---
*
* Steve McClure, 1996-2000
*/
-#include <math.h>
-#include "misc.h"
-#include "player.h"
-#include "var.h"
-#include "file.h"
-#include "sect.h"
+#include <config.h>
+
+#include "commands.h"
#include "item.h"
#include "loan.h"
+#include "lost.h"
#include "news.h"
-#include "nat.h"
-#include "xy.h"
-#include "commands.h"
#include "optlist.h"
int
coll(void)
{
- register int arg;
- register int i;
- register int val;
+ int arg;
+ int i;
+ int val;
time_t now;
- s_char *p;
+ char *p;
struct lonstr loan;
struct sctstr sect;
coord x, y;
- long rdur;
- long xdur;
- double rate;
double owed;
double pay;
- s_char buf[1024];
+ char buf[1024];
if (!opt_LOANS) {
pr("Loans are not enabled.\n");
}
/* If we got here, we check to see if it's been defaulted on. We
already know it's owed to this player. */
- (void)time(&now);
- /*
- * split duration now - l_lastpay into regular (up to l_duedate)
- * and extended (beyond l_duedate)
- */
- rdur = loan.l_duedate - loan.l_lastpay;
- xdur = now - loan.l_duedate;
- if (rdur < 0) {
- xdur += rdur;
- rdur = 0;
- }
- if (xdur <= 0) {
+ owed = loan_owed(&loan, time(&now));
+ if (now <= loan.l_duedate) {
pr("There has been no default on loan %d\n", arg);
return RET_FAIL;
}
- rate = loan.l_irate / (loan.l_ldur * 8.64e6);
-
-/* changed following to avoid overflow 3/27/89 bailey@math-cs.kent.edu
- owed = ((rdur * rate) + (xdur * rate * 2.0) + 1.0) * loan.l_amtdue;
- Begin overflow fix */
- owed = ((rdur * rate) + (xdur * rate * 2.0) + 1.0);
- if (((1 << 30) / owed) < loan.l_amtdue)
- owed = (1 << 30);
- else
- owed *= loan.l_amtdue;
-/* End overflow fix */
pr("You are owed $%.2f on that loan.\n", owed);
if (!(p = getstarg(player->argp[2],
"What sector do you wish to confiscate? ", buf)))
xyas(x, y, player->cnum), cname(loan.l_lonee));
return RET_FAIL;
}
- pay = dchr[sect.sct_type].d_value * ((float)sect.sct_effic + 100.0);
+ pay = dchr[sect.sct_type].d_value * (sect.sct_effic + 100.0);
for (i = 0; ichr[i].i_name; i++) {
- if (ichr[i].i_value == 0 || ichr[i].i_vtype == 0)
+ if (ichr[i].i_value == 0 || ichr[i].i_uid == I_NONE)
continue;
- val = sect.sct_item[ichr[i].i_vtype];
+ val = sect.sct_item[ichr[i].i_uid];
pay += val * ichr[i].i_value;
}
pr("That sector (and its contents) is valued at $%.2f\n", pay);
}
if (sect.sct_type == SCT_CAPIT || sect.sct_type == SCT_MOUNT)
caploss(§, sect.sct_own, "that was %s's capital!\n");
- sect.sct_item[I_MILIT] = 1; /* FIXME no where did this guy come from? */
+ sect.sct_item[I_MILIT] = 1; /* FIXME now where did this guy come from? */
/* Consider modifying takeover to take a "no che" argument and
putting using it here again. */
putsect(§);
nreport(player->cnum, N_SEIZE_SECT, loan.l_lonee, 1);
+ owed = loan_owed(&loan, time(&now));
if (pay >= owed) {
+ loan.l_status = LS_FREE;
loan.l_ldur = 0;
nreport(loan.l_lonee, N_REPAY_LOAN, player->cnum, 1);
wu(0, loan.l_lonee,