COPYING duplicates information from README. Remove. Move GPL from

[empserver] / src / lib / global / file.c

diff --git a/src/lib/global/file.c b/src/lib/global/file.c
index 78fa0adce83e8b6ff25ebfc9e08c4c22b2a7aaf4..11809e1084fb5c7a26ff7ed1d56a66e1a676c778 100644 (file)
--- a/src/lib/global/file.c
+++ b/src/lib/global/file.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2005, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2006, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -19,9 +19,9 @@
  *
  *  ---
  *
- *  See the "LEGAL", "LICENSE", "CREDITS" and "README" files for all the
- *  related information and legal notices. It is expected that any future
- *  projects/authors will amend these files as needed.
+ *  See files README, COPYING and CREDITS in the root of the source
+ *  tree for related information and legal notices.  It is expected
+ *  that future projects/authors will amend these files as needed.
  *
  *  ---
  *
@@ -31,6 +31,8 @@
  *     
  */
 
+#include <config.h>
+
 #include <stddef.h>
 #include "misc.h"
 #include "xy.h"
@@ -139,6 +141,8 @@ struct empfile empfile[] = {
      UNMAPPED_CACHE(struct comstr, 0)},
     {EF_LOST, "lost", "lostitems", lost_ca,
      UNMAPPED_CACHE(struct loststr, EFF_OWNER)},
+    {EF_REALM, "realm", "realms", realm_ca,
+     UNMAPPED_CACHE(struct realmstr, EFF_OWNER)},
 
     /* Static game data (configuration) */
     {EF_SECTOR_CHR, "sect-chr", "sect_def", dchr_ca, ARRAY_TABLE(dchr, EFF_CFG)},
@@ -167,8 +171,7 @@ struct empfile empfile[] = {
      PTR_CACHE(meta_type, EFF_CFG)},
     {EF_META_FLAGS, "meta-flags", NULL, symbol_ca,
      PTR_CACHE(meta_flags, EFF_CFG)},
-    {EF_MISSIONS, "missions", NULL, symbol_ca,
-     PTR_CACHE(missions, EFF_CFG)},
+    {EF_MISSIONS, "missions", NULL, symbol_ca, PTR_CACHE(missions, EFF_CFG)},
     {EF_PLANE_FLAGS, "plane-flags", NULL, symbol_ca,
      PTR_CACHE(plane_flags, EFF_CFG)},
     {EF_RETREAT_FLAGS, "retreat-flags", NULL, symbol_ca,
@@ -182,8 +185,15 @@ struct empfile empfile[] = {
      PTR_CACHE(agreement_statuses, EFF_CFG)},
     {EF_PLAGUE_STAGES, "plague-stages", NULL, symbol_ca,
      PTR_CACHE(plague_stages, EFF_CFG)},
-    {EF_PACKING, "packing", NULL, symbol_ca,
-     PTR_CACHE(packing, EFF_CFG)},
+    {EF_PACKING, "packing", NULL, symbol_ca, PTR_CACHE(packing, EFF_CFG)},
+    {EF_RESOURCES, "resources", NULL, symbol_ca, PTR_CACHE(resources, EFF_CFG)},
+    {EF_NATION_STATUS, "nation-status", NULL, symbol_ca,
+     PTR_CACHE(nation_status, EFF_CFG)},
+    {EF_SECTOR_NAVIGATION, "sector-navigation", NULL, symbol_ca,
+     PTR_CACHE(sector_navigation, EFF_CFG)},
+
+    /* Views */
+    {EF_COUNTRY, "country", NULL, cou_ca, UNMAPPED_CACHE(struct natstr, 0)},
 
     /* Sentinel */
     {EF_BAD, NULL, NULL, NULL, 0, 0, NULL, 0, 0, 0, 0, -1, NULL, NULL, NULL},