diff options
Diffstat (limited to 'Stars45/CampaignPlanEvent.cpp')
| -rw-r--r-- | Stars45/CampaignPlanEvent.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Stars45/CampaignPlanEvent.cpp b/Stars45/CampaignPlanEvent.cpp index d8978a8..0086080 100644 --- a/Stars45/CampaignPlanEvent.cpp +++ b/Stars45/CampaignPlanEvent.cpp @@ -113,7 +113,7 @@ CampaignPlanEvent::ExecScriptedEvents() case CombatAction::COMBAT_EVENT: { CombatEvent* event = new(__FILE__,__LINE__) - CombatEvent(campaign, + CombatEvent(campaign, action->Subtype(), (int) campaign->GetTime(), action->GetIFF(), @@ -482,7 +482,7 @@ CampaignPlanEvent::ExecStatisticalEvents() CombatGroup* objective = a->GetObjective(); CombatGroup* player = campaign->GetPlayerGroup(); - if (objective && player && + if (objective && player && objective->GetCurrentZone() == player->GetCurrentZone()) a = ChooseAssignment(c->GetForce()); } @@ -642,7 +642,7 @@ CampaignPlanEvent::CreateEventDefend(CombatAssignment* a) Text info; event = new(__FILE__,__LINE__) CombatEvent(campaign, - CombatEvent::DEFEND, + CombatEvent::DEFEND, event_time, group->GetIFF(), CombatEvent::TACNET, @@ -721,7 +721,7 @@ CampaignPlanEvent::CreateEventFighterAssault(CombatAssignment* a) Text info; event = new(__FILE__,__LINE__) CombatEvent(campaign, - CombatEvent::ATTACK, + CombatEvent::ATTACK, event_time, group->GetIFF(), CombatEvent::TACNET, @@ -850,7 +850,7 @@ CampaignPlanEvent::CreateEventFighterStrike(CombatAssignment* a) Text info; event = new(__FILE__,__LINE__) CombatEvent(campaign, - CombatEvent::ATTACK, + CombatEvent::ATTACK, event_time, group->GetIFF(), CombatEvent::TACNET, @@ -990,7 +990,7 @@ CampaignPlanEvent::CreateEventFighterSweep(CombatAssignment* a) Text info; event = new(__FILE__,__LINE__) CombatEvent(campaign, - CombatEvent::ATTACK, + CombatEvent::ATTACK, event_time, group->GetIFF(), CombatEvent::TACNET, @@ -1136,7 +1136,7 @@ CampaignPlanEvent::CreateEventStarship(CombatAssignment* a) Text info; event = new(__FILE__,__LINE__) CombatEvent(campaign, - CombatEvent::ATTACK, + CombatEvent::ATTACK, event_time, group->GetIFF(), CombatEvent::TACNET, |