Update copyright notice

[empserver] / include / nsc.h

diff --git a/include/nsc.h b/include/nsc.h
index 70c69f6e64c66a586ed2a249859f65e2a9cb5954..4f2afd6b8dca943199c257a4479160d8e1e87d80 100644 (file)
--- a/include/nsc.h
+++ b/include/nsc.h
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2010, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -26,7 +26,7 @@
  *  ---
  *
  *  nsc.h: Definitions for Empire conditionals
- * 
+ *
  *  Known contributors to this file:
  *     Dave Pare, 1989
  *     Markus Armbruster, 2004-2008
@@ -48,7 +48,7 @@ enum nsc_type {
     /* promoted types */
     NSC_LONG,                  /* long */
     NSC_DOUBLE,                        /* double */
-    NSC_STRING,                        /* char *, zero-terminated string */
+    NSC_STRING,                        /* character string */
     /* unpromoted types */
     NSC_CHAR,                  /* signed char */
     NSC_UCHAR,                 /* unsigned char */
@@ -61,7 +61,7 @@ enum nsc_type {
                                   may need hiding */
     NSC_TIME,                  /* time_t */
     NSC_FLOAT,                 /* float */
-    NSC_STRINGY,               /* char[], may be zero-terminated */
+    NSC_STRINGY,               /* char[] */
     /* aliases, must match typedefs */
     NSC_NATID = NSC_UCHAR      /* nation id */
 };
@@ -144,7 +144,8 @@ enum ns_seltype {
     NS_AREA,                   /* rectangular area */
     NS_ALL,                    /* everything */
     NS_XY,                     /* one sector area */
-    NS_GROUP                   /* group, i.e. fleet, wing, army */
+    NS_GROUP,                  /* group, i.e. fleet, wing, army */
+    NS_CARGO                   /* loaded on the same carrier */
 };
 
 /* Sector iterator */
@@ -171,6 +172,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 */
+    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 */
@@ -285,7 +287,6 @@ 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 int nstr_coerce_val(struct valstr *, enum nsc_type, char *);
 extern int nstr_exec(struct nscstr *, int, void *);
 /* src/lib/common/nstreval.c */
 extern struct valstr *nstr_mksymval(struct valstr *, struct castr *, int);