diff options
Diffstat (limited to 'Stars45/TacticalView.cpp')
| -rw-r--r-- | Stars45/TacticalView.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Stars45/TacticalView.cpp b/Stars45/TacticalView.cpp index 6905f7d..189a819 100644 --- a/Stars45/TacticalView.cpp +++ b/Stars45/TacticalView.cpp @@ -287,10 +287,10 @@ TacticalView::DrawSelection(Ship* seln) { if (!seln) return; - + Graphic* g = seln->Rep(); Rect r = g->ScreenRect(); - + Point mark_pt = seln->Location(); projector->Transform(mark_pt); @@ -581,7 +581,7 @@ TacticalView::DoMouseFrame() if (sim && right_down && (Game::RealTime() - rbutton_latch < 250)) { Ship* seln = WillSelectAt(Mouse::X(), Mouse::Y()); - if (seln && sim->IsSelected(seln) && + if (seln && sim->IsSelected(seln) && seln->GetIFF() == ship->GetIFF() && ship->GetElement()->CanCommand(seln->GetElement())) { @@ -589,8 +589,8 @@ TacticalView::DoMouseFrame() Observe(msg_ship); } - else if (ship && seln == ship && - (!ship->GetDirector() || + else if (ship && seln == ship && + (!ship->GetDirector() || ship->GetDirector()->Type() != ShipCtrl::DIR_TYPE)) { msg_ship = seln; @@ -1086,7 +1086,7 @@ TacticalView::ProcessMenuItem(int action) if (!s) s = ship; - + if (s && s->GetQuantumDrive()) { QuantumDrive* quantum = s->GetQuantumDrive(); if (quantum) { @@ -1448,7 +1448,7 @@ TacticalView::DrawAction() } break; - default: + default: if (tgt) { if (tgt_iff == ship->GetIFF()) r = 0; |