Update copyright notice

[empserver] / src / lib / subs / distrea.c

diff --git a/src/lib/subs/distrea.c b/src/lib/subs/distrea.c
index b75323e1af05310ce07a8e3ecc6cd557a3e6b42f..8f6454b2a31c93e752593394ca450dec5f587494 100644 (file)
--- a/src/lib/subs/distrea.c
+++ b/src/lib/subs/distrea.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2005, 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.
  *
  *  ---
  *
@@ -31,20 +31,19 @@
  *     
  */
 
-#include "misc.h"
-#include "player.h"
-#include "treaty.h"
-#include "nat.h"
+#include <config.h>
+
 #include "file.h"
+#include "nat.h"
+#include "player.h"
 #include "prototypes.h"
+#include "treaty.h"
 
 int
-distrea(int n, register struct trtstr *tp)
+distrea(int n, struct trtstr *tp)
 {
-    register int i;
-    int acond;
-    int bcond;
-    int cond;
+    int i;
+    int acond, bcond, cond;
     time_t now;
 
     if (tp->trt_status == TS_FREE)
@@ -69,16 +68,16 @@ distrea(int n, register struct trtstr *tp)
     pr("%s  expires %s", cname(tp->trt_cnb), ctime(&tp->trt_exp));
     pr("%24.24s terms", cname(tp->trt_cna));
     pr(" - %s terms\n", cname(tp->trt_cnb));
-    for (i = 0; 0 != (cond = tchr[i].t_cond); i++) {
+    for (i = 0; 0 != (cond = treaty_flags[i].value); i++) {
        acond = tp->trt_acond & cond;
        bcond = tp->trt_bcond & cond;
        if (acond | bcond) {
            if (acond)
-               pr("%30s", tchr[i].t_name);
+               pr("%30s", treaty_flags[i].name);
            else
                pr("%30s", "");
            if (bcond)
-               pr(" - %s\n", tchr[i].t_name);
+               pr(" - %s\n", treaty_flags[i].name);
            else
                pr(" -\n");
        }