/*
* 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
*
* ---
*
- * 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.
*
* ---
*
* Doug Hay, 1990
*/
+#include <config.h>
+
#include <stdio.h>
#if !defined(_WIN32)
#include <unistd.h>
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++;
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 + 1;
+ veto = cn;
}
}
if (veto) {
logerror("no demand update, %d has missed more than %d updates",
- veto - 1, update_missed);
+ veto, update_missed);
return 0;
}