License upgrade to GPL version 3 or later

[empserver] / include / nsc.h

diff --git a/include/nsc.h b/include/nsc.h
index 536f33f1c778b5f7033b766418dbfce73189bdda..f7034be581ccb149d7b3856c9963a5f9598b051d 100644 (file)
--- a/include/nsc.h
+++ b/include/nsc.h
@@ -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/>.
  *
  *  ---
  *
@@ -172,7 +171,7 @@ struct nstr_item {
     int dist;                  /* NS_DIST: distance selector */
     coord cx, cy;              /* NS_DIST: center x-y, NS_XY: xy */
     char group;                        /* NS_GROUP: fleet/wing match */
-    short next;                        /* NS_CARGO: next item */
+    int next;                  /* NS_CARGO: next item */
     int size;                  /* NS_LIST: size of list */
     int index;                 /* NS_LIST: index */
     int list[NS_LSIZE];                /* NS_LIST: item list */
@@ -286,11 +285,12 @@ extern struct symbol sector_navigation[];
 
 /* src/lib/subs/nstr.c */
 extern int nstr_comp(struct nscstr *np, int len, int type, char *str);
-extern char *nstr_comp_val(char *, struct valstr*, int);
+extern char *nstr_comp_val(char *, struct valstr *, int);
 extern int nstr_exec(struct nscstr *, int, void *);
 /* src/lib/common/nstreval.c */
 extern struct valstr *nstr_mksymval(struct valstr *, struct castr *, int);
-extern struct valstr *nstr_exec_val(struct valstr *, natid, void *, enum nsc_type);
+extern struct valstr *nstr_exec_val(struct valstr *, natid, void *,
+                                   enum nsc_type);
 extern int nstr_promote(int);
 extern char *symbol_by_value(int, struct symbol *);
 /* src/lib/global/nsc.c */