Update copyright notice

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

diff --git a/src/lib/commands/shark.c b/src/lib/commands/shark.c
index cfd533ec4befc32dc7693e60c74223fb0137a597..0e688f7ae7db7b374c6d1b3e6eea9c04a6424316 100644 (file)
--- a/src/lib/commands/shark.c
+++ b/src/lib/commands/shark.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2004, 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,35 +14,28 @@
  *  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/>.
  *
  *  ---
  *
- *  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.
  *
  *  ---
  *
  *  shark.c: Transfer a loan by buying it out
- * 
+ *
  *  Known contributors to this file:
  *     Pat Loney, 1992
  *     Steve McClure, 1996-2000
  */
 
+#include <config.h>
+
 #include <math.h>
-#include "misc.h"
-#include "file.h"
-#include "sect.h"
-#include "item.h"
-#include "loan.h"
-#include "news.h"
-#include "nat.h"
-#include "xy.h"
-#include "player.h"
 #include "commands.h"
+#include "loan.h"
 #include "optlist.h"
 
 int
@@ -55,7 +48,7 @@ shark(void)
     struct natstr *natp;
     struct natstr *oldie;
     double owed;
-    long payment;
+    int payment;
     char buf[1024];
 
     if (!opt_LOANS) {
@@ -63,7 +56,7 @@ shark(void)
        return RET_FAIL;
     }
     p = getstarg(player->argp[1], "Transfer which loan #: ", buf);
-    if (p == 0)
+    if (!p)
        return RET_SYN;
     if (*p == 0)
        return RET_SYN;
@@ -85,7 +78,7 @@ shark(void)
     }
     pr("That loan is worth $%.2f.\n", owed);
     natp = getnatp(player->cnum);
-    payment = (long)ceil(owed * (1.0 + loan.l_irate / 100.0));
+    payment = (int)ceil(owed * (1.0 + loan.l_irate / 100.0));
     if (payment > natp->nat_money - 100.0) {
        pr("You do not have enough to cover that loan\n");
        return RET_FAIL;
@@ -94,7 +87,7 @@ shark(void)
           "%s bought loan #%d.  You now owe him!\n",
           cname(player->cnum), arg);
        wu(0, loan.l_loner,
-          "%s bought loan #%d out from under you for %ld\n",
+          "%s bought loan #%d out from under you for %d\n",
           cname(player->cnum), arg, payment);
        pr("You now own loan #%d.  Go break some legs.\n", arg);
     }