Drop macros AGREE_FREE, AGREE_PROPOSED, AGREE_SIGNED

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

diff --git a/src/lib/global/symbol.c b/src/lib/global/symbol.c
index eb98278658c659959160a455d1a722a325280115..9101fa15ac36909997d68cd31d20045068d0f9ee 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-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,26 +25,31 @@
  *  ---
  *
  *  symbol.c: Empire symbol tables
- * 
+ *
  *  Known contributors to this file:
- *     Markus Armbruster, 2006
+ *     Markus Armbruster, 2006-2020
  */
 
 #include <config.h>
 
 #include "land.h"
+#include "loan.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"
 
 struct symbol agreement_statuses[] = {
-    {AGREE_FREE, "free"},
-    {AGREE_PROPOSED, "proposed"},
-    {AGREE_SIGNED, "signed"},
+    {LS_FREE, "free"},
+    {LS_PROPOSED, "proposed"},
+    {LS_SIGNED, "signed"},
     {0, NULL}
 };
 
@@ -76,28 +80,15 @@ struct symbol level[] = {
 
 struct symbol meta_flags[] = {
     {NSC_DEITY, "deity"},
-    {NSC_EXTRA, "extra"},
-    {NSC_CONST, "const"},
     {NSC_BITS, "bits"},
+    {NSC_HIDDEN, "hidden"},
     {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"},
-    {NSC_USHORT, "d"},
-    {NSC_INT, "d"},
-    {NSC_XCOORD, "d"},
-    {NSC_YCOORD, "d"},
-    {NSC_HIDDEN, "d"},
-    {NSC_TIME, "d"},
-    {NSC_FLOAT, "g"},
-    {NSC_STRINGY,"c"},
     {NSC_NOTYPE, NULL}
 };
 
@@ -124,11 +115,16 @@ struct symbol nation_flags[] = {
     {0, NULL}
 };
 
+struct symbol nation_rejects[] = {
+    {bit(REJ_TELE), "telegrams"},
+    {bit(REJ_ANNO), "announcements"},
+    {bit(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"},
@@ -138,7 +134,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"},
@@ -196,9 +192,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"},
@@ -213,7 +207,7 @@ struct symbol plane_chr_flags[] = {
 struct symbol plane_flags[] = {
     {PLN_LAUNCHED, "launched"},
     {PLN_SYNCHRONOUS, "synchronous"},
-    {PLN_AIRBURST, "airbust"},
+    {PLN_AIRBURST, "airburst"},
     {0, NULL}
 };
 
@@ -231,7 +225,7 @@ struct symbol resources[] = {
 struct symbol retreat_flags[] = {
     {RET_GROUP, "group"},
     {RET_INJURED, "injured"},
-    {RET_TORPED, "torped"},
+    {RET_TORPED, "torpedoed"},
     {RET_SONARED, "sonared"},
     {RET_HELPLESS, "helpless"},
     {RET_BOMBED, "bombed"},
@@ -240,6 +234,11 @@ struct symbol retreat_flags[] = {
     {0, NULL}
 };
 
+struct symbol sect_chr_flags[] = {
+    {D_DEITY, "deity"},
+    {0, NULL}
+};
+
 struct symbol sector_navigation[] = {
     {NAV_NONE, "land"},
     {NAVOK, "sea"},
@@ -264,24 +263,8 @@ 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"},
     {0, NULL}
 };
-
-struct symbol treaty_flags[] = {
-    {LNDATT, "no attacks on any land units"},
-    {SEAATT, "no attacks on any ships"},
-    {SEAFIR, "no shelling any ships"},
-    {SUBFIR, "no depth-charging any subs"},
-    {LANATT, "no sector attacks"},
-    {LANFIR, "no shelling any land"},
-    {NEWSHP, "no building ships"},
-    {NEWNUK, "no new nuclear weapons"},
-    {NEWPLN, "no building planes"},
-    {NEWLND, "no building land units"},
-    {TRTENL, "no enlistment"},
-    {0, NULL}
-};