diff options
Diffstat (limited to 'Stars45/CmdForceDlg.cpp')
| -rw-r--r-- | Stars45/CmdForceDlg.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Stars45/CmdForceDlg.cpp b/Stars45/CmdForceDlg.cpp index c73fe82..0e75049 100644 --- a/Stars45/CmdForceDlg.cpp +++ b/Stars45/CmdForceDlg.cpp @@ -184,7 +184,7 @@ CmdForceDlg::IsVisible(Combatant* c) CombatGroup* g = groups[i]; if (g->Type() < CombatGroup::CIVILIAN && - g->CountUnits() > 0 && + g->CountUnits() > 0 && g->IntelLevel() >= Intel::KNOWN) nvis++; @@ -258,9 +258,9 @@ CmdForceDlg::AddCombatGroup(CombatGroup* grp, bool last_child) } int index = lst_combat->AddItemWithData( - Text(pipe_stack) + - Text(prefix) + - grp->GetDescription(), + Text(pipe_stack) + + Text(prefix) + + grp->GetDescription(), (DWORD) grp); lst_combat->SetItemData(index-1, 1, 0); blank_line = false; @@ -286,7 +286,7 @@ CmdForceDlg::AddCombatGroup(CombatGroup* grp, bool last_child) CombatUnit* unit = unit_iter.value(); char info[512]; int damage = (int) (100 * unit->GetSustainedDamage() / unit->GetDesign()->integrity); - + if (damage < 1 || unit->DeadCount() >= unit->Count()) { sprintf_s(info, "%s%s%s", pipe_stack, prefix, unit->GetDescription()); } else { @@ -337,7 +337,7 @@ CmdForceDlg::OnForces(AWEvent* event) while (++iter) { Combatant* c = iter.value(); - + if (name == c->Name()) { ShowCombatant(c); break; @@ -583,7 +583,7 @@ CmdForceDlg::OnCombat(AWEvent* event) for (int i = 0; i < combatants.size(); i++) { c = combatants[i]; - + if (name == c->Name()) { break; } @@ -600,7 +600,7 @@ CmdForceDlg::OnCombat(AWEvent* event) } if (btn_transfer && campaign && current_group) - btn_transfer->SetEnabled( campaign->IsActive() && + btn_transfer->SetEnabled( campaign->IsActive() && CanTransfer(current_group) ); } |