License upgrade to GPL version 3 or later

[empserver] / src / lib / subs / snxtsct.c

diff --git a/src/lib/subs/snxtsct.c b/src/lib/subs/snxtsct.c
index c492ef702147d49c6c33584934d32e69999eb119..67504ef73eb84b70f9e66e5a93cc9c6379528efc 100644 (file)
--- a/src/lib/subs/snxtsct.c
+++ b/src/lib/subs/snxtsct.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,10 +25,10 @@
  *  ---
  *
  *  snxtsct.c: Arrange sector selection using either distance or area
- * 
+ *
  *  Known contributors to this file:
  *     Dave Pare, 1989
- *     Markus Armbruster, 2006-2008
+ *     Markus Armbruster, 2006-2009
  */
 
 #include <config.h>
@@ -61,8 +60,8 @@ snxtsct(struct nstr_sect *np, char *str)
     int dist, n;
     char buf[1024];
 
-    if (str == 0 || *str == 0) {
-       if ((str = getstring("(sects)? ", buf)) == 0)
+    if (!str || !*str) {
+       if (!(str = getstring("(sects)? ", buf)))
            return 0;
     }
     switch (sarg_type(str)) {
@@ -92,7 +91,7 @@ snxtsct(struct nstr_sect *np, char *str)
     default:
        return 0;
     }
-    if (player->condarg == 0)
+    if (!player->condarg)
        return 1;
     n = nstr_comp(np->cond, sizeof(np->cond) / sizeof(*np->cond),
                  EF_SECTOR, player->condarg);