@@ -804,24 +804,28 @@ void Activity::Clear() {
804
804
}
805
805
806
806
float totalValue = orbitedCraft->GetTotalValue (0 , foreignCostMult, nativeCostMult);
807
- std::snprintf (messageString, sizeof (messageString), " Returned Craft + Cargo added %.0f oz to Funds!" , totalValue);
808
807
808
+ std::string craftText = " Returned craft" ;
809
+ if (!orbitedCraft->IsInventoryEmpty ()) { craftText += " + cargo" ; }
810
+
811
+ if (totalValue > 0 ) {
812
+ m_TeamFunds[orbitedCraftTeam] += totalValue;
813
+ std::snprintf (messageString, sizeof (messageString), " %s added %.0f oz to funds!" , craftText.c_str (), totalValue);
814
+ }
809
815
for (int player = Players::PlayerOne; player < Players::MaxPlayerCount; ++player) {
810
816
if (m_IsActive[player]) {
811
817
if (brainOnBoard && orbitedCraft == GetPlayerBrain (static_cast <Players>(player))) {
812
818
m_BrainEvacuated[player] = true ;
813
- std::snprintf (messageString, sizeof (messageString), " YOUR BRAIN HAS BEEN EVACUATED BACK INTO ORBIT!" );
814
- }
815
-
816
- if (m_Team[player] == orbitedCraftTeam) {
819
+ g_FrameMan.ClearScreenText (ScreenOfPlayer (ScreenOfPlayer (static_cast <Players>(player))));
820
+ g_FrameMan.SetScreenText (" YOUR BRAIN HAS BEEN EVACUATED BACK INTO ORBIT!" , ScreenOfPlayer (static_cast <Players>(player)), 0 , 3500 );
821
+ } else if (m_Team[player] == orbitedCraftTeam && totalValue > 0 ) {
817
822
g_FrameMan.ClearScreenText (ScreenOfPlayer (ScreenOfPlayer (static_cast <Players>(player))));
818
823
g_FrameMan.SetScreenText (messageString, ScreenOfPlayer (static_cast <Players>(player)), 0 , 3500 );
819
824
m_MessageTimer[player].Reset ();
820
825
}
821
826
}
822
827
}
823
828
824
- m_TeamFunds[orbitedCraftTeam] += totalValue;
825
829
orbitedCraft->SetGoldCarried (0 );
826
830
orbitedCraft->SetHealth (orbitedCraft->GetMaxHealth ());
827
831
0 commit comments