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

@ -39,6 +39,7 @@
#include "sect.h"
#include "nsc.h"
#include "nat.h"
#include "optlist.h"
#include "path.h"
#include "commands.h"
#include "combat.h"
@ -78,7 +79,7 @@ sinfra(void)
pr("%4.3f ", sector_mcost(&sect, MOB_ROAD));
pr("%4d%% ", sect.sct_rail);
pr("%4.3f ", sector_mcost(&sect, MOB_RAIL));
pr("%4d%% ", sect.sct_defense);
pr("%4d%% ", SCT_DEFENSE(&sect));
pr("%5.2f\n", sector_strength(&sect));
}
if (nsect == 0) {