Clean up initialization of nat_ca[]

[empserver] / src / lib / subs / fileinit.c

diff --git a/src/lib/subs/fileinit.c b/src/lib/subs/fileinit.c
index 5a15573e6065bc921325d7926ab4c056f0209dc7..6fc7b37dc12801ad3020392e1d36a325f3019f9d 100644 (file)
--- a/src/lib/subs/fileinit.c
+++ b/src/lib/subs/fileinit.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2007, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -34,7 +34,6 @@
 #include <config.h>
 
 #include "file.h"
-#include "journal.h"
 #include "prototypes.h"
 
 struct fileinit {
@@ -59,12 +58,11 @@ static void ef_fina_view(int);
 
 /*
  * Initialize empfile for full server operations.
- * ef_init() must be called first.
  */
 void
 ef_init_srv(void)
 {
-    unsigned i, flags;
+    unsigned i;
 
     for (i = 0; i < sizeof(fileinit) / sizeof(fileinit[0]); i++) {
        empfile[fileinit[i].ef_type].init = fileinit[i].init;
@@ -72,17 +70,7 @@ ef_init_srv(void)
        empfile[fileinit[i].ef_type].prewrite = fileinit[i].prewrite;
     }
 
-    for (i = 0; cou_ca[i].ca_name; i++) {
-       nat_ca[i] = cou_ca[i];
-       flags = nat_ca[i].ca_flags | NSC_CONST;
-       if (flags & NSC_EXTRA)
-           flags &= ~NSC_EXTRA;
-       else if (i != 0)
-           flags |= NSC_DEITY;
-       nat_ca[i].ca_flags = flags;
-    }
-    nat_ca[i] = cou_ca[i];
-
+    nsc_init();
     ef_open_srv();
     if (ef_verify() < 0)
        exit(EXIT_FAILURE);
@@ -100,12 +88,12 @@ ef_open_srv(void)
 {
     int failed = 0;
 
-    failed |= journal_startup() < 0;
     failed |= !ef_open(EF_NATION, EFF_MEM);
     failed |= !ef_open(EF_SECTOR, EFF_MEM);
     failed |= !ef_open(EF_SHIP, EFF_MEM);
     failed |= !ef_open(EF_PLANE, EFF_MEM);
     failed |= !ef_open(EF_LAND, EFF_MEM);
+    failed |= !ef_open(EF_GAME, EFF_MEM);
     failed |= !ef_open(EF_NEWS, 0);
     failed |= !ef_open(EF_LOAN, 0);
     failed |= !ef_open(EF_TREATY, 0);
@@ -134,6 +122,7 @@ ef_close_srv(void)
     ef_close(EF_SHIP);
     ef_close(EF_PLANE);
     ef_close(EF_LAND);
+    ef_close(EF_GAME);
     ef_close(EF_NEWS);
     ef_close(EF_LOAN);
     ef_close(EF_TREATY);
@@ -145,7 +134,6 @@ ef_close_srv(void)
     ef_close(EF_BMAP);
     ef_close(EF_LOST);
     ef_close(EF_REALM);
-    journal_shutdown();
 }
 
 static int