/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2012, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ * Copyright (C) 1986-2020, Dave Pare, Jeff Bailey, Thomas Ruschak,
* Ken Stevens, Steve McClure, Markus Armbruster
*
* Empire is free software: you can redistribute it and/or modify
* symbol.c: Empire symbol tables
*
* Known contributors to this file:
- * Markus Armbruster, 2006-2010
+ * Markus Armbruster, 2006-2020
*/
#include <config.h>
#include "land.h"
+#include "loan.h"
#include "misc.h"
#include "mission.h"
#include "nat.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}
};
struct symbol meta_flags[] = {
{NSC_DEITY, "deity"},
- {NSC_EXTRA, "extra"},
- {NSC_CONST, "const"},
{NSC_BITS, "bits"},
+ {NSC_HIDDEN, "hidden"},
{0, NULL}
};
{NSC_LONG, "d"},
{NSC_DOUBLE, "g"},
{NSC_STRING, "s"},
- {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}
};
};
struct symbol nation_rejects[] = {
- {REJ_TELE, "telegrams"},
- {REJ_TREA, "treaties"},
- {REJ_ANNO, "announcements"},
- {REJ_LOAN, "loans"},
+ {bit(REJ_TELE), "telegrams"},
+ {bit(REJ_ANNO), "announcements"},
+ {bit(REJ_LOAN), "loans"},
{0, NULL}
};
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"},
{0, NULL}
};
+struct symbol sect_chr_flags[] = {
+ {D_DEITY, "deity"},
+ {0, NULL}
+};
+
struct symbol sector_navigation[] = {
{NAV_NONE, "land"},
{NAVOK, "sea"},
{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}
-};