/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2011, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ * Copyright (C) 1986-2014, 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-2010
+ * Markus Armbruster, 2004-2013
*/
/*
{"nchoppers", fldoff(m_nchoppers), NSC_UCHAR, 0, NULL, EF_BAD, 0},
{"tech", fldoff(m_tech), NSC_INT, 0, NULL, EF_BAD, 0},
{"cost", fldoff(m_cost), NSC_INT, 0, NULL, EF_BAD, 0},
- {"flags", fldoff(m_flags), NSC_LONG, 0, NULL,
+ {"flags", fldoff(m_flags), NSC_INT, 0, NULL,
EF_SHIP_CHR_FLAGS, NSC_BITS},
{"nplanes", fldoff(m_nplanes), NSC_UCHAR, 0, NULL, EF_BAD, 0},
{"nland", fldoff(m_nland), NSC_UCHAR, 0, NULL, EF_BAD, 0},
NSC_GENITEM(EF_PLANE, EF_PLANE_CHR),
{"wing", fldoff(pln_wing), NSC_STRINGY, 1, NULL, EF_BAD, 0},
{"range", fldoff(pln_range), NSC_UCHAR, 0, NULL, EF_BAD, 0},
+ {"harden", fldoff(pln_harden), NSC_CHAR, 0, NULL, EF_BAD, 0},
{"ship", fldoff(pln_ship), NSC_INT, 0, NULL, EF_SHIP, 0},
{"land", fldoff(pln_land), NSC_INT, 0, NULL, EF_LAND, 0},
- {"harden", fldoff(pln_harden), NSC_CHAR, 0, NULL, EF_BAD, 0},
- {"flags", fldoff(pln_flags), NSC_CHAR, 0, NULL,
+ {"flags", fldoff(pln_flags), NSC_INT, 0, NULL,
EF_PLANE_FLAGS, NSC_BITS},
{"access", fldoff(pln_access), NSC_SHORT, 0, NULL, EF_BAD, 0},
{"theta", fldoff(pln_theta), NSC_FLOAT, 0, NULL, EF_BAD, 0},
{"dam", fldoff(l_dam), NSC_INT, 0, NULL, EF_BAD, 0},
{"ammo", fldoff(l_ammo), NSC_INT, 0, NULL, EF_BAD, 0},
{"aaf", fldoff(l_aaf), NSC_INT, 0, NULL, EF_BAD, 0},
+ {"flags", fldoff(l_flags), NSC_INT, 0, NULL,
+ EF_LAND_CHR_FLAGS, NSC_BITS},
{"nxlight", fldoff(l_nxlight), NSC_UCHAR, 0, NULL, EF_BAD, 0},
{"nland", fldoff(l_nland), NSC_UCHAR, 0, NULL, EF_BAD, 0},
- {"flags", fldoff(l_flags), NSC_LONG, 0, NULL,
- EF_LAND_CHR_FLAGS, NSC_BITS},
{NULL, 0, NSC_NOTYPE, 0, NULL, EF_BAD, 0}
#undef CURSTR
};
struct castr nuke_ca[] = {
#define CURSTR struct nukstr
NSC_GENITEM(EF_NUKE, EF_NUKE_CHR),
+ {"stockpile", fldoff(nuk_stockpile), NSC_STRINGY, 1, NULL, EF_BAD, 0},
{"plane", fldoff(nuk_plane), NSC_INT, 0, NULL, EF_PLANE, 0},
{NULL, 0, NSC_NOTYPE, 0, NULL, EF_BAD, 0}
#undef CURSTR
#undef CURSTR
};
-struct castr treaty_ca[] = {
-#define CURSTR struct trtstr
- {"uid", fldoff(trt_uid), NSC_INT, 0, NULL, EF_TREATY, 0},
- {"timestamp", fldoff(trt_timestamp), NSC_TIME, 0, NULL,
- EF_BAD, NSC_EXTRA},
- {"cna", fldoff(trt_cna), NSC_NATID, 0, NULL, EF_NATION, 0},
- {"cnb", fldoff(trt_cnb), NSC_NATID, 0, NULL, EF_NATION, 0},
- {"status", fldoff(trt_status), NSC_CHAR, 0, NULL,
- EF_AGREEMENT_STATUS, 0},
- {"acond", fldoff(trt_acond), NSC_SHORT, 0, NULL,
- EF_TREATY_FLAGS, NSC_BITS},
- {"bcond", fldoff(trt_bcond), NSC_SHORT, 0, NULL,
- EF_TREATY_FLAGS, NSC_BITS},
- {"exp", fldoff(trt_exp), NSC_TIME, 0, NULL, EF_BAD, 0},
- {NULL, 0, NSC_NOTYPE, 0, NULL, EF_BAD, 0}
-#undef CURSTR
-};
-
struct castr loan_ca[] = {
#define CURSTR struct lonstr
{"uid", fldoff(l_uid), NSC_INT, 0, NULL, EF_LOAN, 0},
EF_AGREEMENT_STATUS, 0},
{"irate", fldoff(l_irate), NSC_INT, 0, NULL, EF_BAD, 0},
{"ldur", fldoff(l_ldur), NSC_INT, 0, NULL, EF_BAD, 0},
- {"amtpaid", fldoff(l_amtpaid), NSC_LONG, 0, NULL, EF_BAD, 0},
- {"amtdue", fldoff(l_amtdue), NSC_LONG, 0, NULL, EF_BAD, 0},
+ {"amtpaid", fldoff(l_amtpaid), NSC_INT, 0, NULL, EF_BAD, 0},
+ {"amtdue", fldoff(l_amtdue), NSC_INT, 0, NULL, EF_BAD, 0},
{"lastpay", fldoff(l_lastpay), NSC_TIME, 0, NULL, EF_BAD, 0},
{"duedate", fldoff(l_duedate), NSC_TIME, 0, NULL, EF_BAD, 0},
{NULL, 0, NSC_NOTYPE, 0, NULL, EF_BAD, 0}
{"timestamp", fldoff(lost_timestamp), NSC_TIME, 0, NULL,
EF_BAD, 0},
{"owner", fldoff(lost_owner), NSC_NATID, 0, NULL, EF_NATION, 0},
- {"type", fldoff(lost_type), NSC_CHAR, 0, NULL, EF_TABLE, 0},
+ {"type", fldoff(lost_type), NSC_SHORT, 0, NULL, EF_TABLE, 0},
/* id's ca_table given by type, but can't express that: */
{"id", fldoff(lost_id), NSC_INT, 0, NULL, EF_BAD, 0},
{"x", fldoff(lost_x), NSC_XCOORD, 0, NULL, EF_BAD, 0},
{"timestamp", fldoff(trd_timestamp), NSC_TIME, 0, NULL,
EF_BAD, NSC_EXTRA},
{"owner", fldoff(trd_owner), NSC_NATID, 0, NULL, EF_NATION, 0},
- {"type", fldoff(trd_type), NSC_CHAR, 0, NULL, EF_TABLE, 0},
+ {"type", fldoff(trd_type), NSC_SHORT, 0, NULL, EF_TABLE, 0},
/* unitid's ca_table given by type, but can't express that: */
{"unitid", fldoff(trd_unitid), NSC_INT, 0, NULL, EF_BAD, 0},
- {"price", fldoff(trd_price), NSC_LONG, 0, NULL, EF_BAD, 0},
+ {"price", fldoff(trd_price), NSC_INT, 0, NULL, EF_BAD, 0},
{"maxbidder", fldoff(trd_maxbidder), NSC_INT, 0, NULL, EF_NATION, 0},
{"markettime", fldoff(trd_markettime), NSC_TIME, 0, NULL, EF_BAD, 0},
/* should let maxbidder access xloc, yloc, but can't express that: */
EF_BAD, NSC_EXTRA},
{"stat", fldoff(nat_stat), NSC_SITYPE(enum nat_status), 0, NULL,
EF_NATION_STATUS, NSC_EXTRA},
+ {"flags", fldoff(nat_flags), NSC_INT, 0, NULL,
+ EF_NATION_FLAGS, NSC_BITS},
{"cname", fldoff(nat_cnam), NSC_STRINGY, 20, NULL, EF_BAD, NSC_EXTRA},
{"passwd", fldoff(nat_pnam), NSC_STRINGY, 20, NULL,
EF_BAD, NSC_DEITY | NSC_EXTRA},
- {"ip", fldoff(nat_hostaddr), NSC_STRINGY, 32, NULL, EF_BAD, 0},
+ {"ip", fldoff(nat_hostaddr), NSC_STRINGY, 46, NULL, EF_BAD, 0},
{"hostname", fldoff(nat_hostname), NSC_STRINGY, 512, NULL, EF_BAD, 0},
{"userid", fldoff(nat_userid), NSC_STRINGY, 32, NULL, EF_BAD, 0},
{"xcap", fldoff(nat_xcap), NSC_XCOORD, 0, NULL, EF_BAD, 0},
{"timeused", fldoff(nat_timeused), NSC_INT, 0, NULL, EF_BAD, 0},
{"btu", fldoff(nat_btu), NSC_SHORT, 0, NULL, EF_BAD, 0},
{"access", fldoff(nat_access), NSC_SHORT, 0, NULL, EF_BAD, 0},
- {"milreserve", fldoff(nat_reserve), NSC_LONG, 0, NULL, EF_BAD, 0},
- {"money", fldoff(nat_money), NSC_LONG, 0, NULL, EF_BAD, 0},
+ {"milreserve", fldoff(nat_reserve), NSC_INT, 0, NULL, EF_BAD, 0},
+ {"money", fldoff(nat_money), NSC_INT, 0, NULL, EF_BAD, 0},
{"login", fldoff(nat_last_login), NSC_TIME, 0, NULL, EF_BAD, 0},
{"logout", fldoff(nat_last_logout), NSC_TIME, 0, NULL, EF_BAD, 0},
{"newstim", fldoff(nat_newstim), NSC_TIME, 0, NULL, EF_BAD, 0},
EF_BAD, NSC_DEITY | NSC_EXTRA},
{"rejects", fldoff(nat_rejects), NSC_UCHAR, MAXNOC, NULL,
EF_NATION_REJECTS, NSC_EXTRA | NSC_BITS},
- {"flags", fldoff(nat_flags), NSC_LONG, 0, NULL,
- EF_NATION_FLAGS, NSC_BITS},
{NULL, 0, NSC_NOTYPE, 0, NULL, EF_BAD, 0}
#undef CURSTR
};
/* no need for uid */
/* name must come first, clients may rely on it */
{"name", fldoff(ca_name), NSC_STRING, 0, NULL, EF_BAD, NSC_CONST},
- {"type", fldoff(ca_type), NSC_CHAR, 0, NULL, EF_META_TYPE, NSC_CONST},
- {"flags", fldoff(ca_flags), NSC_UCHAR, 0, NULL,
+ {"type", fldoff(ca_type), NSC_SITYPE(enum nsc_type), 0, NULL,
+ EF_META_TYPE, NSC_CONST},
+ {"flags", fldoff(ca_flags), NSC_INT, 0, NULL,
EF_META_FLAGS, NSC_CONST | NSC_BITS},
{"len", fldoff(ca_len), NSC_USHORT, 0, NULL, EF_BAD, NSC_CONST},
{"table", fldoff(ca_table), NSC_INT, 0, NULL, EF_TABLE, NSC_CONST},