]> git.pond.sub.org Git - empserver/blobdiff - src/lib/global/file.c
Update copyright notice
[empserver] / src / lib / global / file.c
index 38842aee8cd18497dbe96a5200da2d47b4725f98..1104a528b7001393dbf658f4aecf7bef3070dda8 100644 (file)
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2006, 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
  *  file.c: Empire game data file descriptions.
  * 
  *  Known contributors to this file:
- *     
+ *     Markus Armbruster, 2005-2007
  */
 
 #include <config.h>
 
 #include <stddef.h>
-#include "misc.h"
-#include "xy.h"
+#include "commodity.h"
+#include "file.h"
+#include "game.h"
+#include "land.h"
 #include "loan.h"
+#include "lost.h"
+#include "nat.h"
+#include "news.h"
 #include "nsc.h"
 #include "nuke.h"
 #include "plane.h"
-#include "ship.h"
-#include "land.h"
+#include "power.h"
+#include "product.h"
 #include "sect.h"
+#include "ship.h"
+#include "server.h"
 #include "trade.h"
 #include "treaty.h"
-#include "file.h"
-#include "power.h"
-#include "news.h"
-#include "nat.h"
-#include "lost.h"
-#include "product.h"
-
-#include "commodity.h"
-#include "nsc.h"
 
 /* Number of elements in ARRAY.  */
 #define SZ(array) (sizeof(array) / sizeof((array)[0]))
@@ -61,7 +59,7 @@
 /* Initializers for members flags... */
 /* Unmapped cache */
 #define UNMAPPED_CACHE(type, flags) \
-    sizeof(type), flags, NULL, 0, 0, 0, 0, -1, NULL, NULL, NULL
+    sizeof(type), (flags), NULL, 0, 0, 0, 0, -1, NULL, NULL, NULL
 /*
  * Mapped cache, array with known size.
  * Members cids, fids are not set.
@@ -107,7 +105,7 @@ struct empfile empfile[] = {
 
     /*
      * Keep in mind that player command arguments are matched against
-     * member name; no whitespace please.
+     * values of member name: no whitespace there, please.
      */
 
     /* Dynamic game data */
@@ -143,56 +141,59 @@ struct empfile empfile[] = {
      UNMAPPED_CACHE(struct loststr, EFF_OWNER)},
     {EF_REALM, "realm", "realms", realm_ca,
      UNMAPPED_CACHE(struct realmstr, EFF_OWNER)},
+    {EF_GAME, "game", "game", game_ca,
+     UNMAPPED_CACHE(struct gamestr, 0)},
 
     /* Static game data (configuration) */
