/*
* 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
* nsc.c: Empire selection global structures
*
* Known contributors to this file:
- * Markus Armbruster, 2004-2016
+ * Markus Armbruster, 2004-2020
*/
/*
#include <config.h>
+#include <limits.h>
#include <stdlib.h>
#include "empobj.h"
-#include "file.h"
#include "optlist.h"
#include "news.h"
#include "nsc.h"
#include "product.h"
#include "unit.h"
+#include "version.h"
static void *nsc_ver(struct valstr *, struct natstr *, void *);
static void *nsc_ver_maxnoc(struct valstr *, struct natstr *, void *);
+static void *nsc_ver_version(struct valstr *, struct natstr *, void *);
static void *nsc_sct_terr(struct valstr *, struct natstr *, void *);
static void *nsc_sct_track(struct valstr *, struct natstr *, void *);
static void *nsc_cargo_nplane(struct valstr *, struct natstr *, void *);
static void *nsc_lnd_aaf(struct valstr *, struct natstr *, void *);
static void *nsc_lchr(struct valstr *, struct natstr *, void *);
static void *nsc_nws_timestamp(struct valstr *, struct natstr *, void *);
+static void *nsc_meta_type(struct valstr *, struct natstr *, void *);
+static void *nsc_meta_len(struct valstr *, struct natstr *, void *);
/* Ugly hacks to avoid illegibly long lines */
#define fldoff(fld) offsetof(CURSTR, fld)
NSC_IELT("uw", "u", sfx, base, I_UW), \
NSC_IELT("rad", "r", sfx, base, I_RAD)
+#define NSC_MELT(name, base, itype, flags, dump) \
+ {(name), ((base) + (itype)*sizeof(short)), \
+ NSC_SHORT, 0, NULL, EF_BAD, (flags), (dump) }
+
+#define NSC_MVEC(base, mil_dump, oil_dump, rad_dump) \
+NSC_MELT("c_build", base, I_CIVIL, 0, CA_DUMP_ONLY), \
+NSC_MELT("m_build", base, I_MILIT, 0, mil_dump), \
+NSC_MELT("s_build", base, I_SHELL, 0, CA_DUMP_ONLY), \
+NSC_MELT("g_build", base, I_GUN, 0, CA_DUMP_ONLY), \
+NSC_MELT("p_build", base, I_PETROL, 0, CA_DUMP_ONLY), \
+NSC_MELT("i_build", base, I_IRON, 0, CA_DUMP_ONLY), \
+NSC_MELT("d_build", base, I_DUST, 0, CA_DUMP_ONLY), \
+NSC_MELT("b_build", base, I_BAR, 0, CA_DUMP_ONLY), \
+NSC_MELT("f_build", base, I_FOOD, 0, CA_DUMP_ONLY), \
+NSC_MELT("o_build", base, I_OIL, 0, oil_dump), \
+NSC_MELT("l_build", base, I_LCM, 0, CA_DUMP), \
+NSC_MELT("h_build", base, I_HCM, 0, CA_DUMP), \
+NSC_MELT("u_build", base, I_UW, 0, CA_DUMP_ONLY), \
+NSC_MELT("r_build", base, I_RAD, 0, rad_dump)
+
struct castr ichr_ca[] = {
#define CURSTR struct ichrstr
{"uid", fldoff(i_uid), NSC_SITYPE(i_type), 0, NULL, EF_ITEM, 0,
{"mnem", fldoff(i_mnem), NSC_STRINGY, 1, NULL, EF_BAD, 0,
CA_DUMP_CONST},
{"power", fldoff(i_power), NSC_INT, 0, NULL, EF_BAD, 0, CA_DUMP},
- {"value", fldoff(i_value), NSC_INT, 0, NULL, EF_BAD, 0, CA_DUMP},
{"sell", fldoff(i_sell), NSC_INT, 0, NULL, EF_BAD, 0, CA_DUMP},
{"lbs", fldoff(i_lbs), NSC_INT, 0, NULL, EF_BAD, 0, CA_DUMP},
{"pkg", fldoff(i_pkg), NSC_INT, NUMPKG, NULL, EF_BAD, 0, CA_DUMP},
EF_PACKING, 0, CA_DUMP},
{"ostr", fldoff(d_ostr), NSC_FLOAT, 0, NULL, EF_BAD, 0, CA_DUMP},
{"dstr", fldoff(d_dstr), NSC_FLOAT, 0, NULL, EF_BAD, 0, CA_DUMP},
- {"value", fldoff(d_value), NSC_INT, 0, NULL, EF_BAD, 0, CA_DUMP},
+ NSC_MVEC(fldoff(d_mat), CA_DUMP_ONLY, CA_DUMP_ONLY, CA_DUMP_ONLY),
+ {"bwork", fldoff(d_bwork), NSC_INT, 0, NULL, EF_BAD, 0, CA_DUMP},
{"cost", fldoff(d_cost), NSC_INT, 0, NULL, EF_BAD, 0, CA_DUMP},
- {"build", fldoff(d_build), NSC_INT, 0, NULL, EF_BAD, 0, CA_DUMP},
- {"lcms", fldoff(d_lcms), NSC_INT, 0, NULL, EF_BAD, 0, CA_DUMP},
- {"hcms", fldoff(d_hcms), NSC_INT, 0, NULL, EF_BAD, 0, CA_DUMP},
{"maint", fldoff(d_maint), NSC_INT, 0, NULL, EF_BAD, 0, CA_DUMP},
{"maxpop", fldoff(d_maxpop), NSC_INT, 0, NULL, EF_BAD, 0, CA_DUMP},
+ {"flags", fldoff(d_flags), NSC_INT, 0, NULL,
+ EF_SECTOR_CHR_FLAGS, NSC_BITS, CA_DUMP},
{NULL, 0, NSC_NOTYPE, 0, NULL, EF_BAD, 0, CA_DUMP}
#undef CURSTR
};
{"type", fldoff(m_type), NSC_CHAR, 0, NULL, EF_SHIP_CHR, 0, CA_DUMP},
{"name", fldoff(m_name), NSC_STRING, 0, NULL, EF_BAD, 0, CA_DUMP},
NSC_IVEC(fldoff(m_item), ""),
- {"l_build", fldoff(m_mat[I_LCM]), NSC_SHORT, 0, NULL, EF_BAD, 0,
- CA_DUMP},
- {"h_build", fldoff(m_mat[I_HCM]), NSC_SHORT, 0, NULL, EF_BAD, 0,
- CA_DUMP},
+ NSC_MVEC(fldoff(m_mat), CA_DUMP_ONLY, CA_DUMP_ONLY, CA_DUMP_ONLY),
{"armor", fldoff(m_armor), NSC_INT, 0, NULL, EF_BAD, 0, CA_DUMP},
{"speed", fldoff(m_speed), NSC_INT, 0, NULL, EF_BAD, 0, CA_DUMP},
{"visib", fldoff(m_visib), NSC_INT, 0, NULL, EF_BAD, 0, CA_DUMP},
#define CURSTR struct plchrstr
{"type", fldoff(pl_type), NSC_CHAR, 0, NULL, EF_PLANE_CHR, 0, CA_DUMP},
{"name", fldoff(pl_name), NSC_STRING, 0, NULL, EF_BAD, 0, CA_DUMP},
- {"l_build", fldoff(pl_mat[I_LCM]), NSC_SHORT, 0, NULL, EF_BAD, 0,
- CA_DUMP},
- {"h_build", fldoff(pl_mat[I_HCM]), NSC_SHORT, 0, NULL, EF_BAD, 0,
- CA_DUMP},
+ NSC_MVEC(fldoff(pl_mat), CA_DUMP, CA_DUMP_ONLY, CA_DUMP_ONLY),
{"bwork", fldoff(pl_bwork), NSC_INT, 0, NULL, EF_BAD, 0, CA_DUMP},
{"tech", fldoff(pl_tech), NSC_INT, 0, NULL, EF_BAD, 0, CA_DUMP},
{"cost", fldoff(pl_cost), NSC_INT, 0, NULL, EF_BAD, 0, CA_DUMP},
{"att", fldoff(pl_att), NSC_INT, 0, NULL, EF_BAD, 0, CA_DUMP},
{"def", fldoff(pl_def), NSC_INT, 0, NULL, EF_BAD, 0, CA_DUMP},
{"range", fldoff(pl_range), NSC_INT, 0, NULL, EF_BAD, 0, CA_DUMP},
- {"crew", fldoff(pl_mat[I_MILIT]), NSC_SHORT, 0, NULL, EF_BAD, 0,
- CA_DUMP},
{"fuel", fldoff(pl_fuel), NSC_INT, 0, NULL, EF_BAD, 0, CA_DUMP},
{"stealth", fldoff(pl_stealth), NSC_INT, 0, NULL, EF_BAD, 0, CA_DUMP},
{"flags", fldoff(pl_flags), NSC_INT, 0, NULL,
{"type", fldoff(l_type), NSC_CHAR, 0, NULL, EF_LAND_CHR, 0, CA_DUMP},
{"name", fldoff(l_name), NSC_STRING, 0, NULL, EF_BAD, 0, CA_DUMP},
NSC_IVEC(fldoff(l_item), ""),
- {"l_build", fldoff(l_mat[I_LCM]), NSC_SHORT, 0, NULL, EF_BAD, 0,
- CA_DUMP},
- {"h_build", fldoff(l_mat[I_HCM]), NSC_SHORT, 0, NULL, EF_BAD, 0,
- CA_DUMP},
+ NSC_MVEC(fldoff(l_mat), CA_DUMP_ONLY, CA_DUMP_ONLY, CA_DUMP_ONLY),
{"bwork", fldoff(l_bwork), NSC_INT, 0, NULL, EF_BAD, 0, CA_DUMP},
{"tech", fldoff(l_tech), NSC_INT, 0, NULL, EF_BAD, 0, CA_DUMP},
{"cost", fldoff(l_cost), NSC_INT, 0, NULL, EF_BAD, 0, CA_DUMP},
#define CURSTR struct nchrstr
{"type", fldoff(n_type), NSC_CHAR, 0, NULL, EF_NUKE_CHR, 0, CA_DUMP},
{"name", fldoff(n_name), NSC_STRING, 0, NULL, EF_BAD, 0, CA_DUMP},
- {"l_build", fldoff(n_mat[I_LCM]), NSC_SHORT, 0, NULL, EF_BAD, 0,
- CA_DUMP},
- {"h_build", fldoff(n_mat[I_HCM]), NSC_SHORT, 0, NULL, EF_BAD, 0,
- CA_DUMP},
- {"o_build", fldoff(n_mat[I_OIL]), NSC_SHORT, 0, NULL, EF_BAD, 0,
- CA_DUMP},
- {"r_build", fldoff(n_mat[I_RAD]), NSC_SHORT, 0, NULL, EF_BAD, 0,
- CA_DUMP},
+ NSC_MVEC(fldoff(n_mat), CA_DUMP_ONLY, CA_DUMP, CA_DUMP),
{"blast", fldoff(n_blast), NSC_INT, 0, NULL, EF_BAD, 0, CA_DUMP},
{"dam", fldoff(n_dam), NSC_INT, 0, NULL, EF_BAD, 0, CA_DUMP},
{"bwork", fldoff(n_bwork), NSC_INT, 0, NULL, EF_BAD, 0, CA_DUMP},
{"action", fldoff(nws_vrb), NSC_UCHAR, 0, NULL, EF_NEWS_CHR, 0,
CA_DUMP},
{"victim", fldoff(nws_vno), NSC_NATID, 0, NULL, EF_NATION, 0, CA_DUMP},
- {"times", fldoff(nws_ntm), NSC_CHAR, 0, NULL, EF_BAD, 0, CA_DUMP},
+ {"times", fldoff(nws_ntm), NSC_USHORT, 0, NULL, EF_BAD, 0, CA_DUMP},
{"duration", fldoff(nws_duration), NSC_SHORT, 0, NULL, EF_BAD, 0,
CA_DUMP},
{"time", fldoff(nws_when), NSC_TIME, 0, NULL, EF_BAD, 0, CA_DUMP},
EF_BAD, NSC_DEITY, CA_DUMP_NONE},
{"ip", fldoff(nat_hostaddr), NSC_STRINGY, 46, NULL, EF_BAD, 0,
CA_DUMP},
- {"hostname", 0, NSC_STRINGY, 0, NULL, EF_BAD, 0, CA_DUMP}, /* deprecated */
{"userid", fldoff(nat_userid), NSC_STRINGY, 32, NULL, EF_BAD, 0,
CA_DUMP},
{"xcap", fldoff(nat_xcap), NSC_XCOORD, 0, NULL, EF_BAD, 0, CA_DUMP},
EF_BAD, 0, CA_DUMP},
{"happiness", fldoff(nat_level[NAT_HLEV]), NSC_FLOAT, 0, NULL,
EF_BAD, 0, CA_DUMP},
- {"relations", fldoff(nat_relate), NSC_UCHAR, MAXNOC, NULL,
- EF_NATION_RELATIONS, NSC_HIDDEN, CA_DUMP_NONE},
- /* mortals know there's contact (relations show), but not how strong */
- {"contacts", fldoff(nat_contact), NSC_UCHAR, MAXNOC, NULL,
- EF_BAD, NSC_DEITY, CA_DUMP_NONE},
- {"rejects", fldoff(nat_rejects), NSC_UCHAR, MAXNOC, NULL,
- EF_NATION_REJECTS, NSC_BITS, CA_DUMP_NONE},
{NULL, 0, NSC_NOTYPE, 0, NULL, EF_BAD, 0, CA_DUMP}
#undef CURSTR
};
-struct castr nat_ca[sizeof(cou_ca) / sizeof(*cou_ca)];
+struct castr nat_ca[ARRAY_SIZE(cou_ca)];
/* initialized by nsc_init() */
+struct castr relat_ca[] = {
+#define CURSTR struct relatstr
+ {"uid", fldoff(rel_uid), NSC_INT, 0, NULL, EF_RELAT, 0, CA_DUMP},
+ {"timestamp", fldoff(rel_timestamp), NSC_TIME, 0, NULL,
+ EF_BAD, 0, CA_DUMP_NONE},
+ {"relations", fldoff(rel_relate), NSC_UCHAR, MAXNOC, NULL,
+ EF_NATION_RELATIONS, NSC_HIDDEN, CA_DUMP},
+ {NULL, 0, NSC_NOTYPE, 0, NULL, EF_BAD, 0, CA_DUMP}
+#undef CURSTR
+};
+
+struct castr contact_ca[] = {
+#define CURSTR struct contactstr
+ {"uid", fldoff(con_uid), NSC_INT, 0, NULL, EF_CONTACT, 0, CA_DUMP},
+ {"timestamp", fldoff(con_timestamp), NSC_TIME, 0, NULL,
+ EF_BAD, 0, CA_DUMP_NONE},
+ /* mortals know there's contact (relations show), but not how strong */
+ {"contacts", fldoff(con_contact), NSC_UCHAR, MAXNOC, NULL,
+ EF_BAD, NSC_DEITY, CA_DUMP},
+ {NULL, 0, NSC_NOTYPE, 0, NULL, EF_BAD, 0, CA_DUMP}
+#undef CURSTR
+};
+
+struct castr reject_ca[] = {
+#define CURSTR struct rejectstr
+ {"uid", fldoff(rej_uid), NSC_INT, 0, NULL, EF_REJECT, 0, CA_DUMP},
+ {"timestamp", fldoff(rej_timestamp), NSC_TIME, 0, NULL,
+ EF_BAD, 0, CA_DUMP_NONE},
+ {"rejects", fldoff(rej_rejects), NSC_UCHAR, MAXNOC, NULL,
+ EF_NATION_REJECTS, NSC_BITS, CA_DUMP},
+ {NULL, 0, NSC_NOTYPE, 0, NULL, EF_BAD, 0, CA_DUMP}
+#undef CURSTR
+};
+
struct castr realm_ca[] = {
#define CURSTR struct realmstr
/* uid is encoded in cnum, realm */
/* no need for uid as long as it's not referenced from other tables */
{"name", fldoff(in_name), NSC_STRING, 0, NULL, EF_BAD, 0,
CA_DUMP_CONST},
- {"lcms", fldoff(in_lcms), NSC_UCHAR, 0, NULL, EF_BAD, 0, CA_DUMP},
- {"hcms", fldoff(in_hcms), NSC_UCHAR, 0, NULL, EF_BAD, 0, CA_DUMP},
- {"dcost", fldoff(in_dcost), NSC_UCHAR, 0, NULL, EF_BAD, 0, CA_DUMP},
- {"mcost", fldoff(in_mcost), NSC_UCHAR, 0, NULL, EF_BAD, 0, CA_DUMP},
+ NSC_MVEC(fldoff(in_mat), CA_DUMP_ONLY, CA_DUMP_ONLY, CA_DUMP_ONLY),
+ {"bmobil", fldoff(in_bmobil), NSC_SHORT, 0, NULL, EF_BAD, 0, CA_DUMP},
+ {"cost", fldoff(in_cost), NSC_INT, 0, NULL, EF_BAD, 0, CA_DUMP},
{"enable", fldoff(in_enable), NSC_UCHAR, 0, NULL, EF_BAD, 0, CA_DUMP},
{NULL, 0, NSC_NOTYPE, 0, NULL, EF_BAD, 0, CA_DUMP}
#undef CURSTR
struct castr symbol_ca[] = {
#define CURSTR struct symbol
/*
- * value is is const because it has to match what is compiled into
+ * value is const because it has to match what is compiled into
* the server. name is const because clients key on it.
*/
{"value", fldoff(value), NSC_INT, 0, NULL, EF_BAD, 0, CA_DUMP_CONST},
/* name must come first, clients may rely on it */
{"name", fldoff(ca_name), NSC_STRING, 0, NULL, EF_BAD, 0,
CA_DUMP_CONST},
- {"type", fldoff(ca_type), NSC_SITYPE(enum nsc_type), 0, NULL,
+ {"type", fldoff(ca_type), NSC_LONG, 0, nsc_meta_type,
EF_META_TYPE, 0, CA_DUMP_CONST},
{"flags", fldoff(ca_flags), NSC_INT, 0, NULL,
EF_META_FLAGS, NSC_BITS, CA_DUMP_CONST},
- {"len", fldoff(ca_len), NSC_USHORT, 0, NULL, EF_BAD, 0, CA_DUMP_CONST},
+ {"len", fldoff(ca_len), NSC_LONG, 0, nsc_meta_len,
+ EF_BAD, 0, CA_DUMP_CONST},
{"table", fldoff(ca_table), NSC_INT, 0, NULL, EF_TABLE, 0,
CA_DUMP_CONST},
{NULL, 0, NSC_NOTYPE, 0, NULL, EF_BAD, 0, CA_DUMP}
nsc_init(void)
{
static struct castr version_ca0 = {
- "version", 0, NSC_STRINGY, sizeof(PACKAGE_STRING), NULL, EF_BAD, 0,
- CA_DUMP
+ "version", 0, NSC_STRING, 0, nsc_ver_version, EF_BAD, 0, CA_DUMP
};
static struct castr version_ca1 = {
"maxnoc", 0, NSC_LONG, 0, nsc_ver_maxnoc, EF_BAD, 0, CA_DUMP
return NULL;
}
+static void *
+nsc_ver_version(struct valstr *val, struct natstr *np, void *ptr)
+{
+ val->val_as.str.base = version;
+ val->val_as.str.maxsz = INT_MAX; /* really SIZE_MAX, but that's C99 */
+ return NULL;
+}
+
static void *
nsc_sct_terr(struct valstr *val, struct natstr *np, void *ptr)
{
val->val_as.lng = np->nws_when + np->nws_duration;
return NULL;
}
+
+static void *
+nsc_meta_type(struct valstr *val, struct natstr *natp, void *ptr)
+{
+ val->val_as.lng = nstr_promote(((struct castr *)ptr)->ca_type);
+ return NULL;
+}
+
+static void *
+nsc_meta_len(struct valstr *val, struct natstr *natp, void *ptr)
+{
+ struct castr *ca = ptr;
+
+ val->val_as.lng = ca->ca_type == NSC_STRINGY ? 0 : ca->ca_len;
+ return NULL;
+}
projects / empserver / blobdiff