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

(empfile): Member itemoffs is unused since file.c rev. 1.15; remove.

Browse source
This commit is contained in:
Markus Armbruster 2005-09-30 20:02:57 +00:00
parent 09b0b83971
commit ff8c7c249a
2 changed files with 16 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/file.h
View file

@ -45,7 +45,6 @@ struct empfile {
void (*init) (int, char *); /* call this when object is created */ void (*init) (int, char *); /* call this when object is created */
int (*postread) (int, char *); /* specific massage routines for items */ int (*postread) (int, char *); /* specific massage routines for items */
int (*prewrite) (int, char *); int (*prewrite) (int, char *);
ptrdiff_t itemoffs; /* offset of item[] in struct */
int fd; /* file descriptor */ int fd; /* file descriptor */
int baseid; /* starting item in cache */ int baseid; /* starting item in cache */
int cids; /* # ids in cache */ int cids; /* # ids in cache */

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

@ -25,7 +25,7 @@
* *
* --- * ---
* *
* fileglb.c: Empire selection global structures. * file.c: Empire game data file descriptions.
* *
* Known contributors to this file: * Known contributors to this file:
* *
@ -55,47 +55,47 @@
struct empfile empfile[] = { struct empfile empfile[] = {
{"sect", "sector", EFF_XY | EFF_OWNER, {"sect", "sector", EFF_XY | EFF_OWNER,
0, sizeof(struct sctstr), NULL, NULL, NULL, 0, sizeof(struct sctstr), NULL, NULL, NULL,
offsetof(struct sctstr, sct_item), -1, -1, 0, 0, NULL, 0, NULL}, -1, -1, 0, 0, NULL, 0, NULL},
{"ship", "ship", EFF_XY | EFF_OWNER | EFF_GROUP, {"ship", "ship", EFF_XY | EFF_OWNER | EFF_GROUP,
0, sizeof(struct shpstr), NULL, NULL, NULL, 0, sizeof(struct shpstr), NULL, NULL, NULL,
offsetof(struct shpstr, shp_item), -1, -1, 0, 0, NULL, 0, NULL}, -1, -1, 0, 0, NULL, 0, NULL},
{"plane", "plane", EFF_XY | EFF_OWNER | EFF_GROUP, {"plane", "plane", EFF_XY | EFF_OWNER | EFF_GROUP,
0, sizeof(struct plnstr), NULL, NULL, NULL, 0, sizeof(struct plnstr), NULL, NULL, NULL,
0, -1, -1, 0, 0, NULL, 0, NULL}, -1, -1, 0, 0, NULL, 0, NULL},
{"land", "land", EFF_XY | EFF_OWNER | EFF_GROUP, {"land", "land", EFF_XY | EFF_OWNER | EFF_GROUP,
0, sizeof(struct lndstr), NULL, NULL, NULL, 0, sizeof(struct lndstr), NULL, NULL, NULL,
offsetof(struct lndstr, lnd_item), -1, -1, 0, 0, NULL, 0, NULL}, -1, -1, 0, 0, NULL, 0, NULL},
{"nuke", "nuke", EFF_XY | EFF_OWNER, {"nuke", "nuke", EFF_XY | EFF_OWNER,
0, sizeof(struct nukstr), NULL, NULL, NULL, 0, sizeof(struct nukstr), NULL, NULL, NULL,
0, -1, -1, 0, 0, NULL, 0, NULL}, -1, -1, 0, 0, NULL, 0, NULL},
{"news", "news", 0, {"news", "news", 0,
0, sizeof(struct nwsstr), NULL, NULL, NULL, 0, sizeof(struct nwsstr), NULL, NULL, NULL,
0, -1, -1, 0, 0, NULL, 0, NULL}, -1, -1, 0, 0, NULL, 0, NULL},
{"treaty", "treaty", 0, {"treaty", "treaty", 0,
0, sizeof(struct trtstr), NULL, NULL, NULL, 0, sizeof(struct trtstr), NULL, NULL, NULL,
0, -1, -1, 0, 0, NULL, 0, NULL}, -1, -1, 0, 0, NULL, 0, NULL},
{"trade", "trade", 0, {"trade", "trade", 0,
0, sizeof(struct trdstr), NULL, NULL, NULL, 0, sizeof(struct trdstr), NULL, NULL, NULL,
0, -1, -1, 0, 0, NULL, 0, NULL}, -1, -1, 0, 0, NULL, 0, NULL},
{"pow", "power", 0, {"pow", "power", 0,
0, sizeof(struct powstr), NULL, NULL, NULL, 0, sizeof(struct powstr), NULL, NULL, NULL,
0, -1, -1, 0, 0, NULL, 0, NULL}, -1, -1, 0, 0, NULL, 0, NULL},
{"nat", "nation", EFF_OWNER, {"nat", "nation", EFF_OWNER,
0, sizeof(struct natstr), NULL, NULL, NULL, 0, sizeof(struct natstr), NULL, NULL, NULL,
0, -1, -1, 0, 0, NULL, 0, NULL}, -1, -1, 0, 0, NULL, 0, NULL},
{"loan", "loan", 0, {"loan", "loan", 0,
0, sizeof(struct lonstr), NULL, NULL, NULL, 0, sizeof(struct lonstr), NULL, NULL, NULL,
0, -1, -1, 0, 0, NULL, 0, NULL}, -1, -1, 0, 0, NULL, 0, NULL},
{"map", "map", 0, {"map", "map", 0,
0, DEF_WORLD_X * DEF_WORLD_Y / 2, NULL, NULL, NULL, 0, DEF_WORLD_X * DEF_WORLD_Y / 2, NULL, NULL, NULL,
0, -1, -1, 0, 0, NULL, 0, NULL}, -1, -1, 0, 0, NULL, 0, NULL},
{"bmap", "bmap", 0, {"bmap", "bmap", 0,
0, DEF_WORLD_X * DEF_WORLD_Y / 2, NULL, NULL, NULL, 0, DEF_WORLD_X * DEF_WORLD_Y / 2, NULL, NULL, NULL,
0, -1, -1, 0, 0, NULL, 0, NULL}, -1, -1, 0, 0, NULL, 0, NULL},
{"commodity", "commodity", 0, {"commodity", "commodity", 0,
0, sizeof(struct comstr), NULL, NULL, NULL, 0, sizeof(struct comstr), NULL, NULL, NULL,
0, -1, -1, 0, 0, NULL, 0, NULL}, -1, -1, 0, 0, NULL, 0, NULL},
{"lost", "lostitems", EFF_OWNER, {"lost", "lostitems", EFF_OWNER,
0, sizeof(struct loststr), NULL, NULL, NULL, 0, sizeof(struct loststr), NULL, NULL, NULL,
0, -1, -1, 0, 0, NULL, 0, NULL} -1, -1, 0, 0, NULL, 0, NULL}
}; };