Update copyright notice

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

diff --git a/src/lib/commands/coll.c b/src/lib/commands/coll.c
index 535f8da9d127733221613336b9d654bed6e9ceaa..2ad00fec53686e45d83d995f25d7a4c1c356147d 100644 (file)
--- a/src/lib/commands/coll.c
+++ b/src/lib/commands/coll.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2007, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2014, 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,8 +14,7 @@
  *  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/>.
  *
  *  ---
  *
@@ -26,7 +25,7 @@
  *  ---
  *
  *  coll.c: Collet on a loan
- * 
+ *
  *  Known contributors to this file:
  *     Pat Loney, 1992
  *     Steve McClure, 1996-2000
@@ -37,7 +36,6 @@
 #include "commands.h"
 #include "item.h"
 #include "loan.h"
-#include "lost.h"
 #include "news.h"
 #include "optlist.h"
 
@@ -60,7 +58,7 @@ coll(void)
        pr("Loans are not enabled.\n");
        return RET_FAIL;
     }
-    if ((arg = onearg(player->argp[1], "Collect on loan #")) < 0)
+    if ((arg = onearg(player->argp[1], "Collect on loan # ")) < 0)
        return RET_SYN;
     /* Check if it's a valid loan.  That means, is it a valid loan,
        owed to this player, with a valid duration and it's been signed. */
@@ -78,8 +76,9 @@ coll(void)
     }
 
     pr("You are owed $%.2f on that loan.\n", owed);
-    if (!(p = getstarg(player->argp[2],
-                      "What sector do you wish to confiscate? ", buf)))
+    p = getstarg(player->argp[2],
+                "What sector do you wish to confiscate? ", buf);
+    if (!p)
        return RET_SYN;
     if (!check_loan_ok(&loan))
        return RET_FAIL;
@@ -106,15 +105,12 @@ coll(void)
        pr("That is more than is owed!\n");
        return RET_FAIL;
     }
-    if (sect.sct_type == SCT_CAPIT || sect.sct_type == SCT_MOUNT)
-       caploss(&sect, sect.sct_own, "that was %s's capital!\n");
     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. */
-/*     (void) takeover(&sect, player->cnum);*/
-    makelost(EF_SECTOR, sect.sct_own, 0, sect.sct_x, sect.sct_y);
-    makenotlost(EF_SECTOR, player->cnum, 0, sect.sct_x, sect.sct_y);
+    /*
+     * Used to call takeover() here a long time ago, but that does
+     * unwanted things, like generate che.
+     */
     sect.sct_own = player->cnum;
 
     memset(sect.sct_dist, 0, sizeof(sect.sct_dist));
@@ -123,6 +119,8 @@ coll(void)
     sect.sct_dist_x = sect.sct_x;
     sect.sct_dist_y = sect.sct_y;
 
+    if (sect.sct_type == SCT_CAPIT || sect.sct_type == SCT_MOUNT)
+       caploss(&sect, loan.l_lonee, "that was %s's capital!\n");
     putsect(&sect);
     nreport(player->cnum, N_SEIZE_SECT, loan.l_lonee, 1);
     owed = loan_owed(&loan, time(&now));
@@ -138,9 +136,9 @@ coll(void)
     } else {
        (void)time(&loan.l_lastpay);
        owed -= pay;
-       loan.l_amtdue = (long)owed;
+       loan.l_amtdue = (int)owed;
        pay += loan.l_amtpaid;
-       loan.l_amtpaid = pay;
+       loan.l_amtpaid = (int)pay;
        wu(0, loan.l_lonee,
           "%s seized %s in partial payment of loan %d.\n",
           cname(player->cnum),