From ff8c7c249a8753d722c89e4824842d1898cc4788 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Fri, 30 Sep 2005 20:02:57 +0000 Subject: [PATCH] (empfile): Member itemoffs is unused since file.c rev. 1.15; remove. --- include/file.h | 1 - src/lib/global/file.c | 32 ++++++++++++++++---------------- 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/include/file.h b/include/file.h index 34e44a48b..26562695c 100644 --- a/include/file.h +++ b/include/file.h @@ -45,7 +45,6 @@ struct empfile { void (*init) (int, char *); /* call this when object is created */ int (*postread) (int, char *); /* specific massage routines for items */ int (*prewrite) (int, char *); - ptrdiff_t itemoffs; /* offset of item[] in struct */ int fd; /* file descriptor */ int baseid; /* starting item in cache */ int cids; /* # ids in cache */ diff --git a/src/lib/global/file.c b/src/lib/global/file.c index 8f53b5393..36a045bdd 100644 --- a/src/lib/global/file.c +++ b/src/lib/global/file.c @@ -25,7 +25,7 @@ * * --- * - * fileglb.c: Empire selection global structures. + * file.c: Empire game data file descriptions. * * Known contributors to this file: * @@ -55,47 +55,47 @@ struct empfile empfile[] = { {"sect", "sector", EFF_XY | EFF_OWNER, 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, 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, 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, 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, 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, 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, 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, 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, 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, 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, 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, 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, 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, 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, 0, sizeof(struct loststr), NULL, NULL, NULL, - 0, -1, -1, 0, 0, NULL, 0, NULL} + -1, -1, 0, 0, NULL, 0, NULL} }; -- 2.43.0