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

(empfile, SYMTAB): Reorder so that symbol tables are together. Sort

Browse source 
them alphabetically.  Factor out commonalities into new SYMTAB().  No
functional changes.
This commit is contained in:
Markus Armbruster 2006-02-18 15:02:18 +00:00
parent a0bd72feed
commit fd461e7bf5
2 changed files with 39 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

29
include/file.h
View file

@ -122,31 +122,32 @@ enum {
EF_LAND_CHR, EF_LAND_CHR,
EF_NUKE_CHR, EF_NUKE_CHR,
EF_NEWS_CHR, EF_NEWS_CHR,
EF_TREATY_FLAGS,
EF_ITEM, EF_ITEM,
EF_INFRASTRUCTURE, EF_INFRASTRUCTURE,
EF_PRODUCT, EF_PRODUCT,
EF_TABLE, EF_TABLE,
EF_SHIP_CHR_FLAGS,
EF_PLANE_CHR_FLAGS,
EF_LAND_CHR_FLAGS,
EF_NUKE_CHR_FLAGS,
EF_META, EF_META,
EF_META_TYPE, /* Symbol tables */
EF_AGREEMENT_STATUS,
EF_LAND_CHR_FLAGS,
EF_LEVEL,
EF_META_FLAGS, EF_META_FLAGS,
EF_META_TYPE,
EF_MISSIONS, EF_MISSIONS,
EF_PLANE_FLAGS,
EF_RETREAT_FLAGS,
EF_NATION_FLAGS, EF_NATION_FLAGS,
EF_NATION_RELATIONS, EF_NATION_RELATIONS,
EF_LEVEL,
EF_AGREEMENT_STATUS,
EF_PLAGUE_STAGES,
EF_PACKING,
EF_RESOURCES,
EF_NATION_STATUS, EF_NATION_STATUS,
EF_SECTOR_NAVIGATION, EF_NUKE_CHR_FLAGS,
EF_PACKING,
EF_PAGE_HEADINGS, EF_PAGE_HEADINGS,
EF_PLAGUE_STAGES,
EF_PLANE_CHR_FLAGS,
EF_PLANE_FLAGS,
EF_RESOURCES,
EF_RETREAT_FLAGS,
EF_SECTOR_NAVIGATION,
EF_SHIP_CHR_FLAGS,
EF_TREATY_FLAGS,
/* Views */ /* Views */
EF_COUNTRY, EF_COUNTRY,
/* Number of types: */ /* Number of types: */

60
src/lib/global/file.c
View file

@ -151,48 +151,36 @@ struct empfile empfile[] = {
{EF_LAND_CHR, "land-chr", NULL, lchr_ca, ARRAY_CACHE(lchr, EFF_CFG)}, {EF_LAND_CHR, "land-chr", NULL, lchr_ca, ARRAY_CACHE(lchr, EFF_CFG)},
{EF_NUKE_CHR, "nuke-chr", NULL, nchr_ca, ARRAY_CACHE(nchr, EFF_CFG)}, {EF_NUKE_CHR, "nuke-chr", NULL, nchr_ca, ARRAY_CACHE(nchr, EFF_CFG)},
{EF_NEWS_CHR, "news-chr", NULL, rpt_ca, ARRAY_TABLE(rpt, EFF_CFG)}, {EF_NEWS_CHR, "news-chr", NULL, rpt_ca, ARRAY_TABLE(rpt, EFF_CFG)},
{EF_TREATY_FLAGS, "treaty-flags", NULL, symbol_ca,
PTR_CACHE(treaty_flags, EFF_CFG)},
{EF_ITEM, "item", NULL, ichr_ca, ARRAY_TABLE(ichr, EFF_CFG)}, {EF_ITEM, "item", NULL, ichr_ca, ARRAY_TABLE(ichr, EFF_CFG)},
{EF_INFRASTRUCTURE, "infrastructure", NULL, intrchr_ca, {EF_INFRASTRUCTURE, "infrastructure", NULL, intrchr_ca,
ARRAY_TABLE(intrchr, EFF_CFG)}, ARRAY_TABLE(intrchr, EFF_CFG)},
{EF_PRODUCT, "product", NULL, pchr_ca, ARRAY_TABLE(pchr, EFF_CFG)}, {EF_PRODUCT, "product", NULL, pchr_ca, ARRAY_TABLE(pchr, EFF_CFG)},
{EF_TABLE, "table", NULL, empfile_ca, ARRAY_TABLE(empfile, EFF_CFG)}, {EF_TABLE, "table", NULL, empfile_ca, ARRAY_TABLE(empfile, EFF_CFG)},
{EF_SHIP_CHR_FLAGS, "ship-chr-flags", NULL, symbol_ca,
PTR_CACHE(ship_chr_flags, EFF_CFG)},
{EF_PLANE_CHR_FLAGS, "plane-chr-flags", NULL, symbol_ca,
PTR_CACHE(plane_chr_flags, EFF_CFG)},
{EF_LAND_CHR_FLAGS, "land-chr-flags", NULL, symbol_ca,
PTR_CACHE(land_chr_flags, EFF_CFG)},
{EF_NUKE_CHR_FLAGS, "nuke-chr-flags", NULL, symbol_ca,
PTR_CACHE(nuke_chr_flags, EFF_CFG)},
{EF_META, "meta", NULL, mdchr_ca, PTR_CACHE(mdchr_ca, EFF_CFG)}, {EF_META, "meta", NULL, mdchr_ca, PTR_CACHE(mdchr_ca, EFF_CFG)},
{EF_META_TYPE, "meta-type", NULL, symbol_ca,
PTR_CACHE(meta_type, EFF_CFG)}, /* Symbol tables */
{EF_META_FLAGS, "meta-flags", NULL, symbol_ca, #define SYMTAB(type, name, tab) \
PTR_CACHE(meta_flags, EFF_CFG)}, {(type), (name), NULL, symbol_ca, PTR_CACHE((tab), EFF_CFG)}
{EF_MISSIONS, "missions", NULL, symbol_ca, PTR_CACHE(missions, EFF_CFG)}, SYMTAB(EF_AGREEMENT_STATUS, "agreement-status", agreement_statuses),
{EF_PLANE_FLAGS, "plane-flags", NULL, symbol_ca, SYMTAB(EF_LAND_CHR_FLAGS, "land-chr-flags", land_chr_flags),
PTR_CACHE(plane_flags, EFF_CFG)}, SYMTAB(EF_LEVEL, "level", level),
{EF_RETREAT_FLAGS, "retreat-flags", NULL, symbol_ca, SYMTAB(EF_META_FLAGS, "meta-flags", meta_flags),
PTR_CACHE(retreat_flags, EFF_CFG)}, SYMTAB(EF_META_TYPE, "meta-type", meta_type),
{EF_NATION_FLAGS, "nation-flags", NULL, symbol_ca, SYMTAB(EF_MISSIONS, "missions", missions),
PTR_CACHE(nation_flags, EFF_CFG)}, SYMTAB(EF_NATION_FLAGS, "nation-flags", nation_flags),
{EF_NATION_RELATIONS, "nation-relationships", NULL, symbol_ca, SYMTAB(EF_NATION_RELATIONS, "nation-relationships", nation_relations),
PTR_CACHE(nation_relations, EFF_CFG)}, SYMTAB(EF_NATION_STATUS, "nation-status", nation_status),
{EF_LEVEL, "level", NULL, symbol_ca, PTR_CACHE(level, EFF_CFG)}, SYMTAB(EF_NUKE_CHR_FLAGS, "nuke-chr-flags", nuke_chr_flags),
{EF_AGREEMENT_STATUS, "agreement-status", NULL, symbol_ca, SYMTAB(EF_PACKING, "packing", packing),
PTR_CACHE(agreement_statuses, EFF_CFG)}, SYMTAB(EF_PAGE_HEADINGS, "page-headings", page_headings),
{EF_PLAGUE_STAGES, "plague-stages", NULL, symbol_ca, SYMTAB(EF_PLAGUE_STAGES, "plague-stages", plague_stages),
PTR_CACHE(plague_stages, EFF_CFG)}, SYMTAB(EF_PLANE_CHR_FLAGS, "plane-chr-flags", plane_chr_flags),
{EF_PACKING, "packing", NULL, symbol_ca, PTR_CACHE(packing, EFF_CFG)}, SYMTAB(EF_PLANE_FLAGS, "plane-flags", plane_flags),
{EF_RESOURCES, "resources", NULL, symbol_ca, PTR_CACHE(resources, EFF_CFG)}, SYMTAB(EF_RESOURCES, "resources", resources),
{EF_NATION_STATUS, "nation-status", NULL, symbol_ca, SYMTAB(EF_RETREAT_FLAGS, "retreat-flags", retreat_flags),
PTR_CACHE(nation_status, EFF_CFG)}, SYMTAB(EF_SECTOR_NAVIGATION, "sector-navigation", sector_navigation),
{EF_SECTOR_NAVIGATION, "sector-navigation", NULL, symbol_ca, SYMTAB(EF_SHIP_CHR_FLAGS, "ship-chr-flags", ship_chr_flags),
PTR_CACHE(sector_navigation, EFF_CFG)}, SYMTAB(EF_TREATY_FLAGS, "treaty-flags", treaty_flags),
{EF_PAGE_HEADINGS, "page-headings", NULL, symbol_ca,
PTR_CACHE(page_headings, EFF_CFG)},
/* Views */ /* Views */
{EF_COUNTRY, "country", NULL, cou_ca, UNMAPPED_CACHE(struct natstr, 0)}, {EF_COUNTRY, "country", NULL, cou_ca, UNMAPPED_CACHE(struct natstr, 0)},