DEFENSE_INFRA was implemented in an odd way: sct_defense was used

regardless of the option, but forced to sct_effic when disabled.  This
screws up sct_defense when you disable DEFENSE_INFRA.  Implement it
more like FALLOUT: use sct_defense if enabled, else sct_effic.  The
change should be invisible except in xdump, which shows the real
sct_defense.  Closes #804641.
(SCT_DEFENSE): New.
(dump, sinfra, sector_strength): Use it.
(eff_bomb, build_bridge, build_tower, new, buildeff, sect_damage)
(put_combat, checksect, produce_sect): Don't force sct_defense to
sct_effic when DEFENSE_INFRA is disabled.
This commit is contained in:
Markus Armbruster 2006-05-20 11:53:20 +00:00
parent 499e19f97b
commit d906fd6b99
11 changed files with 7 additions and 23 deletions

View file

@ -173,6 +173,9 @@ extern struct dchrstr bigcity_dchr;
/* Work required for building */
#define SCT_BLD_WORK(lcm, hcm) ((lcm) + 2 * (hcm))
#define SCT_DEFENSE(sp) \
(opt_DEFENSE_INFRA ? (sp)->sct_defense : (sp)->sct_effic)
#define MIN_MOBCOST 0.001 /* lowest cost a sector can have to move into */
#define FORTEFF 5 /* forts must be 5% efficient to fire. */