COPYING duplicates information from README. Remove. Move GPL from

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

diff --git a/src/lib/global/constants.c b/src/lib/global/constants.c
index 5979a762644cf67eaa34a9291833d9fb07f0074c..103e0b79db1cfc20955cff1b9672850a9bd7f240 100644 (file)
--- a/src/lib/global/constants.c
+++ b/src/lib/global/constants.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.
  *
  *  ---
  *
@@ -34,21 +34,22 @@
  *     
  */
 
-#include "gamesdef.h"
+#include <config.h>
+
 #include "misc.h"
 
-char *privname = PRVNAM;       /* name of priv user */
-char *privlog = PRVLOG;        /* logname of priv user */
+char *privname = "Deity forgot to edit econfig"; /* name of priv user */
+char *privlog = "careless@invalid"; /* logname of priv user */
 
-int WORLD_X = DEF_WORLD_X;     /* World size - x */
-int WORLD_Y = DEF_WORLD_Y;     /* World size - y */
+int WORLD_X = 64;              /* World size - x */
+int WORLD_Y = 32;              /* World size - y */
 
 int MARK_DELAY = 7200;         /* Seconds to bid on commodities */
 int TRADE_DELAY = 7200;                /* Seconds to bid on units */
 
 int m_m_p_d = 1440;            /* max mins of play per day (per country) */
-int s_p_etu = DEF_S_P_ETU;     /* seconds per Empire time unit */
-int etu_per_update = ETUS;     /* # of etu's per update, from misc.h */
+int s_p_etu = 10;              /* seconds per Empire time unit */
+int etu_per_update = 60;       /* # of etu's per update */
 int adj_update = 0;            /* update time adjustment */
 int update_window = 0;         /* update window adjustment */
 int hourslop = 5;              /* amount of slop to match update times */
@@ -99,11 +100,6 @@ double people_damage = 1.00;        /* Civs/mil/uw take this fraction of damage */
 double collateral_dam = 0.10;  /* Side effect damage to sector */
 double assault_penalty = 0.50; /* attack factor for para & assault troops */
 
-/* START_UNITS */
-#ifdef START_UNITS
-int start_unit_type[START_UNITS] = { 0, 1 };   /* type of unit */
-#endif /* START_UNITS */
-
 /* opt_FUEL */
 int fuel_mult = 10;            /* 1 fuel = 10 mob */
 
@@ -223,6 +219,8 @@ float trade_ally_cut = 0.10;        /* 10% bonus for ally you trade with */
 
 int torpedo_damage = 40;       /* damage is X + 1dX + 1dX, so 40+1d40+1d40 */
 
+long start_cash = 25000;
+
 /* initial levels */
 float start_education = 0.0;
 float start_happiness = 0.0;