Fix trailing whitespace

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

diff --git a/src/lib/commands/offe.c b/src/lib/commands/offe.c
index c3ab9cfa560c93dbfaf5639f72cf182c31e4a055..01570b596ca72a7d1a0d6a74c82b04be5bc2de7b 100644 (file)
--- a/src/lib/commands/offe.c
+++ b/src/lib/commands/offe.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2006, 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,14 +19,14 @@
  *
  *  ---
  *
- *  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.
  *
  *  ---
  *
  *  offe.c: Offer a loan or treaty
- * 
+ *
  *  Known contributors to this file:
  *     Pat Loney, 1992
  *     Steve McClure, 1996
@@ -34,16 +34,10 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "xy.h"
-#include "nsc.h"
-#include "nat.h"
-#include "loan.h"
-#include "treaty.h"
-#include "file.h"
 #include "commands.h"
+#include "loan.h"
 #include "optlist.h"
+#include "treaty.h"
 
 static int do_treaty(void);
 static int do_loan(void);
@@ -51,8 +45,8 @@ static int do_loan(void);
 int
 offe(void)
 {
-    register s_char *cp;
-    s_char buf[1024];
+    char *cp;
+    char buf[1024];
 
     if (!(cp = getstarg(player->argp[1], "loan or treaty? ", buf)) || !*cp)
        return RET_SYN;
@@ -79,19 +73,17 @@ offe(void)
 static int
 do_treaty(void)
 {
-    register s_char *cp;
-    register int ourcond;
-    register int theircond;
-    register int j;
+    char *cp;
+    int ourcond, theircond;
     struct symbol *tfp;
     struct trtstr trty;
     struct nstr_item nstr;
     natid recipient;
     time_t now;
-    int n;
+    int j, n;
     struct natstr *natp;
-    s_char prompt[128];
-    s_char buf[1024];
+    char prompt[128];
+    char buf[1024];
 
     if ((n = natarg(player->argp[2], "Treaty offered to? ")) < 0)
        return RET_SYN;
@@ -142,8 +134,7 @@ do_treaty(void)
            break;
        }
     }
-    trty.ef_type = EF_TREATY;
-    trty.trt_uid = nstr.cur;
+    ef_blank(EF_TREATY, nstr.cur, &trty);
     trty.trt_acond = ourcond;
     trty.trt_bcond = theircond;
     trty.trt_status = TS_PROPOSED;
@@ -151,8 +142,9 @@ do_treaty(void)
     trty.trt_cnb = recipient;
     trty.trt_exp = j * SECS_PER_DAY + now;
     if (!puttre(nstr.cur, &trty)) {
+       logerror("do_treaty: can't write treaty");
        pr("Couldn't save treaty; get help.\n");
-       return RET_SYS;
+       return RET_FAIL;
     }
     wu(0, recipient, "Treaty #%d proposed to you by %s\n",
        nstr.cur, cname(player->cnum));
@@ -163,13 +155,13 @@ do_treaty(void)
 static int
 do_loan(void)
 {
-    register int amt, irate, dur, maxloan;
+    int amt, irate, dur, maxloan;
     struct nstr_item nstr;
     struct natstr *natp;
     struct lonstr loan;
     natid recipient;
     int n;
-    s_char prompt[128];
+    char prompt[128];
 
     if ((n = natarg(player->argp[2], "Lend to? ")) < 0)
        return RET_SYN;
@@ -228,6 +220,7 @@ do_loan(void)
        if (loan.l_status == LS_FREE)
            break;
     }
+    ef_blank(EF_LOAN, nstr.cur, &loan);
     loan.l_loner = player->cnum;
     loan.l_lonee = recipient;
     loan.l_status = LS_PROPOSED;
@@ -237,10 +230,10 @@ do_loan(void)
     loan.l_amtdue = amt;
     (void)time(&loan.l_lastpay);
     loan.l_duedate = loan.l_ldur * SECS_PER_DAY + loan.l_lastpay;
-    loan.l_uid = nstr.cur;
     if (!putloan(nstr.cur, &loan)) {
+       logerror("do_loan: can't save loan");
        pr("Couldn't save loan; get help!\n");
-       return RET_SYS;
+       return RET_FAIL;
     }
     pr("You have offered loan %d\n", nstr.cur);
     wu(0, recipient, "Country #%d has offered you a loan (#%d)\n",