Update copyright notice

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

diff --git a/src/lib/commands/offe.c b/src/lib/commands/offe.c
index f25140e1fa2b40042df915959ab5318b643808ba..2c8c228697d4e4dff4fdce06a388a1a3a4641706 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-2004, 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,12 @@
  *     Steve McClure, 1996
  */
 
-#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 <config.h>
+
 #include "commands.h"
+#include "loan.h"
 #include "optlist.h"
+#include "treaty.h"
 
 static int do_treaty(void);
 static int do_loan(void);
@@ -49,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;
@@ -77,19 +73,17 @@ offe(void)
 static int
 do_treaty(void)
 {
-    register s_char *cp;
-    register int ourcond;
-    register int theircond;
-    register int j;
-    struct tchrstr *tcp;
+    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;
@@ -105,21 +99,21 @@ do_treaty(void)
     }
     pr("Terms for %s:\n", cname(recipient));
     theircond = 0;
-    for (tcp = tchr; tcp && tcp->t_cond; tcp++) {
-       sprintf(prompt, "%s? ", tcp->t_name);
+    for (tfp = treaty_flags; tfp && tfp->name; tfp++) {
+       sprintf(prompt, "%s? ", tfp->name);
        if ((cp = getstring(prompt, buf)) == 0)
            return RET_FAIL;
        if (*cp == 'y')
-           theircond |= tcp->t_cond;
+           theircond |= tfp->value;
     }
     pr("Terms for you:\n");
     ourcond = 0;
-    for (tcp = tchr; tcp && tcp->t_cond; tcp++) {
-       sprintf(prompt, "%s? ", tcp->t_name);
+    for (tfp = treaty_flags; tfp && tfp->name; tfp++) {
+       sprintf(prompt, "%s? ", tfp->name);
        if ((cp = getstring(prompt, buf)) == 0)
            return RET_FAIL;
        if (*cp == 'y')
-           ourcond |= tcp->t_cond;
+           ourcond |= tfp->value;
     }
     if (ourcond == 0 && theircond == 0) {
        pr("Treaties with no clauses aren't very useful, boss!\n");
@@ -135,11 +129,13 @@ do_treaty(void)
     }
     (void)time(&now);
     snxtitem_all(&nstr, EF_TREATY);
-    while (nxtitem(&nstr, (s_char *)&trty)) {
+    while (nxtitem(&nstr, &trty)) {
        if (trty.trt_status == TS_FREE) {
            break;
        }
     }
+    trty.ef_type = EF_TREATY;
+    trty.trt_uid = nstr.cur;
     trty.trt_acond = ourcond;
     trty.trt_bcond = theircond;
     trty.trt_status = TS_PROPOSED;
@@ -159,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;
@@ -212,7 +208,7 @@ do_loan(void)
     if (irate < 5)
        return RET_FAIL;
     snxtitem_all(&nstr, EF_LOAN);
-    while (nxtitem(&nstr, (s_char *)&loan)) {
+    while (nxtitem(&nstr, &loan)) {
        if ((loan.l_status == LS_SIGNED) && (loan.l_lonee == player->cnum)
            && (loan.l_loner == recipient)) {
            pr("You already owe HIM money - how about repaying your loan?\n");
@@ -220,15 +216,15 @@ do_loan(void)
        }
     }
     snxtitem_all(&nstr, EF_LOAN);
-    while (nxtitem(&nstr, (s_char *)&loan)) {
+    while (nxtitem(&nstr, &loan)) {
        if (loan.l_status == LS_FREE)
            break;
     }
     loan.l_loner = player->cnum;
     loan.l_lonee = recipient;
     loan.l_status = LS_PROPOSED;
-    loan.l_irate = min(irate, 127);
-    loan.l_ldur = min(dur, 127);
+    loan.l_irate = MIN(irate, 127);
+    loan.l_ldur = MIN(dur, 127);
     loan.l_amtpaid = 0;
     loan.l_amtdue = amt;
     (void)time(&loan.l_lastpay);