(hard_tech): Unused, remove.

(configkeys): Fix km_flags of key anno_keep_days.

diff --git a/include/econfig-spec.h b/include/econfig-spec.h
index 55dd887a2adde554d789b2b895c6b68b4af91394..b0b7186351e286e6ff103ecd1532b8cd5656c237 100644 (file)
--- a/include/econfig-spec.h
+++ b/include/econfig-spec.h
@@ -123,8 +123,6 @@ EMPCFBOTH("war_cost", War_Cost, int, intset, 0,
 EMPCF_COMMENT("\n\n### Technology/Research/Education/Happiness")
 EMPCFBOTH("easy_tech", easy_tech, float, floatset, 0,
     "Amount of tech built with no penalty")
-EMPCFBOTH("hard_tech", hard_tech, float, floatset, 0,
-    "Amount of in-efficiently built tech")
 EMPCFBOTH("start_tech", start_technology, float, floatset, 0,
     "Starting technology for new countries")
 EMPCFBOTH("start_happy", start_happiness, float, floatset, 0,
@@ -291,7 +289,7 @@ EMPCFBOTH("trade_ally_cut", trade_ally_cut, float, floatset, 0,
     "Bonus your ally gets for you cashing in with them")
 
 EMPCF_COMMENT("\n\n### Misc.")
-EMPCFBOTH("anno_keep_days", anno_keep_days, int, intset, 7,
+EMPCFBOTH("anno_keep_days", anno_keep_days, int, intset, 0,
          "How long until announcements expire (<0 means never)")
 EMPCFBOTH("fuel_mult", fuel_mult, int, intset, 0,
     "Multiplier for fuel to mobility calculation")

diff --git a/src/lib/commands/vers.c b/src/lib/commands/vers.c
index 34cea2d92be3b93c17e4439eb514992bfce51ada..2b574ff77ec27d2b1a92375c8ff3d79a98674498 100644 (file)
--- a/src/lib/commands/vers.c
+++ b/src/lib/commands/vers.c
@@ -114,7 +114,6 @@ vers(void)
        (int)(level_age_rate));
 
     pr("Tech Buildup is ");
-/*     if (tech_log_base <= 1.0 && hard_tech == 0.0) { */
     if (tech_log_base <= 1.0) {
        pr("not limited\n");
     }
@@ -125,14 +124,6 @@ vers(void)
        else
            pr(" after %0.2f.\n", easy_tech);
     }
-    /*else {
-       pr("limited to asymptotic growth towards %.2f",
-       hard_tech + easy_tech);
-       if (easy_tech == 0.00) 
-       pr(".\n");
-       else
-       pr("after %.2f\n",easy_tech);
-       } */
     pr("\n");
     pr("\t\t\t\tSectors\tShips\tPlanes\tUnits\n");
     pr("Maximum mobility\t\t%d\t%d\t%d\t%d\n", sect_mob_max,

diff --git a/src/lib/global/constants.c b/src/lib/global/constants.c
index c8a57fe8ed336387afe2b6e094e65c53a311adbc..46bc2cb5cd5333eb62954d9b6e25aa582aca01e1 100644 (file)
--- a/src/lib/global/constants.c
+++ b/src/lib/global/constants.c
@@ -184,15 +184,8 @@ float hap_avg = 16.0 * 3.0;
 float edu_avg = 16.0 * 12.0;
 
 
-/* tech build limitations.  Tech limits only apply after easy_tech.
- * Two ways of limiting tech: asymptotic or logrithmic:
- * tech_hard is asymptopic limitation, tech_log_base is the logrithmic
- * limitation.  set tech_log_base > 1.0 to have it take effect,
- * set hard_tech > 0 to have it take effect
- * for log based, only tech values where the slop is < 1 are used      */
-
+/* tech build limitations.  */
 float easy_tech = 1.00;                /* amount of tech built with no penality */
-float hard_tech = 10.0;                /* amount of in-efficiently built tech */
 float tech_log_base = 2.0;     /* base of log to take of in-efficient tech */
 
 float ally_factor = 2.0;       /* shared tech with allies = 1/factor */