(ef_open, EFF_RDONLY, EFF_CREATE, EFF_OPEN): Replace mode parameter
(really open flags, not mode) by new flags EFF_RDONLY, EFF_CREATE. Open flags were needlessly general. Callers changed. (empfile): Member mode now unused, remove.
This commit is contained in:
parent
6b525c1841
commit
64d8f6babe
5 changed files with 81 additions and 70 deletions
|
|
@ -57,103 +57,103 @@
|
|||
struct empfile empfile[] = {
|
||||
/* Dynamic game data */
|
||||
{EF_SECTOR, "sect", "sector", EFF_XY | EFF_OWNER,
|
||||
0, sizeof(struct sctstr), NULL, NULL, NULL,
|
||||
sizeof(struct sctstr), NULL, NULL, NULL,
|
||||
-1, -1, 0, 0, NULL, 0, sect_ca},
|
||||
{EF_SHIP, "ship", "ship", EFF_XY | EFF_OWNER | EFF_GROUP,
|
||||
0, sizeof(struct shpstr), NULL, NULL, NULL,
|
||||
sizeof(struct shpstr), NULL, NULL, NULL,
|
||||
-1, -1, 0, 0, NULL, 0, ship_ca},
|
||||
{EF_PLANE, "plane", "plane", EFF_XY | EFF_OWNER | EFF_GROUP,
|
||||
0, sizeof(struct plnstr), NULL, NULL, NULL,
|
||||
sizeof(struct plnstr), NULL, NULL, NULL,
|
||||
-1, -1, 0, 0, NULL, 0, plane_ca},
|
||||
{EF_LAND, "land", "land", EFF_XY | EFF_OWNER | EFF_GROUP,
|
||||
0, sizeof(struct lndstr), NULL, NULL, NULL,
|
||||
sizeof(struct lndstr), NULL, NULL, NULL,
|
||||
-1, -1, 0, 0, NULL, 0, land_ca},
|
||||
{EF_NUKE, "nuke", "nuke", EFF_XY | EFF_OWNER,
|
||||
0, sizeof(struct nukstr), NULL, NULL, NULL,
|
||||
sizeof(struct nukstr), NULL, NULL, NULL,
|
||||
-1, -1, 0, 0, NULL, 0, nuke_ca},
|
||||
{EF_NEWS, "news", "news", 0,
|
||||
0, sizeof(struct nwsstr), NULL, NULL, NULL,
|
||||
sizeof(struct nwsstr), NULL, NULL, NULL,
|
||||
-1, -1, 0, 0, NULL, 0, news_ca},
|
||||
{EF_TREATY, "treaty", "treaty", 0,
|
||||
0, sizeof(struct trtstr), NULL, NULL, NULL,
|
||||
sizeof(struct trtstr), NULL, NULL, NULL,
|
||||
-1, -1, 0, 0, NULL, 0, treaty_ca},
|
||||
{EF_TRADE, "trade", "trade", 0,
|
||||
0, sizeof(struct trdstr), NULL, NULL, NULL,
|
||||
sizeof(struct trdstr), NULL, NULL, NULL,
|
||||
-1, -1, 0, 0, NULL, 0, trade_ca},
|
||||
{EF_POWER, "pow", "power", 0,
|
||||
0, sizeof(struct powstr), NULL, NULL, NULL,
|
||||
sizeof(struct powstr), NULL, NULL, NULL,
|
||||
-1, -1, 0, 0, NULL, 0, NULL},
|
||||
{EF_NATION, "nat", "nation", EFF_OWNER,
|
||||
0, sizeof(struct natstr), NULL, NULL, NULL,
|
||||
sizeof(struct natstr), NULL, NULL, NULL,
|
||||
-1, -1, 0, 0, NULL, 0, nat_ca},
|
||||
{EF_LOAN, "loan", "loan", 0,
|
||||
0, sizeof(struct lonstr), NULL, NULL, NULL,
|
||||
sizeof(struct lonstr), NULL, NULL, NULL,
|
||||
-1, -1, 0, 0, NULL, 0, loan_ca},
|
||||
{EF_MAP, "map", "map", 0,
|
||||
0, DEF_WORLD_X * DEF_WORLD_Y / 2, NULL, NULL, NULL,
|
||||
DEF_WORLD_X * DEF_WORLD_Y / 2, NULL, NULL, NULL,
|
||||
-1, -1, 0, 0, NULL, 0, NULL},
|
||||
{EF_BMAP, "bmap", "bmap", 0,
|
||||
0, DEF_WORLD_X * DEF_WORLD_Y / 2, NULL, NULL, NULL,
|
||||
DEF_WORLD_X * DEF_WORLD_Y / 2, NULL, NULL, NULL,
|
||||
-1, -1, 0, 0, NULL, 0, NULL},
|
||||
{EF_COMM, "commodity", "commodity", 0,
|
||||
0, sizeof(struct comstr), NULL, NULL, NULL,
|
||||
sizeof(struct comstr), NULL, NULL, NULL,
|
||||
-1, -1, 0, 0, NULL, 0, commodity_ca},
|
||||
{EF_LOST, "lost", "lostitems", EFF_OWNER,
|
||||
0, sizeof(struct loststr), NULL, NULL, NULL,
|
||||
sizeof(struct loststr), NULL, NULL, NULL,
|
||||
-1, -1, 0, 0, NULL, 0, lost_ca},
|
||||
|
||||
/* Static game data (configuation) */
|
||||
{EF_SECTOR_CHR, "sect chr", NULL, EFF_MEM,
|
||||
0, sizeof(dchr[0]), NULL, NULL, NULL,
|
||||
sizeof(dchr[0]), NULL, NULL, NULL,
|
||||
-1, -1, 0, 0, (char *)dchr, 0, dchr_ca},
|
||||
{EF_SHIP_CHR, "ship chr", NULL, EFF_MEM,
|
||||
0, sizeof(mchr[0]), NULL, NULL, NULL,
|
||||
sizeof(mchr[0]), NULL, NULL, NULL,
|
||||
-1, -1, 0, 0, (char *)mchr, 0, mchr_ca},
|
||||
{EF_PLANE_CHR, "plane chr", NULL, EFF_MEM,
|
||||
0, sizeof(plchr[0]), NULL, NULL, NULL,
|
||||
sizeof(plchr[0]), NULL, NULL, NULL,
|
||||
-1, -1, 0, 0, (char *)plchr, 0, plchr_ca},
|
||||
{EF_LAND_CHR, "land chr", NULL, EFF_MEM,
|
||||
0, sizeof(lchr[0]), NULL, NULL, NULL,
|
||||
sizeof(lchr[0]), NULL, NULL, NULL,
|
||||
-1, -1, 0, 0, (char *)lchr, 0, lchr_ca},
|
||||
{EF_NUKE_CHR, "nuke chr", NULL, EFF_MEM,
|
||||
0, sizeof(nchr[0]), NULL, NULL, NULL,
|
||||
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 */
|
||||
{EF_, "news chr", NULL, EFF_MEM,
|
||||
0, sizeof(rpt[0]), NULL, NULL, NULL,
|
||||
sizeof(rpt[0]), NULL, NULL, NULL,
|
||||
-1, -1, 0, 0, (char *)rpt, 0, rpt_ca},
|
||||
#endif
|
||||
{EF_TREATY_CHR, "treaty chr", NULL, EFF_MEM,
|
||||
0, sizeof(tchr[0]), NULL, NULL, NULL,
|
||||
sizeof(tchr[0]), NULL, NULL, NULL,
|
||||
-1, -1, 0, 0, (char *)tchr, 0, tchr_ca},
|
||||
{EF_ITEM, "item", NULL, EFF_MEM,
|
||||
0, sizeof(ichr[0]), NULL, NULL, NULL,
|
||||
sizeof(ichr[0]), NULL, NULL, NULL,
|
||||
-1, -1, 0, 0, (char *)ichr, 0, ichr_ca},
|
||||
{EF_INFRASTRUCTURE, "infrastructure", NULL, EFF_MEM,
|
||||
0, sizeof(intrchr[0]), NULL, NULL, NULL,
|
||||
sizeof(intrchr[0]), NULL, NULL, NULL,
|
||||
-1, -1, 0, 0, (char *)intrchr, 0, intrchr_ca},
|
||||
{EF_PRODUCT, "product", NULL, EFF_MEM,
|
||||
0, sizeof(pchr[0]), NULL, NULL, NULL,
|
||||
sizeof(pchr[0]), NULL, NULL, NULL,
|
||||
-1, -1, 0, 0, (char *)pchr, 0, pchr_ca},
|
||||
{EF_TABLE, "table", NULL, EFF_MEM,
|
||||
0, sizeof(empfile[0]), NULL, NULL, NULL,
|
||||
sizeof(empfile[0]), NULL, NULL, NULL,
|
||||
-1, -1, 0, 0, (char *)empfile, 0, empfile_ca},
|
||||
{EF_SHIP_CHR_FLAGS, "ship chr flags", NULL, EFF_MEM,
|
||||
0, sizeof(ship_chr_flags[0]), NULL, NULL, NULL,
|
||||
sizeof(ship_chr_flags[0]), NULL, NULL, NULL,
|
||||
-1, -1, 0, 0, (char *)ship_chr_flags, 0, lookup_ca},
|
||||
{EF_PLANE_CHR_FLAGS, "plane chr flags", NULL, EFF_MEM,
|
||||
0, sizeof(plane_chr_flags[0]), NULL, NULL, NULL,
|
||||
sizeof(plane_chr_flags[0]), NULL, NULL, NULL,
|
||||
-1, -1, 0, 0, (char *)plane_chr_flags, 0, lookup_ca},
|
||||
{EF_LAND_CHR_FLAGS, "land chr flags", NULL, EFF_MEM,
|
||||
0, sizeof(land_chr_flags[0]), NULL, NULL, NULL,
|
||||
sizeof(land_chr_flags[0]), NULL, NULL, NULL,
|
||||
-1, -1, 0, 0, (char *)land_chr_flags, 0, lookup_ca},
|
||||
{EF_NUKE_CHR_FLAGS, "nuke chr flags", NULL, EFF_MEM,
|
||||
0, sizeof(nuke_chr_flags[0]), NULL, NULL, NULL,
|
||||
sizeof(nuke_chr_flags[0]), NULL, NULL, NULL,
|
||||
-1, -1, 0, 0, (char *)nuke_chr_flags, 0, lookup_ca},
|
||||
|
||||
/* Sentinel */
|
||||
{EF_BAD, NULL, NULL, 0,
|
||||
0, 0, NULL, NULL, NULL,
|
||||
0, NULL, NULL, NULL,
|
||||
-1, -1, 0,0,NULL, 0, NULL}
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue