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

@ -369,8 +369,6 @@ eff_bomb(struct emp_qelem *list, struct sctstr *target)
target->sct_road = effdamage(target->sct_road, dam);
target->sct_rail = effdamage(target->sct_rail, dam);
target->sct_defense = effdamage(target->sct_defense, dam);
if (!opt_DEFENSE_INFRA)
target->sct_defense = target->sct_effic;
pr("did %d%% damage to efficiency in %s\n",
oldeff - target->sct_effic,
xyas(target->sct_x, target->sct_y, player->cnum));