(ac_calc_flak,ac_fireflak,pinflak_planedamage): New ac_calc_flak().

Move common flak damage code from ac_fireflak() and
pinflak_planedamage() to ac_calc_flak().

Remove carriage return from comment.

diff --git a/include/econfig-spec.h b/include/econfig-spec.h
index 3fcd576cccaf5a1a29dc4d6f61f3e13c07982bee..45a6f819bb76a028fb6d0cdca8f05d01082c016b 100644 (file)
--- a/include/econfig-spec.h
+++ b/include/econfig-spec.h
@@ -27,9 +27,9 @@
  *
  *  econfig-spec.h: Combined include for optlist.h and emp_config.c
  */
-\r
-/*\r
- * Preprocessor of MSC C++ 6.0 (VC98) is broken and chokes on empty\r
+
+/*
+ * Preprocessor of MSC C++ 6.0 (VC98) is broken and chokes on empty
  * macro arguments.  Fixed in MSC C++ 7.0.  Work around: pass
  * useless token `unused'.
  */
@@ -213,7 +213,7 @@ EMPCFBOTH("land_max_interdiction_range", land_max_interdiction_range, int, NSC_I
     "Maximum range (in sectors) a land unit will try to interdict another country")
 EMPCFBOTH("ship_max_interdiction_range", ship_max_interdiction_range, int, NSC_INT, 0,
     "Maximum range (in sectors) a ship will try to interdict another country")
-EMPCFBOTH("flakscale", flakscale, double, NSC_DOUBLE, 0,
+EMPCFBOTH("flakscale", flakscale, float, NSC_FLOAT, 0,
     "Scale factor for flak damage")
 EMPCFBOTH("combat_mob", combat_mob, double, NSC_DOUBLE, 0,
     "How much mobility do units spend for combat (* casualties/bodies)")