/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2004, Dave Pare, Jeff Bailey, Thomas Ruschak,
- * Ken Stevens, Steve McClure
+ * Copyright (C) 1986-2017, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ * Ken Stevens, Steve McClure, Markus Armbruster
*
- * This program is free software; you can redistribute it and/or modify
+ * Empire is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* ---
*
- * 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.
*
* ---
*
* nat.c: Get nation stuff
- *
+ *
* Known contributors to this file:
* Dave Pare, 1994
*/
-#include "prototypes.h"
-#include "misc.h"
+#include <config.h>
+
#include "nat.h"
-#include "file.h"
-#include "player.h"
-#include <fcntl.h>
+#include "prototypes.h"
int
-natbyname(s_char *name, natid *result)
+natbyname(char *name, natid *result)
{
struct natstr *np;
int i;
for (i = 0; NULL != (np = getnatp(i)); i++) {
- if (strcmp(np->nat_cnam, name) == 0) {
+ if (np->nat_stat != STAT_UNUSED && !strcmp(np->nat_cnam, name)) {
*result = i;
return 0;
}
}
- *result = 255;
+ *result = NATID_BAD;
return -1;
}
int
-natpass(int cn, s_char *pass)
+natpass(natid cn, char *pass)
{
struct natstr *np;
- np = getnatp((natid)cn);
- if (np->nat_stat == VIS)
+ np = getnatp(cn);
+ if (np->nat_stat == STAT_VIS)
return 1;
if (strcmp(np->nat_pnam, pass) == 0)
return 1;