Update copyright notice

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

diff --git a/src/lib/commands/repa.c b/src/lib/commands/repa.c
index c6cf48a495044cd9b0b235fe3c64868486877abb..48096ce381112fda8324a404c4c05cd35decf023 100644 (file)
--- a/src/lib/commands/repa.c
+++ b/src/lib/commands/repa.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2006, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2016, 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,9 +25,9 @@
  *  ---
  *
  *  repa.c: repay loan from a country
- * 
+ *
  *  Known contributors to this file:
- *     
+ *
  */
 
 #include <config.h>
@@ -47,7 +46,7 @@ repa(void)
     struct natstr *loaner;
     int loan_num;
     int payment;
-    long newdue;
+    int newdue;
     char *cp;
     time_t now;
     char buf[1024];
@@ -58,7 +57,7 @@ repa(void)
     }
     natp = getnatp(player->cnum);
     cp = getstarg(player->argp[1], "Repay loan #? ", buf);
-    if (cp == 0)
+    if (!cp)
        return RET_SYN;
     loan_num = atoi(cp);
     if (loan_num < 0)
@@ -68,7 +67,7 @@ repa(void)
        pr("You don't owe anything on that loan.\n");
        return RET_FAIL;
     }
-    if ((cp = getstarg(player->argp[2], "amount? ", buf)) == 0)
+    if (!(cp = getstarg(player->argp[2], "amount? ", buf)))
        return RET_SYN;
     if (!check_loan_ok(&loan))
        return RET_FAIL;
@@ -76,13 +75,13 @@ repa(void)
     if (payment <= 0)
        return RET_SYN;
 
-    newdue = (long)ceil(loan_owed(&loan, time(&now)) - payment);
+    newdue = (int)ceil(loan_owed(&loan, time(&now)) - payment);
     if (newdue < 0) {
        pr("You don't owe that much.\n");
        return RET_FAIL;
     }
     if (natp->nat_money < payment) {
-       pr("You only have $%ld.\n", natp->nat_money);
+       pr("You only have $%d.\n", natp->nat_money);
        return RET_FAIL;
     }
     player->dolcost += payment;
@@ -105,8 +104,9 @@ repa(void)
        loan.l_amtpaid += payment;
     }
     if (!putloan(loan_num, &loan)) {
+       logerror("repa: can't write loan");
        pr("Can't save loan; get help!\n");
-       return RET_SYS;
+       return RET_FAIL;
     }
     return RET_OK;
 }