From 31b9ff08f3d2415acfea37db15bb8b3992a39306 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Tue, 3 May 2011 21:47:29 +0200 Subject: [PATCH] Move pln_oninit(), lnd_oninit(), nuk_oninit() to filetable.c They set up invariants, and thus should be always active, not just in the server. Since ef_blank() isn't used for these files outside the server right now, this isn't a bug fix, just cleanup. --- include/prototypes.h | 3 --- src/lib/common/filetable.c | 33 ++++++++++++++++++++++++++++++--- src/lib/subs/fileinit.c | 12 +++++------- src/lib/subs/land.c | 8 -------- src/lib/subs/nuke.c | 8 -------- src/lib/subs/plane.c | 8 -------- 6 files changed, 35 insertions(+), 37 deletions(-) diff --git a/include/prototypes.h b/include/prototypes.h index 13c0ed7c9..a520ea206 100644 --- a/include/prototypes.h +++ b/include/prototypes.h @@ -431,7 +431,6 @@ extern void bitinit2(struct nstr_sect *, unsigned char *, int); extern int getele(char *, char *); /* land.c */ extern char *prland(struct lndstr *); -extern void lnd_oninit(void *); extern void lnd_postread(int, void *); extern void lnd_prewrite(int, void *, void *); /* landgun.c */ @@ -489,7 +488,6 @@ extern void init_nreport(void); extern void nreport(natid, int, natid, int); /* nuke.c */ extern char *prnuke(struct nukstr *); -extern void nuk_oninit(void *); extern void nuk_postread(int, void *); extern void nuk_prewrite(int, void *, void *); /* nxtitem.c */ @@ -499,7 +497,6 @@ extern void nuk_prewrite(int, void *, void *); extern int onearg(char *, char *); /* plane.c */ extern char *prplane(struct plnstr *); -extern void pln_oninit(void *); extern void pln_postread(int, void *); extern void pln_prewrite(int, void *, void *); /* plnsub.c */ diff --git a/src/lib/common/filetable.c b/src/lib/common/filetable.c index 474059ae5..b67366be8 100644 --- a/src/lib/common/filetable.c +++ b/src/lib/common/filetable.c @@ -56,6 +56,9 @@ #include "xy.h" static void sct_oninit(void *); +static void pln_oninit(void *); +static void lnd_oninit(void *); +static void nuk_oninit(void *); static void nat_oninit(void *); static void realm_oninit(void *); static void game_oninit(void *); @@ -134,14 +137,14 @@ struct empfile empfile[] = { {EF_PLANE, "plane", "plane", plane_ca, EF_BAD, UNMAPPED_CACHE(struct plnstr, -1, EFF_TYPED | EFF_XY | EFF_OWNER | EFF_GROUP), - NULL, NULL, NULL, NULL}, + pln_oninit, NULL, NULL, NULL}, {EF_LAND, "land", "land", land_ca, EF_BAD, UNMAPPED_CACHE(struct lndstr, -1, EFF_TYPED | EFF_XY | EFF_OWNER | EFF_GROUP), - NULL, NULL, NULL, NULL}, + lnd_oninit, NULL, NULL, NULL}, {EF_NUKE, "nuke", "nuke", nuke_ca, EF_BAD, UNMAPPED_CACHE(struct nukstr, -1, EFF_TYPED | EFF_XY | EFF_OWNER), - NULL, NULL, NULL, NULL}, + nuk_oninit, NULL, NULL, NULL}, {EF_NEWS, "news", "news", news_ca, EF_BAD, UNMAPPED_CACHE(struct nwsstr, -1, 0), NULL, NULL, NULL, NULL}, @@ -279,6 +282,30 @@ sct_oninit(void *ptr) sp->sct_coastal = 1; } +static void +pln_oninit(void *ptr) +{ + struct plnstr *pp = ptr; + + pp->pln_ship = pp->pln_land = -1; +} + +static void +lnd_oninit(void *ptr) +{ + struct lndstr *lp = ptr; + + lp->lnd_ship = lp->lnd_land = -1; +} + +static void +nuk_oninit(void *ptr) +{ + struct nukstr *np = ptr; + + np->nuk_plane = -1; +} + static void nat_oninit(void *ptr) { diff --git a/src/lib/subs/fileinit.c b/src/lib/subs/fileinit.c index 52ed00149..4664b5e36 100644 --- a/src/lib/subs/fileinit.c +++ b/src/lib/subs/fileinit.c @@ -40,18 +40,17 @@ struct fileinit { int ef_type; - void (*oninit)(void *); void (*postread)(int, void *); void (*prewrite)(int, void *, void *); void (*onresize)(int); }; static struct fileinit fileinit[] = { - {EF_SECTOR, NULL, sct_postread, sct_prewrite, NULL}, - {EF_SHIP, NULL, shp_postread, shp_prewrite, unit_onresize}, - {EF_PLANE, pln_oninit, pln_postread, pln_prewrite, unit_onresize}, - {EF_LAND, lnd_oninit, lnd_postread, lnd_prewrite, unit_onresize}, - {EF_NUKE, nuk_oninit, nuk_postread, nuk_prewrite, unit_onresize} + {EF_SECTOR, sct_postread, sct_prewrite, NULL}, + {EF_SHIP, shp_postread, shp_prewrite, unit_onresize}, + {EF_PLANE, pln_postread, pln_prewrite, unit_onresize}, + {EF_LAND, lnd_postread, lnd_prewrite, unit_onresize}, + {EF_NUKE, nuk_postread, nuk_prewrite, unit_onresize} }; static void ef_open_srv(void); @@ -66,7 +65,6 @@ ef_init_srv(void) unsigned i; for (i = 0; i < sizeof(fileinit) / sizeof(fileinit[0]); i++) { - empfile[fileinit[i].ef_type].oninit = fileinit[i].oninit; empfile[fileinit[i].ef_type].postread = fileinit[i].postread; empfile[fileinit[i].ef_type].prewrite = fileinit[i].prewrite; empfile[fileinit[i].ef_type].onresize = fileinit[i].onresize; diff --git a/src/lib/subs/land.c b/src/lib/subs/land.c index ae4494168..0ef301a02 100644 --- a/src/lib/subs/land.c +++ b/src/lib/subs/land.c @@ -88,14 +88,6 @@ lnd_prewrite(int n, void *old, void *new) unit_update_cargo((struct empobj *)lp); } -void -lnd_oninit(void *ptr) -{ - struct lndstr *lp = ptr; - - lp->lnd_ship = lp->lnd_land = -1; -} - char * prland(struct lndstr *lp) { diff --git a/src/lib/subs/nuke.c b/src/lib/subs/nuke.c index 36c8eae7d..10b7d2307 100644 --- a/src/lib/subs/nuke.c +++ b/src/lib/subs/nuke.c @@ -77,14 +77,6 @@ nuk_prewrite(int n, void *old, void *new) np->nuk_own = own; } -void -nuk_oninit(void *ptr) -{ - struct nukstr *np = ptr; - - np->nuk_plane = -1; -} - char * prnuke(struct nukstr *np) { diff --git a/src/lib/subs/plane.c b/src/lib/subs/plane.c index c4ea28f77..29cb65237 100644 --- a/src/lib/subs/plane.c +++ b/src/lib/subs/plane.c @@ -87,14 +87,6 @@ pln_prewrite(int n, void *old, void *new) unit_update_cargo((struct empobj *)pp); } -void -pln_oninit(void *ptr) -{ - struct plnstr *pp = ptr; - - pp->pln_ship = pp->pln_land = -1; -} - char * prplane(struct plnstr *pp) { -- 2.43.0