diff options
Diffstat (limited to 'Stars45/MsnPkgDlg.cpp')
| -rw-r--r-- | Stars45/MsnPkgDlg.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Stars45/MsnPkgDlg.cpp b/Stars45/MsnPkgDlg.cpp index 847bf32..50a7b1c 100644 --- a/Stars45/MsnPkgDlg.cpp +++ b/Stars45/MsnPkgDlg.cpp @@ -141,7 +141,7 @@ MsnPkgDlg::DrawPackages() ListIter<MissionElement> elem = mission->GetElements(); while (++elem) { // display this element? - if (elem->GetIFF() == mission->Team() && + if (elem->GetIFF() == mission->Team() && !elem->IsSquadron() && elem->Region() == mission->GetRegion() && elem->GetDesign()->type < Ship::STATION) { @@ -229,9 +229,9 @@ MsnPkgDlg::DrawThreats() if (!mission) return; MissionElement* player = mission->GetPlayer(); - + if (!player) return; - + Text rgn0 = player->Region(); Text rgn1; int iff = player->GetIFF(); @@ -257,11 +257,11 @@ MsnPkgDlg::DrawThreats() continue; if (elem->IsGroundUnit()) { - if (!elem->GetDesign() || + if (!elem->GetDesign() || elem->GetDesign()->type != Ship::SAM) continue; - if (elem->Region() != rgn0 && + if (elem->Region() != rgn0 && elem->Region() != rgn1) continue; } @@ -288,8 +288,8 @@ MsnPkgDlg::DrawThreats() double dist = Point(base_loc - elem->Location()).length(); FormatNumber(rng, dist); - sprintf_s(txt, "%s - %d %s - %s", role, - elem->Count(), + sprintf_s(txt, "%s - %d %s - %s", role, + elem->Count(), elem->GetDesign()->abrv, rng); if (threat[i]) |