Move setting nat_cnam, nat_pnam into nat_reset()

[empserver] / include / nat.h

diff --git a/include/nat.h b/include/nat.h
index f44d30d20f93e6dc8e4e29d180b60e5f774881c1..21a6d0b2ebb90abaf6d63187503b5398517085d5 100644 (file)
--- a/include/nat.h
+++ b/include/nat.h
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2010, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2011, 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,
@@ -14,8 +14,7 @@
  *  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/>.
  *
  *  ---
  *
@@ -32,7 +31,7 @@
  *     Ken Stevens, 1995
  *     Steve McClure, 1998-2000
  *     Ron Koenderink, 2005-2008
- *     Markus Armbruster, 2005-2008
+ *     Markus Armbruster, 2005-2011
  */
 
 #ifndef NAT_H
@@ -178,10 +177,10 @@ extern void putreject(struct natstr *np, natid them, int how, int what);
 extern void putcontact(struct natstr *np, natid them, int contact);
 extern void agecontact(struct natstr *np);
 extern int influx(struct natstr *np);
+extern struct natstr *nat_reset(struct natstr *, natid, char *, char *,
+                               enum nat_status);
 
-extern struct natstr *nat_reset(struct natstr *, enum nat_status,
-                               coord, coord);
-extern int check_nat_name(char *cname);
+extern int check_nat_name(char *, natid);
 
 extern int grant_btus(struct natstr *, int);