License upgrade to GPL version 3 or later

[empserver] / src / lib / commands / new.c

diff --git a/src/lib/commands/new.c b/src/lib/commands/new.c
index cbe88e9e2f58272ad08b5f1d4be945a9d16d5056..8fb676c8dd47ad4f105151100d9d5d47e217b8b3 100644 (file)
--- a/src/lib/commands/new.c
+++ b/src/lib/commands/new.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2008, 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/>.
  *
  *  ---
  *
@@ -26,7 +25,7 @@
  *  ---
  *
  *  new.c: Create a new capital for a player
- * 
+ *
  *  Known contributors to this file:
  *     Dave Pare, 1986
  */
@@ -41,7 +40,6 @@
 #include "optlist.h"
 #include "path.h"
 #include "prototypes.h"
-#include "tel.h"
 
 static void init_sanct(struct natstr *, coord, coord);
 
@@ -67,7 +65,7 @@ new(void)
        pr("Country #%d (%s) isn't a new country!\n", num, cname(num));
        return RET_SYN;
     }
-    if ((p = getstarg(player->argp[2], "sanctuary pair : ", buf)) == 0)
+    if (!(p = getstarg(player->argp[2], "sanctuary pair : ", buf)))
        return RET_SYN;
     if (!sarg_xy(p, &x, &y) || !getsect(x, y, &sect))
        return RET_SYN;