Update copyright notice

[empserver] / src / lib / update / nxtitemp.c

diff --git a/src/lib/update/nxtitemp.c b/src/lib/update/nxtitemp.c
index 6d01e2ccb1920bc72b5409fb3e2ab70382f8f6ff..83dff29d92d03d9c0528c13079df62bf2c996ec1 100644 (file)
--- a/src/lib/update/nxtitemp.c
+++ b/src/lib/update/nxtitemp.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-2016, 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 @@
  *  ---
  *
  *  nxtitemp.c: Get next item from list
- * 
+ *
  *  Known contributors to this file:
  *     Dave Pare, 1989
  */
@@ -47,16 +46,16 @@ nxtitemp(struct nstr_item *np)
     int selected;
 
     if (np->sel == NS_UNDEF)
-       return 0;
+       return NULL;
     do {
        if (np->sel == NS_LIST) {
            np->index++;
            if (np->index >= np->size)
-               return 0;
+               return NULL;
            np->cur = np->list[np->index];
        } else if (np->sel == NS_CARGO) {
            if (np->next < 0)
-               return 0;
+               return NULL;
            np->cur = np->next;
            np->next = unit_cargo_next(np->type, np->next);
        } else {
@@ -64,7 +63,7 @@ nxtitemp(struct nstr_item *np)
        }
        gp = ef_ptr(np->type, np->cur);
        if (!gp)
-           return 0;
+           return NULL;
 
        selected = 1;
        switch (np->sel) {
@@ -74,7 +73,7 @@ nxtitemp(struct nstr_item *np)
            break;
        case NS_DIST:
            if (CANT_HAPPEN(!(ef_flags(np->type) & EFF_XY)))
-               return 0;
+               return NULL;
            if (!xyinrange(gp->x, gp->y, &np->range)) {
                selected = 0;
                break;
@@ -85,25 +84,25 @@ nxtitemp(struct nstr_item *np)
            break;
        case NS_AREA:
            if (CANT_HAPPEN(!(ef_flags(np->type) & EFF_XY)))
-               return 0;
+               return NULL;
            if (!xyinrange(gp->x, gp->y, &np->range))
                selected = 0;
            break;
        case NS_XY:
            if (CANT_HAPPEN(!(ef_flags(np->type) & EFF_XY)))
-               return 0;
+               return NULL;
            if (xnorm(gp->x) != np->cx || ynorm(gp->y) != np->cy)
                selected = 0;
            break;
        case NS_GROUP:
            if (CANT_HAPPEN(!(ef_flags(np->type) & EFF_GROUP)))
-               return 0;
+               return NULL;
            if (np->group != gp->group)
                selected = 0;
            break;
        default:
            CANT_REACH();
-           return 0;
+           return NULL;
        }
        if (selected && np->ncond) {
            /* nstr_exec is expensive, so we do it last */