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

(ef_init): Remove superflous size initialization for tables that are

Browse source 
initialized from builtin config files.
(ef_init_chr): Unused, remove.
This commit is contained in:
Markus Armbruster 2006-02-19 17:07:04 +00:00
parent fe53057977
commit 6bd0eabb21
1 changed files with 0 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/lib/common/file.c
View file

@ -523,16 +523,6 @@ ef_fix_size(struct empfile *ep, int n)
ep->csize = n + 1; ep->csize = n + 1;
} }
static void
ef_init_chr(int type, size_t size, ptrdiff_t name_offs)
{
struct empfile *ep = &empfile[type];
char *p;
for (p = ep->cache; *((char **)(p + name_offs)); p += size) ;
ep->cids = ep->fids = (p - ep->cache) / size;
}
/* /*
* Initialize Empire tables. * Initialize Empire tables.
* Must be called once, before using anything else from this module. * Must be called once, before using anything else from this module.
@ -547,15 +537,6 @@ ef_init(void)
empfile[EF_MAP].size = empfile[EF_BMAP].size = (WORLD_X * WORLD_Y) / 2; empfile[EF_MAP].size = empfile[EF_BMAP].size = (WORLD_X * WORLD_Y) / 2;
ef_init_chr(EF_SHIP_CHR,
sizeof(struct mchrstr), offsetof(struct mchrstr, m_name));
ef_init_chr(EF_PLANE_CHR,
sizeof(struct plchrstr), offsetof(struct plchrstr, pl_name));
ef_init_chr(EF_LAND_CHR,
sizeof(struct lchrstr), offsetof(struct lchrstr, l_name));
ef_init_chr(EF_NUKE_CHR,
sizeof(struct nchrstr), offsetof(struct nchrstr, n_name));
ca = (struct castr *)empfile[EF_META].cache; ca = (struct castr *)empfile[EF_META].cache;
for (i = 0; ca[i].ca_name; i++) ; for (i = 0; ca[i].ca_name; i++) ;
ef_fix_size(&empfile[EF_META], i); ef_fix_size(&empfile[EF_META], i);