-    {EF_SECTOR_CHR, "sect-chr", "sect_def", dchr_ca, ARRAY_TABLE(dchr, EFF_CFG)},
-    {EF_SHIP_CHR, "ship-chr", "ship_def", mchr_ca, ARRAY_CACHE(mchr, EFF_CFG)},
-    {EF_PLANE_CHR, "plane-chr", "plane_def", plchr_ca, ARRAY_CACHE(plchr, EFF_CFG)},
-    {EF_LAND_CHR, "land-chr", "land_def", lchr_ca, ARRAY_CACHE(lchr, EFF_CFG)},
-    {EF_NUKE_CHR, "nuke-chr", "nuke_def", nchr_ca, ARRAY_CACHE(nchr, EFF_CFG)},
-    {EF_NEWS_CHR, "news-chr", NULL, rpt_ca, ARRAY_TABLE(rpt, EFF_CFG)},
-    {EF_TREATY_FLAGS, "treaty-flags", NULL, symbol_ca,
-     PTR_CACHE(treaty_flags, EFF_CFG)},
-    {EF_ITEM, "item", "item_def", ichr_ca, ARRAY_TABLE(ichr, EFF_CFG)},
-    {EF_INFRASTRUCTURE, "infrastructure", "infrastructure_def", intrchr_ca,
-     ARRAY_TABLE(intrchr, EFF_CFG)},
-    {EF_PRODUCT, "product", "product_def", pchr_ca, ARRAY_TABLE(pchr, EFF_CFG)},
-    {EF_TABLE, "table", NULL, empfile_ca, ARRAY_TABLE(empfile, EFF_CFG)},
-    {EF_SHIP_CHR_FLAGS, "ship-chr-flags", NULL, symbol_ca,
-     PTR_CACHE(ship_chr_flags, EFF_CFG)},
-    {EF_PLANE_CHR_FLAGS, "plane-chr-flags", NULL, symbol_ca,
-     PTR_CACHE(plane_chr_flags, EFF_CFG)},
-    {EF_LAND_CHR_FLAGS, "land-chr-flags", NULL, symbol_ca,
-     PTR_CACHE(land_chr_flags, EFF_CFG)},
-    {EF_NUKE_CHR_FLAGS, "nuke-chr-flags", NULL, symbol_ca,
-     PTR_CACHE(nuke_chr_flags, EFF_CFG)},
-    {EF_META, "meta", NULL, mdchr_ca, PTR_CACHE(mdchr_ca, EFF_CFG)},
-    {EF_META_TYPE, "meta-type", NULL, symbol_ca,
-     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_PLANE_FLAGS, "plane-flags", NULL, symbol_ca,
-     PTR_CACHE(plane_flags, EFF_CFG)},
-    {EF_RETREAT_FLAGS, "retreat-flags", NULL, symbol_ca,
-     PTR_CACHE(retreat_flags, EFF_CFG)},
-    {EF_NATION_FLAGS, "nation-flags", NULL, symbol_ca,
-     PTR_CACHE(nation_flags, EFF_CFG)},
-    {EF_NATION_RELATIONS, "nation-relationships", NULL, symbol_ca,
-     PTR_CACHE(nation_relations, EFF_CFG)},
-    {EF_LEVEL, "level", NULL, symbol_ca, PTR_CACHE(level, EFF_CFG)},
-    {EF_AGREEMENT_STATUS, "agreement-status", NULL, symbol_ca,
-     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_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)},
-    {EF_PAGE_HEADINGS, "page-headings", NULL, symbol_ca,
-     PTR_CACHE(page_headings, EFF_CFG)},
+    {EF_ITEM, "item", "item.config", ichr_ca,
+     ARRAY_CACHE(ichr, EFF_CFG)},
+    {EF_PRODUCT, "product", "product.config", pchr_ca,
+     ARRAY_CACHE(pchr, EFF_CFG)},
+    {EF_SECTOR_CHR, "sect-chr", "sect.config", dchr_ca,
+     ARRAY_CACHE(dchr, EFF_CFG)},
+    {EF_SHIP_CHR, "ship-chr", "ship.config", mchr_ca,
+     ARRAY_CACHE(mchr, EFF_CFG)},
+    {EF_PLANE_CHR, "plane-chr", "plane.config", plchr_ca,
+     ARRAY_CACHE(plchr, EFF_CFG)},
+    {EF_LAND_CHR, "land-chr", "land.config", lchr_ca,
+     ARRAY_CACHE(lchr, EFF_CFG)},
+    {EF_NUKE_CHR, "nuke-chr", "nuke.config", nchr_ca,
+     ARRAY_CACHE(nchr, EFF_CFG)},
+    {EF_NEWS_CHR, "news-chr", NULL, rpt_ca,
+     ARRAY_TABLE(rpt, EFF_CFG)},
+    {EF_INFRASTRUCTURE, "infrastructure", "infra.config", intrchr_ca,
+     ARRAY_CACHE(intrchr, EFF_CFG)},
+    {EF_UPDATES, "updates", NULL, update_ca,
+     ARRAY_TABLE(update_time, EFF_CFG)},
+    {EF_TABLE, "table", NULL, empfile_ca,
+     ARRAY_TABLE(empfile, EFF_CFG)},
+    {EF_META, "meta", NULL, mdchr_ca,
+     PTR_CACHE(mdchr_ca, EFF_CFG)},
+
+    /* Symbol tables */
+#define SYMTAB(type, name, tab) \
+       {(type), (name), NULL, symbol_ca, PTR_CACHE((tab), EFF_CFG)}
+    SYMTAB(EF_AGREEMENT_STATUS, "agreement-status", agreement_statuses),
+    SYMTAB(EF_LAND_CHR_FLAGS, "land-chr-flags", land_chr_flags),
+    SYMTAB(EF_LEVEL, "level", level),
+    SYMTAB(EF_META_FLAGS, "meta-flags", meta_flags),
+    SYMTAB(EF_META_TYPE, "meta-type", meta_type),
+    SYMTAB(EF_MISSIONS, "missions", missions),
+    SYMTAB(EF_NATION_FLAGS, "nation-flags", nation_flags),
+    SYMTAB(EF_NATION_REJECTS, "nation-rejects", nation_rejects),
+    SYMTAB(EF_NATION_RELATIONS, "nation-relationships", nation_relations),
+    SYMTAB(EF_NATION_STATUS, "nation-status", nation_status),
+    SYMTAB(EF_NUKE_CHR_FLAGS, "nuke-chr-flags", nuke_chr_flags),
+    SYMTAB(EF_PACKING, "packing", packing),
+    SYMTAB(EF_PAGE_HEADINGS, "page-headings", page_headings),
+    SYMTAB(EF_PLAGUE_STAGES, "plague-stages", plague_stages),
+    SYMTAB(EF_PLANE_CHR_FLAGS, "plane-chr-flags", plane_chr_flags),
+    SYMTAB(EF_PLANE_FLAGS, "plane-flags", plane_flags),
+    SYMTAB(EF_RESOURCES, "resources", resources),
+    SYMTAB(EF_RETREAT_FLAGS, "retreat-flags", retreat_flags),
+    SYMTAB(EF_SECTOR_NAVIGATION, "sector-navigation", sector_navigation),
+    SYMTAB(EF_SHIP_CHR_FLAGS, "ship-chr-flags", ship_chr_flags),
+    SYMTAB(EF_TREATY_FLAGS, "treaty-flags", treaty_flags),
 
     /* Views */
     {EF_COUNTRY, "country", NULL, cou_ca, UNMAPPED_CACHE(struct natstr, 0)},