Update copyright notice

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

diff --git a/src/lib/commands/coll.c b/src/lib/commands/coll.c
index bc4b44cbf93fb65eef5922e8090601b51e1de430..e1b270415acdebee02cf342c95280b92857ae596 100644 (file)
--- a/src/lib/commands/coll.c
+++ b/src/lib/commands/coll.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2005, 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
@@ -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.
  *
  *  ---
  *
@@ -32,16 +32,13 @@
  *     Steve McClure, 1996-2000
  */
 
-#include "misc.h"
-#include "player.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
@@ -97,11 +94,11 @@ coll(void)
           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 == I_NONE)
+       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);
@@ -130,6 +127,7 @@ coll(void)
     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,