/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2016, 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-2016
+ * Markus Armbruster, 2006-2020
*/
#include <config.h>
#include "land.h"
+#include "loan.h"
#include "misc.h"
#include "mission.h"
#include "nat.h"
#include "ship.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}
};
{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_TIME, "d"},
- {NSC_FLOAT, "g"},
- {NSC_STRINGY, "c"},
{NSC_NOTYPE, NULL}
};
};
struct symbol nation_rejects[] = {
- {REJ_TELE, "telegrams"},
- {REJ_ANNO, "announcements"},
- {REJ_LOAN, "loans"},
+ {bit(REJ_TELE), "telegrams"},
+ {bit(REJ_ANNO), "announcements"},
+ {bit(REJ_LOAN), "loans"},
{0, NULL}
};