Update copyright notice

[empserver] / src / lib / global / symbol.c

diff --git a/src/lib/global/symbol.c b/src/lib/global/symbol.c
index a150c8bf826df472b4bbffd505c68df60735fc67..69c9d5bae3fc3b752d9c44490522ca96d08aaddf 100644 (file)
--- a/src/lib/global/symbol.c
+++ b/src/lib/global/symbol.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2006, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2012, 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,19 +25,24 @@
  *  ---
  *
  *  symbol.c: Empire symbol tables
- * 
+ *
  *  Known contributors to this file:
- *     Markus Armbruster, 2006
+ *     Markus Armbruster, 2006-2010
  */
 
 #include <config.h>
 
 #include "land.h"
+#include "misc.h"
 #include "mission.h"
+#include "nat.h"
 #include "news.h"
+#include "nsc.h"
 #include "nuke.h"
 #include "plague.h"
 #include "plane.h"
+#include "retreat.h"
+#include "sect.h"
 #include "ship.h"
 #include "treaty.h"
 
@@ -82,11 +86,10 @@ struct symbol meta_flags[] = {
     {0, NULL}
 };
 
-struct symbol meta_type[]  = {
+struct symbol meta_type[] = {
     {NSC_LONG, "d"},
     {NSC_DOUBLE, "g"},
     {NSC_STRING, "s"},
-    {NSC_TYPEID, "d"},
     {NSC_CHAR, "d"},
     {NSC_UCHAR, "d"},
     {NSC_SHORT, "d"},
@@ -94,9 +97,10 @@ struct symbol meta_type[]  = {
     {NSC_INT, "d"},
     {NSC_XCOORD, "d"},
     {NSC_YCOORD, "d"},
+    {NSC_HIDDEN, "d"},
     {NSC_TIME, "d"},
     {NSC_FLOAT, "g"},
-    {NSC_STRINGY,"c"},
+    {NSC_STRINGY, "c"},
     {NSC_NOTYPE, NULL}
 };
 
@@ -123,10 +127,17 @@ struct symbol nation_flags[] = {
     {0, NULL}
 };
 
+struct symbol nation_rejects[] = {
+    {REJ_TELE, "telegrams"},
+    {REJ_TREA, "treaties"},
+    {REJ_ANNO, "announcements"},
+    {REJ_LOAN, "loans"},
+    {0, NULL}
+};
+
 struct symbol nation_relations[] = {
+    {-1, "unknown"},
     {AT_WAR, "at-war"},
-    {SITZKRIEG, "sitzkrieg"},
-    {MOBILIZATION, "mobilization"},
     {HOSTILE, "hostile"},
     {NEUTRAL, "neutral"},
     {FRIENDLY, "friendly"},
@@ -136,7 +147,7 @@ struct symbol nation_relations[] = {
 
 struct symbol nation_status[] = {
     {STAT_UNUSED, "unused"},
-    {STAT_NEW, "new"},
+    {STAT_NEW, "new"},
     {STAT_VIS, "visitor"},
     {STAT_SANCT, "sanctuary"},
     {STAT_ACTIVE, "active"},
@@ -194,9 +205,7 @@ struct symbol plane_chr_flags[] = {
     {P_S, "spy"},
     {P_I, "image"},
     {P_O, "satellite"},
-    {P_X, "stealth"},
     {P_N, "SDI"},
-    {P_H, "half-stealth"},
     {P_E, "x-light"},
     {P_K, "helo"},
     {P_A, "ASW"},
@@ -211,7 +220,7 @@ struct symbol plane_chr_flags[] = {
 struct symbol plane_flags[] = {
     {PLN_LAUNCHED, "launched"},
     {PLN_SYNCHRONOUS, "synchronous"},
-    {PLN_AIRBURST, "airbust"},
+    {PLN_AIRBURST, "airburst"},
     {0, NULL}
 };
 
@@ -262,7 +271,6 @@ struct symbol ship_chr_flags[] = {
     {M_SUBT, "sub-torp"},
     {M_TRADE, "trade"},
     {M_SEMILAND, "semi-land"},
-    {M_OILER, "oiler"},
     {M_SUPPLY, "supply"},
     {M_CANAL, "canal"},
     {M_ANTIMISSILE, "anti-missile"},