Update copyright notice

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

diff --git a/src/lib/subs/nxtsct.c b/src/lib/subs/nxtsct.c
index 6ad13e6c949d26b13150bbeb18fd0388aba4fa31..2d201a69589acd3a24fa7b076572c3a51d8a97bb 100644 (file)
--- a/src/lib/subs/nxtsct.c
+++ b/src/lib/subs/nxtsct.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-2020, 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 @@
  *  ---
  *
  *  nxtsct.c: Select/get the next sector from a range of sectors
- * 
+ *
  *  Known contributors to this file:
  *     Dave Pare, 1989
  */
@@ -36,7 +35,6 @@
 #include "file.h"
 #include "optlist.h"
 #include "prototypes.h"
-#include "sect.h"
 
 /*
  * get the next sector in the range
@@ -68,12 +66,11 @@ nxtsct(struct nstr_sect *np, struct sctstr *sp)
                continue;
        }
        np->id = sctoff(np->x, np->y);
-       if (!np->read(EF_SECTOR, np->id, sp))
+       if (!ef_read(EF_SECTOR, np->id, sp))
            continue;
        if (np->ncond == 0)
            return 1;
        if (nstr_exec(np->cond, np->ncond, sp))
            return 1;
     }
-    /*NOTREACHED*/
 }