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.

diff --git a/include/prototypes.h b/include/prototypes.h
index 13c0ed7c94888aaa04d38791cec378557a607103..a520ea206a5c7bd3d620bf82dcec6961d99b36e9 100644 (file)
--- 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 474059ae5df938d60a060959a12414966cf18cc7..b67366be82a22a7a222c48d074fa70193fb9fc9a 100644 (file)
--- 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 52ed00149fb937e3f498cd352e9c6ba6f7efc072..4664b5e3661607fd11c852ef19d30d513aead789 100644 (file)
--- 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 ae449416823d0136bccdd88a42fd285d8be5c6b0..0ef301a0282b0bc49f5cf38af354e683057e6636 100644 (file)
--- 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 36c8eae7d1ef4e33171244c8c97a1138037fd7a8..10b7d23070b774f69157c71b6b56c46b4f36ab13 100644 (file)
--- 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 c4ea28f7755dd0e4351a392bc02a17ee3a56e12a..29cb6523760c99603511634663b32e2863aa508e 100644 (file)
--- 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)
 {