Fix trailing whitespace

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

diff --git a/src/lib/global/constants.c b/src/lib/global/constants.c
index 7930dd85cb35fddfdd9c0c627ffcb4fd5f694f4b..2611679f509bc9114562013f1a05f39598f352da 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-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
@@ -26,10 +26,11 @@
  *  ---
  *
  *  constants.c: Global constants
- * 
+ *
  *  Known contributors to this file:
  *     Ken Stevens, 1995
  *     Steve McClure, 1996
+ *     Markus Armbruster, 2004-2008
  */
 
 #include <config.h>
@@ -43,6 +44,8 @@ char *privlog = "careless@invalid";
 /* Divine hosts and networks */
 char *privip = "127.0.0.1 ::1 ::ffff:127.0.0.1";
 
+char *post_crash_dump_hook = "";
+
 char *disabled_commands = "";
 
 int keep_journal = 0;          /* journal log file enabled */
@@ -54,11 +57,9 @@ 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 = 10;              /* seconds per Empire Time Unit */
 int etu_per_update = 60;       /* # of etu's per update */
 int update_window = 0;         /* update window adjustment, in seconds */
 int update_demand = UPD_DEMAND_NONE;
-int update_missed = 999;       /* demand updates missed before veto */
 int update_wantmin = 1;                /* votes required for demand update */
 char *update_demandtimes = ""; /* demand update time ranges */
 char *game_days = "";          /* days game is running */
@@ -84,8 +85,8 @@ int sect_mob_neg_factor = 2;  /* ETU/neg_factor = negative amount of mobility
                                   a sector has after being taken */
 
 int anno_keep_days = 7;                /* How long until annos expire (<0 never) */
-int news_keep_days = 10;       /* How long until news expire (<0 never) */
-int lost_items_timeout = 172800;       /* How long before removing from database */
+int news_keep_days = 10;       /* How long until news expire */
+int lost_keep_hours = 48;      /* How long until lost items expire */
 
 double combat_mob = 5.0;       /* how much mob do units spend for combat? */
 
@@ -101,9 +102,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 */
 
-/* opt_FUEL */
-int fuel_mult = 10;            /* 1 fuel = 10 mob */
-
 float land_grow_scale = 2.0;   /* how fast eff grows for land units (xETUS) */
 float ship_grow_scale = 3.0;   /* how fast eff grows for ships (xETUS) */
 float plane_grow_scale = 2.0;  /* how fast eff grows for planes (xETUS) */
@@ -131,7 +129,7 @@ double decay_per_etu = 0.006;       /* This gives a half life of ? etus,
                                   you can not get a precise number
                                   without intensive simulation
                                   (more than 3 digits). */
-double fallout_spread = 0.005; /* fraction of fallout that leaks into 
+double fallout_spread = 0.005; /* fraction of fallout that leaks into
                                   each surrounding sector */
 /* end opt_FALLOUT */
 
@@ -165,7 +163,7 @@ double hap_cons = 600000.0;
 double edu_cons = 600000.0;
 
 /* hap and edu avg mean that the weight on current happiness is
- *  (cur_hap * hap_avg + hap_prod * etu) / (hap_avg + etu);            */
+ *  (cur_hap * hap_avg + hap_prod * etu) / (hap_avg + etu); */
 float hap_avg = 16.0 * 3.0;
 float edu_avg = 16.0 * 12.0;
 
@@ -189,11 +187,11 @@ int max_btus = 640;               /* maximum # of btu's */
 
 double buil_bt = 10.0;         /* tech level required to build a bridge */
 int buil_bh = 100;             /* hcm required to build a bridge */
-double buil_bc = 2000.0;       /* cash required to build a bridge */
+double buil_bc = 1000.0;       /* cash required to build a bridge */
 
 double buil_tower_bt = 100.0;  /* tech level required to build a tower */
 int buil_tower_bh = 400;       /* hcm required to build a bridge tower */
-double buil_tower_bc = 7500.0; /* cash required to build a bridge tower */
+double buil_tower_bc = 3000.0; /* cash required to build a bridge tower */
 
 /* opt_SLOW_WAR */
 int War_Cost = 1000;           /* Cost to declare war */
@@ -223,3 +221,11 @@ float start_education = 0.0;
 float start_happiness = 0.0;
 float start_technology = 0.0;
 float start_research = 0.0;
+
+/* econfig keys */
+static int emp_config_dummy;
+struct keymatch configkeys[] = {
+#define        EMP_CONFIG_C_OUTPUT
+#include "econfig-spec.h"
+#undef EMP_CONFIG_C_OUTPUT
+};