COPYING duplicates information from README. Remove. Move GPL from

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

diff --git a/src/lib/subs/distrea.c b/src/lib/subs/distrea.c
index 91b7be4e27e03e107310c55022b4e32346f9c9b0..58db18d28e79539a621f89a45af3d9d8f58fb156 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-2000, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2006, 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,6 +31,8 @@
  *     
  */
 
+#include <config.h>
+
 #include "misc.h"
 #include "player.h"
 #include "treaty.h"
@@ -69,16 +71,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");
        }