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

Initialize ef_type and uid automatically in ef_extend()

Browse source 
New struct emptypedstr to avoid depending on empobj.h there.

Remove now superfluous manual initializations elsewhere.

This doesn't fix any missing initializations.
This commit is contained in:
Markus Armbruster 2008-02-24 11:07:18 +01:00
parent d628679a24
commit 6cd3d55c4e
9 changed files with 28 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -475,11 +475,17 @@ static void
do_blank(struct empfile *ep, void *buf, int id, int count)
{
int i;
struct emptypedstr *elt;
memset(buf, 0, count * ep->size);
if (ep->init) {
for (i = 0; i < count; i++)
ep->init(id + i, (char *)buf + i * ep->size);
for (i = 0; i < count; i++) {
elt = (struct emptypedstr *)((char *)buf + i * ep->size);
if (ep->flags & EFF_TYPED) {
elt->ef_type = ep->uid;
elt->uid = id + i;
}
if (ep->init)
ep->init(id + i, (void *)elt);
}
}

5
src/lib/subs/land.c
View file

@ -165,11 +165,6 @@ lnd_prewrite(int n, void *ptr)
void
lnd_init(int n, void *ptr)
{
struct lndstr *lp = ptr;
lp->ef_type = EF_LAND;
lp->lnd_uid = n;
lp->lnd_own = 0;
}
char *

5
src/lib/subs/nuke.c
View file

@ -101,11 +101,6 @@ nuk_prewrite(int n, void *ptr)
void
nuk_init(int n, void *ptr)
{
struct nukstr *np = ptr;
np->ef_type = EF_NUKE;
np->nuk_uid = n;
np->nuk_own = 0;
}
int

5
src/lib/subs/plane.c
View file

@ -144,11 +144,6 @@ pln_prewrite(int n, void *ptr)
void
pln_init(int n, void *ptr)
{
struct plnstr *pp = ptr;
pp->ef_type = EF_PLANE;
pp->pln_uid = n;
pp->pln_own = 0;
}
char *

5
src/lib/subs/ship.c
View file

@ -112,11 +112,6 @@ shp_prewrite(int n, void *ptr)
void
shp_init(int n, void *ptr)
{
struct shpstr *sp = ptr;
sp->ef_type = EF_SHIP;
sp->shp_uid = n;
sp->shp_own = 0;
}
char *