empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Reorder selectors to match struct member order, for easier consistency

Browse source 
checking.
This commit is contained in:
Markus Armbruster 2004-08-21 12:50:58 +00:00
parent 3e5c0643db
commit d12995ff68
1 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/lib/global/nsc.c
View file

@ -83,7 +83,10 @@ struct castr sect_ca[] = {
{NSC_UCHAR, NSC_EXTRA, 0, fldoff(sctstr, sct_terr), "terr0"}, {NSC_UCHAR, NSC_EXTRA, 0, fldoff(sctstr, sct_terr), "terr0"},
{NSC_UCHAR, 0, 0, fldoff(sctstr, sct_terr1), "terr1"}, {NSC_UCHAR, 0, 0, fldoff(sctstr, sct_terr1), "terr1"},
{NSC_UCHAR, 0, 0, fldoff(sctstr, sct_terr2), "terr2"}, {NSC_UCHAR, 0, 0, fldoff(sctstr, sct_terr2), "terr2"},
{NSC_XCOORD, 0, 0, fldoff(sctstr, sct_dist_x), "xdist"},
{NSC_YCOORD, 0, 0, fldoff(sctstr, sct_dist_y), "ydist"},
{NSC_UCHAR, 0, 0, fldoff(sctstr, sct_terr3), "terr3"}, {NSC_UCHAR, 0, 0, fldoff(sctstr, sct_terr3), "terr3"},
{NSC_SHORT, 0, 0, fldoff(sctstr, sct_avail), "avail"},
{NSC_UCHAR, 0, 0, fldoff(sctstr, sct_work), "work"}, {NSC_UCHAR, 0, 0, fldoff(sctstr, sct_work), "work"},
{NSC_UCHAR, 0, 0, fldoff(sctstr, sct_coastal), "coastal"}, {NSC_UCHAR, 0, 0, fldoff(sctstr, sct_coastal), "coastal"},
{NSC_TYPEID, 0, 0, fldoff(sctstr, sct_newtype), "newdes"}, {NSC_TYPEID, 0, 0, fldoff(sctstr, sct_newtype), "newdes"},
@ -94,9 +97,6 @@ struct castr sect_ca[] = {
{NSC_UCHAR, 0, 0, fldoff(sctstr, sct_uran), "uran"}, {NSC_UCHAR, 0, 0, fldoff(sctstr, sct_uran), "uran"},
{NSC_NATID, 0, 0, fldoff(sctstr, sct_oldown), "oldown"}, {NSC_NATID, 0, 0, fldoff(sctstr, sct_oldown), "oldown"},
{NSC_UCHAR, 0, 0, fldoff(sctstr, sct_off), "off"}, {NSC_UCHAR, 0, 0, fldoff(sctstr, sct_off), "off"},
{NSC_XCOORD, 0, 0, fldoff(sctstr, sct_dist_x), "xdist"},
{NSC_YCOORD, 0, 0, fldoff(sctstr, sct_dist_y), "ydist"},
{NSC_SHORT, 0, 0, fldoff(sctstr, sct_avail), "avail"},
NSC_IVEC(fldoff(sctstr, sct_item), ""), NSC_IVEC(fldoff(sctstr, sct_item), ""),
NSC_IVEC(fldoff(sctstr, sct_dist), "_dist"), NSC_IVEC(fldoff(sctstr, sct_dist), "_dist"),
NSC_IVEC(fldoff(sctstr, sct_del), "_del"), NSC_IVEC(fldoff(sctstr, sct_del), "_del"),
@ -131,14 +131,14 @@ struct castr ship_ca[] = {
NSC_GENITEM, NSC_GENITEM,
{NSC_CHAR, 0, 0, fldoff(shpstr, shp_fleet), "fleet"}, {NSC_CHAR, 0, 0, fldoff(shpstr, shp_fleet), "fleet"},
{NSC_UCHAR, 0, 0, fldoff(shpstr, shp_nplane), "nplane"}, {NSC_UCHAR, 0, 0, fldoff(shpstr, shp_nplane), "nplane"},
{NSC_TIME, 0, 0, fldoff(shpstr, shp_timestamp), "timestamp"},
{NSC_UCHAR, 0, 0, fldoff(shpstr, shp_fuel), "fuel"},
{NSC_UCHAR, 0, 0, fldoff(shpstr, shp_nxlight), "nxlight"},
{NSC_UCHAR, 0, 0, fldoff(shpstr, shp_nchoppers), "nchoppers"},
{NSC_UCHAR, 0, 0, fldoff(shpstr, shp_autonav), "autonav"}, {NSC_UCHAR, 0, 0, fldoff(shpstr, shp_autonav), "autonav"},
NSC_IVEC(fldoff(shpstr, shp_item), ""),
{NSC_USHORT, NSC_DEITY, 0, fldoff(shpstr, shp_pstage), "pstage"}, {NSC_USHORT, NSC_DEITY, 0, fldoff(shpstr, shp_pstage), "pstage"},
{NSC_USHORT, NSC_DEITY, 0, fldoff(shpstr, shp_ptime), "ptime"}, {NSC_USHORT, NSC_DEITY, 0, fldoff(shpstr, shp_ptime), "ptime"},
NSC_IVEC(fldoff(shpstr, shp_item), ""), {NSC_TIME, 0, 0, fldoff(shpstr, shp_timestamp), "timestamp"},
{NSC_UCHAR, 0, 0, fldoff(shpstr, shp_fuel), "fuel"},
{NSC_UCHAR, 0, 0, fldoff(shpstr, shp_nchoppers), "nchoppers"},
{NSC_UCHAR, 0, 0, fldoff(shpstr, shp_nxlight), "nxlight"},
{NSC_NOTYPE, 0, 0, 0, NULL} {NSC_NOTYPE, 0, 0, 0, NULL}
}; };
@ -147,12 +147,12 @@ struct castr plane_ca[] = {
{NSC_CHAR, 0, 0, fldoff(plnstr, pln_wing), "wing"}, {NSC_CHAR, 0, 0, fldoff(plnstr, pln_wing), "wing"},
{NSC_UCHAR, 0, 0, fldoff(plnstr, pln_range), "range"}, {NSC_UCHAR, 0, 0, fldoff(plnstr, pln_range), "range"},
{NSC_SHORT, 0, 0, fldoff(plnstr, pln_ship), "ship"}, {NSC_SHORT, 0, 0, fldoff(plnstr, pln_ship), "ship"},
{NSC_SHORT, 0, 0, fldoff(plnstr, pln_land), "land"},
{NSC_INT, NSC_EXTRA, 0, fldoff(plnstr, pln_att), "att"}, {NSC_INT, NSC_EXTRA, 0, fldoff(plnstr, pln_att), "att"},
{NSC_INT, NSC_EXTRA, 0, fldoff(plnstr, pln_def), "def"}, {NSC_INT, NSC_EXTRA, 0, fldoff(plnstr, pln_def), "def"},
{NSC_CHAR, 0, 0, fldoff(plnstr, pln_harden), "harden"}, {NSC_CHAR, 0, 0, fldoff(plnstr, pln_harden), "harden"},
{NSC_CHAR, 0, 0, fldoff(plnstr, pln_nuketype), "nuketype"}, {NSC_CHAR, 0, 0, fldoff(plnstr, pln_nuketype), "nuketype"},
{NSC_CHAR, 0, 0, fldoff(plnstr, pln_flags), "flags"}, {NSC_CHAR, 0, 0, fldoff(plnstr, pln_flags), "flags"},
{NSC_SHORT, 0, 0, fldoff(plnstr, pln_land), "land"},
{NSC_TIME, 0, 0, fldoff(plnstr, pln_timestamp), "timestamp"}, {NSC_TIME, 0, 0, fldoff(plnstr, pln_timestamp), "timestamp"},
{NSC_NOTYPE, 0, 0, 0, NULL} {NSC_NOTYPE, 0, 0, 0, NULL}
}; };
@ -161,7 +161,6 @@ struct castr land_ca[] = {
NSC_GENITEM, NSC_GENITEM,
{NSC_CHAR, 0, 0, fldoff(lndstr, lnd_army), "army"}, {NSC_CHAR, 0, 0, fldoff(lndstr, lnd_army), "army"},
{NSC_SHORT, 0, 0, fldoff(lndstr, lnd_ship), "ship"}, {NSC_SHORT, 0, 0, fldoff(lndstr, lnd_ship), "ship"},
{NSC_SHORT, 0, 0, fldoff(lndstr, lnd_land), "land"},
{NSC_CHAR, 0, 0, fldoff(lndstr, lnd_harden), "harden"}, {NSC_CHAR, 0, 0, fldoff(lndstr, lnd_harden), "harden"},
{NSC_SHORT, 0, 0, fldoff(lndstr, lnd_retreat), "retreat"}, {NSC_SHORT, 0, 0, fldoff(lndstr, lnd_retreat), "retreat"},
{NSC_UCHAR, 0, 0, fldoff(lndstr, lnd_fuel), "fuel"}, {NSC_UCHAR, 0, 0, fldoff(lndstr, lnd_fuel), "fuel"},
@ -169,6 +168,7 @@ struct castr land_ca[] = {
NSC_IVEC(fldoff(lndstr, lnd_item), ""), NSC_IVEC(fldoff(lndstr, lnd_item), ""),
{NSC_USHORT, NSC_DEITY, 0, fldoff(lndstr, lnd_pstage), "pstage"}, {NSC_USHORT, NSC_DEITY, 0, fldoff(lndstr, lnd_pstage), "pstage"},
{NSC_USHORT, NSC_DEITY, 0, fldoff(lndstr, lnd_ptime), "ptime"}, {NSC_USHORT, NSC_DEITY, 0, fldoff(lndstr, lnd_ptime), "ptime"},
{NSC_SHORT, 0, 0, fldoff(lndstr, lnd_land), "land"},
{NSC_FLOAT, NSC_EXTRA, 0, fldoff(lndstr, lnd_att), "att"}, {NSC_FLOAT, NSC_EXTRA, 0, fldoff(lndstr, lnd_att), "att"},
{NSC_FLOAT, NSC_EXTRA, 0, fldoff(lndstr, lnd_def), "def"}, {NSC_FLOAT, NSC_EXTRA, 0, fldoff(lndstr, lnd_def), "def"},
{NSC_INT, NSC_EXTRA, 0, fldoff(lndstr, lnd_vul), "vul"}, {NSC_INT, NSC_EXTRA, 0, fldoff(lndstr, lnd_vul), "vul"},
@ -278,7 +278,6 @@ struct castr trade_ca[] = {
}; };
struct castr nat_ca[] = { struct castr nat_ca[] = {
{NSC_NATID, 0, 0, fldoff(natstr, nat_cnum), "cnum"},
#if !defined(_WIN32) #if !defined(_WIN32)
{NSC_CHAR, 0, 20, fldoff(natstr, nat_cnam[0]), "cnam"}, {NSC_CHAR, 0, 20, fldoff(natstr, nat_cnam[0]), "cnam"},
{NSC_CHAR, NSC_DEITY, 20, fldoff(natstr, nat_pnam[0]), "pnam"}, {NSC_CHAR, NSC_DEITY, 20, fldoff(natstr, nat_pnam[0]), "pnam"},
@ -292,6 +291,7 @@ struct castr nat_ca[] = {
{NSC_YCOORD, 0, 0, fldoff(natstr, nat_ycap), "ycap"}, {NSC_YCOORD, 0, 0, fldoff(natstr, nat_ycap), "ycap"},
{NSC_XCOORD, NSC_DEITY, 0, fldoff(natstr, nat_xorg), "xorg"}, {NSC_XCOORD, NSC_DEITY, 0, fldoff(natstr, nat_xorg), "xorg"},
{NSC_YCOORD, NSC_DEITY, 0, fldoff(natstr, nat_yorg), "yorg"}, {NSC_YCOORD, NSC_DEITY, 0, fldoff(natstr, nat_yorg), "yorg"},
{NSC_NATID, 0, 0, fldoff(natstr, nat_cnum), "cnum"},
#ifdef MAYBE_LATER #ifdef MAYBE_LATER
{NSC_CHAR, 0, 0, fldoff(natstr, nat_stat), "stat"}, {NSC_CHAR, 0, 0, fldoff(natstr, nat_stat), "stat"},
{NSC_CHAR, 0, 0, fldoff(natstr, nat_dayno), "dayno"}, {NSC_CHAR, 0, 0, fldoff(natstr, nat_dayno), "dayno"},