COPYING duplicates information from README. Remove. Move GPL from

[empserver] / src / lib / common / wantupd.c

diff --git a/src/lib/common/wantupd.c b/src/lib/common/wantupd.c
index 7c2b00dcfbc263b9dfbee34718079ad495e1df3a..2557c643aa31c18e5c2eecbc8d50763ee27994c7 100644 (file)
--- a/src/lib/common/wantupd.c
+++ b/src/lib/common/wantupd.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-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.
  *
  *  ---
  *
@@ -129,8 +129,7 @@ demand_update_want(int *want, int *pop, int which)
     for (cn = 1; 0 != (natp = getnatp(cn)); cn++) {
        /* Only countries which are normal. */
        /* Should probably include sanctuaries ..... */
-       if (((natp->nat_stat & NORM) == NORM) &&
-           ((natp->nat_stat & GOD) != GOD)) {
+       if (natp->nat_stat == STAT_ACTIVE) {
            totpop++;
            if ((natp->nat_update & WUPD_WANT) == WUPD_WANT) {
                totwant++;
@@ -175,8 +174,7 @@ demand_check(void)
 
     veto = 0;
     for (cn = 1; 0 != (natp = getnatp(cn)); cn++) {
-       if (((natp->nat_stat & NORM) == NORM) &&
-           ((natp->nat_stat & GOD) != GOD)) {
+       if (natp->nat_stat == STAT_ACTIVE) {
            if (natp->nat_missed >= update_missed)
                veto = cn;
        }