From 898aaf3d3dfe6972b9fd7bf9249695f54b53203e Mon Sep 17 00:00:00 2001 From: Ron Koenderink Date: Sat, 22 Oct 2005 19:10:22 +0000 Subject: [PATCH] (empfile, empfile_ca): New struct empfile member ef_uid. --- include/file.h | 1 + src/lib/global/file.c | 62 +++++++++++++++++++++---------------------- src/lib/global/nsc.c | 1 + 3 files changed, 33 insertions(+), 31 deletions(-) diff --git a/include/file.h b/include/file.h index 91407511..2fef929b 100644 --- a/include/file.h +++ b/include/file.h @@ -37,6 +37,7 @@ #include struct empfile { + int ef_uid; /* Table ID */ char *name; /* Empire name (e.g., "treaty") */ char *file; /* file name (relative to data directory) */ int flags; /* misc stuff */ diff --git a/src/lib/global/file.c b/src/lib/global/file.c index a25cf47c..a9ad7d58 100644 --- a/src/lib/global/file.c +++ b/src/lib/global/file.c @@ -56,104 +56,104 @@ struct empfile empfile[] = { /* Dynamic game data */ - {"sect", "sector", EFF_XY | EFF_OWNER, + {EF_SECTOR, "sect", "sector", EFF_XY | EFF_OWNER, 0, sizeof(struct sctstr), NULL, NULL, NULL, -1, -1, 0, 0, NULL, 0, sect_ca}, - {"ship", "ship", EFF_XY | EFF_OWNER | EFF_GROUP, + {EF_SHIP, "ship", "ship", EFF_XY | EFF_OWNER | EFF_GROUP, 0, sizeof(struct shpstr), NULL, NULL, NULL, -1, -1, 0, 0, NULL, 0, ship_ca}, - {"plane", "plane", EFF_XY | EFF_OWNER | EFF_GROUP, + {EF_PLANE, "plane", "plane", EFF_XY | EFF_OWNER | EFF_GROUP, 0, sizeof(struct plnstr), NULL, NULL, NULL, -1, -1, 0, 0, NULL, 0, plane_ca}, - {"land", "land", EFF_XY | EFF_OWNER | EFF_GROUP, + {EF_LAND, "land", "land", EFF_XY | EFF_OWNER | EFF_GROUP, 0, sizeof(struct lndstr), NULL, NULL, NULL, -1, -1, 0, 0, NULL, 0, land_ca}, - {"nuke", "nuke", EFF_XY | EFF_OWNER, + {EF_NUKE, "nuke", "nuke", EFF_XY | EFF_OWNER, 0, sizeof(struct nukstr), NULL, NULL, NULL, -1, -1, 0, 0, NULL, 0, nuke_ca}, - {"news", "news", 0, + {EF_NEWS, "news", "news", 0, 0, sizeof(struct nwsstr), NULL, NULL, NULL, -1, -1, 0, 0, NULL, 0, news_ca}, - {"treaty", "treaty", 0, + {EF_TREATY, "treaty", "treaty", 0, 0, sizeof(struct trtstr), NULL, NULL, NULL, -1, -1, 0, 0, NULL, 0, treaty_ca}, - {"trade", "trade", 0, + {EF_TRADE, "trade", "trade", 0, 0, sizeof(struct trdstr), NULL, NULL, NULL, -1, -1, 0, 0, NULL, 0, trade_ca}, - {"pow", "power", 0, + {EF_POWER, "pow", "power", 0, 0, sizeof(struct powstr), NULL, NULL, NULL, -1, -1, 0, 0, NULL, 0, NULL}, - {"nat", "nation", EFF_OWNER, + {EF_NATION, "nat", "nation", EFF_OWNER, 0, sizeof(struct natstr), NULL, NULL, NULL, -1, -1, 0, 0, NULL, 0, nat_ca}, - {"loan", "loan", 0, + {EF_LOAN, "loan", "loan", 0, 0, sizeof(struct lonstr), NULL, NULL, NULL, -1, -1, 0, 0, NULL, 0, loan_ca}, - {"map", "map", 0, + {EF_MAP, "map", "map", 0, 0, DEF_WORLD_X * DEF_WORLD_Y / 2, NULL, NULL, NULL, -1, -1, 0, 0, NULL, 0, NULL}, - {"bmap", "bmap", 0, + {EF_BMAP, "bmap", "bmap", 0, 0, DEF_WORLD_X * DEF_WORLD_Y / 2, NULL, NULL, NULL, -1, -1, 0, 0, NULL, 0, NULL}, - {"commodity", "commodity", 0, + {EF_COMM, "commodity", "commodity", 0, 0, sizeof(struct comstr), NULL, NULL, NULL, -1, -1, 0, 0, NULL, 0, commodity_ca}, - {"lost", "lostitems", EFF_OWNER, + {EF_LOST, "lost", "lostitems", EFF_OWNER, 0, sizeof(struct loststr), NULL, NULL, NULL, -1, -1, 0, 0, NULL, 0, lost_ca}, /* Static game data (configuation) */ - {"sect chr", NULL, EFF_MEM, + {EF_SECTOR_CHR, "sect chr", NULL, EFF_MEM, 0, sizeof(dchr[0]), NULL, NULL, NULL, -1, -1, 0, 0, (char *)dchr, 0, dchr_ca}, - {"ship chr", NULL, EFF_MEM, + {EF_SHIP_CHR, "ship chr", NULL, EFF_MEM, 0, sizeof(mchr[0]), NULL, NULL, NULL, -1, -1, 0, 0, (char *)mchr, 0, mchr_ca}, - {"plane chr", NULL, EFF_MEM, + {EF_PLANE_CHR, "plane chr", NULL, EFF_MEM, 0, sizeof(plchr[0]), NULL, NULL, NULL, -1, -1, 0, 0, (char *)plchr, 0, plchr_ca}, - {"land chr", NULL, EFF_MEM, + {EF_LAND_CHR, "land chr", NULL, EFF_MEM, 0, sizeof(lchr[0]), NULL, NULL, NULL, -1, -1, 0, 0, (char *)lchr, 0, lchr_ca}, - {"nuke chr", NULL, EFF_MEM, + {EF_NUKE_CHR, "nuke chr", NULL, EFF_MEM, 0, sizeof(nchr[0]), NULL, NULL, NULL, -1, -1, 0, 0, (char *)nchr, 0, nchr_ca}, #if 0 /* FIXME rpt[] lacks sentinel, xdchr() doesn't terminate */ - {"news chr", NULL, EFF_MEM, + {EF_, "news chr", NULL, EFF_MEM, 0, sizeof(rpt[0]), NULL, NULL, NULL, -1, -1, 0, 0, (char *)rpt, 0, rpt_ca}, #endif - {"treaty chr", NULL, EFF_MEM, + {EF_TREATY_CHR, "treaty chr", NULL, EFF_MEM, 0, sizeof(tchr[0]), NULL, NULL, NULL, -1, -1, 0, 0, (char *)tchr, 0, tchr_ca}, - {"item", NULL, EFF_MEM, + {EF_ITEM, "item", NULL, EFF_MEM, 0, sizeof(ichr[0]), NULL, NULL, NULL, -1, -1, 0, 0, (char *)ichr, 0, ichr_ca}, - {"infrastructure", NULL, EFF_MEM, + {EF_INFRASTRUCTURE, "infrastructure", NULL, EFF_MEM, 0, sizeof(intrchr[0]), NULL, NULL, NULL, -1, -1, 0, 0, (char *)intrchr, 0, intrchr_ca}, - {"product", NULL, EFF_MEM, + {EF_PRODUCT, "product", NULL, EFF_MEM, 0, sizeof(pchr[0]), NULL, NULL, NULL, -1, -1, 0, 0, (char *)pchr, 0, pchr_ca}, - {"table", NULL, EFF_MEM, + {EF_TABLE, "table", NULL, EFF_MEM, 0, sizeof(empfile[0]), NULL, NULL, NULL, -1, -1, 0, 0, (char *)empfile, 0, empfile_ca}, - {"ship chr flags", NULL, EFF_MEM, + {EF_SHIP_CHR_FLAGS, "ship chr flags", NULL, EFF_MEM, 0, sizeof(ship_chr_flags[0]), NULL, NULL, NULL, -1, -1, 0, 0, (char *)ship_chr_flags, 0, lookup_ca}, - {"plane chr flags", NULL, EFF_MEM, + {EF_PLANE_CHR_FLAGS, "plane chr flags", NULL, EFF_MEM, 0, sizeof(plane_chr_flags[0]), NULL, NULL, NULL, -1, -1, 0, 0, (char *)plane_chr_flags, 0, lookup_ca}, - {"land chr flags", NULL, EFF_MEM, + {EF_LAND_CHR_FLAGS, "land chr flags", NULL, EFF_MEM, 0, sizeof(land_chr_flags[0]), NULL, NULL, NULL, -1, -1, 0, 0, (char *)land_chr_flags, 0, lookup_ca}, - {"nuke chr flags", NULL, EFF_MEM, + {EF_NUKE_CHR_FLAGS, "nuke chr flags", NULL, EFF_MEM, 0, sizeof(nuke_chr_flags[0]), NULL, NULL, NULL, -1, -1, 0, 0, (char *)nuke_chr_flags, 0, lookup_ca}, /* Sentinel */ - {NULL, NULL, 0, + {EF_BAD, NULL, NULL, 0, 0, 0, NULL, NULL, NULL, -1, -1, 0,0,NULL, 0, NULL} }; diff --git a/src/lib/global/nsc.c b/src/lib/global/nsc.c index ccbd3e0c..9ddb75ac 100644 --- a/src/lib/global/nsc.c +++ b/src/lib/global/nsc.c @@ -498,6 +498,7 @@ struct castr rpt_ca[] = { struct castr empfile_ca[] = { {NSC_STRING, 0, 0, offsetof(struct empfile, name), "name", EF_BAD}, + {NSC_INT, 0, 0, offsetof(struct empfile, ef_uid), "uid", EF_BAD}, {NSC_STRING, 0, 0, offsetof(struct empfile, file), "file_name", EF_BAD}, {NSC_INT, 0, 0, offsetof(struct empfile, flags), "flags", EF_BAD}, {NSC_NOTYPE, 0, 0, 0, NULL, EF_BAD}