(START_CASH, start_cash): Replace START_CASH by new econfig key

start_cash.

diff --git a/include/econfig-spec.h b/include/econfig-spec.h
index e6043d157e3e66888d4d8f75295f8082f7c59279..c96ccae35eb587a634718c855e06216df9cb30c2 100644 (file)
--- a/include/econfig-spec.h
+++ b/include/econfig-spec.h
@@ -125,6 +125,8 @@ EMPCFBOTH("players_at_00", players_at_00, int, NSC_INT, 0,
     "Players have their coordinate system at deity 0,0 (0 - no, 1 - yes)")
 EMPCFBOTH("at_least_one_100", at_least_one_100, int, NSC_INT, KM_INTERNAL,
     "Initialize new countries with at least one sector with 100 of all resource")
+EMPCFBOTH("start_cash", start_cash, long, NSC_LONG, 0,
+    "Starting cash for new countries")
 EMPCFBOTH("powe_cost", powe_cost, double, NSC_DOUBLE, 0,
     "Number of BTUs needed to generate a new power report")
 EMPCFBOTH("war_cost", War_Cost, int, NSC_INT, 0,

diff --git a/include/options.h b/include/options.h
index e3bb5e8bced91b9b0e6803f875c680916dd0bbd2..6dd1b8aef1d2a62c4bd3cd06efd90d17a18f28c0 100644 (file)
--- a/include/options.h
+++ b/include/options.h
@@ -50,8 +50,6 @@
 
 #define LANDSPIES              /* Enable the land unit type spies */
 
-#define START_CASH 25000       /* set starting cash when capitol created */
-
                        /* Setting BLITZ sets a couple of things.
                           1.  BTU's always max when you login. 
                           2.  Changing name doesn't take any btus or $$

diff --git a/src/lib/commands/new.c b/src/lib/commands/new.c
index 23bf4aacd6859c6bfbae98e003dfbebcc779f302..4f491e9a403ac55807cdae5a2ee0b7377c2afd50 100644 (file)
--- a/src/lib/commands/new.c
+++ b/src/lib/commands/new.c
@@ -195,7 +195,7 @@ new(void)
        natp->nat_xorg = 0;
        natp->nat_yorg = 0;
     }
-    natp->nat_money = START_CASH;
+    natp->nat_money = start_cash;
     natp->nat_level[NAT_HLEV] = start_happiness;
     natp->nat_level[NAT_RLEV] = start_research;
     natp->nat_level[NAT_TLEV] = start_technology;

diff --git a/src/lib/global/constants.c b/src/lib/global/constants.c
index 2db1ca4b50836ffbebd562a5628cadf89b299dc3..b2777472631cb329b77be01ec5204b375844c3c6 100644 (file)
--- a/src/lib/global/constants.c
+++ b/src/lib/global/constants.c
@@ -217,6 +217,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;