diff options
Diffstat (limited to 'Stars45/CampaignMissionFighter.cpp')
| -rw-r--r-- | Stars45/CampaignMissionFighter.cpp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/Stars45/CampaignMissionFighter.cpp b/Stars45/CampaignMissionFighter.cpp index 06db25e..f59d24e 100644 --- a/Stars45/CampaignMissionFighter.cpp +++ b/Stars45/CampaignMissionFighter.cpp @@ -126,12 +126,12 @@ CampaignMissionFighter::CreateMission(CampaignMissionRequest* req) ::Print("\n-----------------------------------------------\n"); if (req->Script().length()) - ::Print("CMF CreateMission() request: %s '%s'\n", + ::Print("CMF CreateMission() request: %s '%s'\n", Mission::RoleName(req->Type()), (const char*) req->Script()); else - ::Print("CMF CreateMission() request: %s %s\n", + ::Print("CMF CreateMission() request: %s %s\n", Mission::RoleName(req->Type()), req->GetObjective() ? req->GetObjective()->Name().data() : "(no target)"); @@ -362,7 +362,7 @@ CampaignMissionFighter::SelectRegion() StarSystem* system = mission->GetStarSystem(); OrbitalRegion* rgn = 0; - + if (system) rgn = system->FindRegion(air_region); @@ -617,7 +617,7 @@ CampaignMissionFighter::CreateSingleElement(CombatGroup* g, CombatUnit* u) elem->SetMissionRole(Mission::ESCORT); } } - else if (u->Type() == Ship::STATION || + else if (u->Type() == Ship::STATION || u->Type() == Ship::STARBASE) { elem->SetMissionRole(Mission::FLIGHT_OPS); @@ -808,15 +808,15 @@ CampaignMissionFighter::CreatePatrols() StarSystem* system = mission->GetStarSystem(); CombatGroup* base = squadron->FindCarrier(); - + if (!base) continue; - + OrbitalRegion* region = system->FindRegion(base->GetRegion()); - + if (!region) continue; - + int patrol_type = Mission::PATROL; Point base_loc; @@ -1206,7 +1206,7 @@ CampaignMissionFighter::CreateTargetsPatrol() if (!airbase) PlanetaryInsertion(player_elem); region = air_region; - patrol_loc = base_loc + + patrol_loc = base_loc + RandomDirection() * Random( 60e3, 100e3); } else { @@ -1604,7 +1604,7 @@ CampaignMissionFighter::CreateTargetsStrike() rloc.SetAzimuthVar(30*DEGREES); n = new(__FILE__,__LINE__) Instruction(carrier_elem->Region(), - Point(), + Point(), Instruction::RTB); if (n) { n->SetSpeed(750); @@ -1748,12 +1748,12 @@ CampaignMissionFighter::CreateRandomTarget(const char* rgn, Point base_loc) if (ttype < 8) { CombatGroup* s = 0; - + if (ttype < 4) s = FindSquadron(enemy, CombatGroup::INTERCEPT_SQUADRON); else s = FindSquadron(enemy, CombatGroup::FIGHTER_SQUADRON); - + if (s) { MissionElement* elem = CreateFighterPackage(s, 2, Mission::SWEEP); if (elem) { @@ -1815,7 +1815,7 @@ CampaignMissionFighter::CreateRandomTarget(const char* rgn, Point base_loc) else if (ttype < 15) { if (oca) { CombatGroup* s = 0; - + if (airborne) s = FindSquadron(enemy, CombatGroup::LCA_SQUADRON); else @@ -2142,8 +2142,8 @@ CampaignMissionFighter::DescribeMission() sprintf_s(name, "MSN-%03d %s", mission->Identity(), Game::GetText(mission->TypeName()).data()); if (player_elem) { - sprintf_s(player_info, "%d x %s %s '%s'", - player_elem->Count(), + sprintf_s(player_info, "%d x %s %s '%s'", + player_elem->Count(), (const char*) player_elem->GetDesign()->abrv, (const char*) player_elem->GetDesign()->name, (const char*) player_elem->Name()); |