diff options
Diffstat (limited to 'Stars45/CampaignPlanEvent.cpp')
| -rw-r--r-- | Stars45/CampaignPlanEvent.cpp | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/Stars45/CampaignPlanEvent.cpp b/Stars45/CampaignPlanEvent.cpp index 05f94b1..f487984 100644 --- a/Stars45/CampaignPlanEvent.cpp +++ b/Stars45/CampaignPlanEvent.cpp @@ -14,7 +14,6 @@ campaign. */ -#include "MemDebug.h" #include "CampaignPlanEvent.h" #include "Campaign.h" #include "Combatant.h" @@ -87,7 +86,7 @@ CampaignPlanEvent::ExecScriptedEvents() switch (action->Type()) { case CombatAction::COMBAT_EVENT: { - CombatEvent* event = new(__FILE__,__LINE__) + CombatEvent* event = new CombatEvent(campaign, action->Subtype(), (int) campaign->GetTime(), @@ -206,7 +205,7 @@ CampaignPlanEvent::ExecScriptedEvents() // don't announce the move unless it's for the player's team: if (action->GetIFF() == campaign->GetPlayerIFF() && _stricmp(action->GetText(), "do-not-display")) { - CombatEvent* event = new(__FILE__,__LINE__) + CombatEvent* event = new CombatEvent(campaign, CombatEvent::MOVE_TO, (int) campaign->GetTime(), @@ -291,7 +290,7 @@ CampaignPlanEvent::ExecScriptedEvents() // don't announce the move unless it's for the player's team: if (action->GetIFF() == campaign->GetPlayerIFF() && _stricmp(action->GetText(), "do-not-display")) { - CombatEvent* event = new(__FILE__,__LINE__) + CombatEvent* event = new CombatEvent(campaign, CombatEvent::MOVE_TO, (int) campaign->GetTime(), @@ -616,7 +615,7 @@ CampaignPlanEvent::CreateEventDefend(CombatAssignment* a) Text title = Text(group->Name()) + " in Defensive Engagement"; Text info; - event = new(__FILE__,__LINE__) CombatEvent(campaign, + event = new CombatEvent(campaign, CombatEvent::DEFEND, event_time, group->GetIFF(), @@ -695,7 +694,7 @@ CampaignPlanEvent::CreateEventFighterAssault(CombatAssignment* a) Text title = Text(group->Name()); Text info; - event = new(__FILE__,__LINE__) CombatEvent(campaign, + event = new CombatEvent(campaign, CombatEvent::ATTACK, event_time, group->GetIFF(), @@ -824,7 +823,7 @@ CampaignPlanEvent::CreateEventFighterStrike(CombatAssignment* a) Text title = Text(group->Name()); Text info; - event = new(__FILE__,__LINE__) CombatEvent(campaign, + event = new CombatEvent(campaign, CombatEvent::ATTACK, event_time, group->GetIFF(), @@ -964,7 +963,7 @@ CampaignPlanEvent::CreateEventFighterSweep(CombatAssignment* a) Text title = Text(group->Name()); Text info; - event = new(__FILE__,__LINE__) CombatEvent(campaign, + event = new CombatEvent(campaign, CombatEvent::ATTACK, event_time, group->GetIFF(), @@ -1110,7 +1109,7 @@ CampaignPlanEvent::CreateEventStarship(CombatAssignment* a) Text title = Text(group->Name()); Text info; - event = new(__FILE__,__LINE__) CombatEvent(campaign, + event = new CombatEvent(campaign, CombatEvent::ATTACK, event_time, group->GetIFF(), |