X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=bs%2Ffleetview.cpp;h=e3290a62d7c4a39d0c25780a13a282cd30012f1f;hb=9fa0d25038087d8417c0849a495eeae1abcb9504;hp=1144ca9d2eb104ca8dee0b28881da181fdc8b87f;hpb=1c8c7800411f2491d9be16c0f1515a91525f2e56;p=hbs.git diff --git a/bs/fleetview.cpp b/bs/fleetview.cpp index 1144ca9..e3290a6 100644 --- a/bs/fleetview.cpp +++ b/bs/fleetview.cpp @@ -82,6 +82,7 @@ FleetView::~FleetView(){ // void FleetView::viewFleet(const Fleet* fleet, bool friendly) { + friendly = true; if (m_Fleet->race() != fleet->race()) { findNames(); @@ -227,7 +228,7 @@ void FleetView::slotRoidsChanged(const QString& type, int value) ///////////////////////////////////////////////////////////////////// // -void FleetView::slotViewTickRange(int min = -1, int max = -1) +void FleetView::slotViewTickRange(int min, int max) { if (min > -1) m_iMinTick = min; @@ -316,6 +317,14 @@ void FleetView::slotViewTickRange(int min = -1, int max = -1) after = pl->roids(tr("uninit").latin1(),m_iMaxTick); lost = after - before; m_RoidsEditView->slotSetLost(tr("uninit"),lost); + + before = pl->planetScore(m_iMinTick); + after = pl->planetScore(m_iMaxTick); + lost = after - before; + m_RoidsEditView->slotSetLost(tr("scorelost"),lost); + + m_RoidsEditView->slotSetLost(tr("capping"),pl->capping(m_iMaxTick)); + } }