Removed MemDebug from FoundationEx

1 files changed, 15 insertions, 16 deletions

diff --git a/Stars45/FlightPlanner.cpp b/Stars45/FlightPlanner.cpp
index aa344f5..e8d11c8 100644
--- a/Stars45/FlightPlanner.cpp
+++ b/Stars45/FlightPlanner.cpp
@@ -12,7 +12,6 @@
     Used both by the CarrierAI class and the Flight Dialog.
 */
 
-#include "MemDebug.h"
 #include "FlightPlanner.h"
 #include "Ship.h"
 #include "ShipDesign.h"
@@ -76,7 +75,7 @@ FlightPlanner::CreatePatrolRoute(Element* elem, int index)
     rloc.SetAzimuth(-10*DEGREES + zone);
     rloc.SetAzimuthVar(0);
 
-    instr = new(__FILE__,__LINE__) Instruction(ship->GetRegion(), dummy, Instruction::VECTOR);
+    instr = new Instruction(ship->GetRegion(), dummy, Instruction::VECTOR);
     instr->SetSpeed(750);
     instr->GetRLoc() = rloc;
 
@@ -92,7 +91,7 @@ FlightPlanner::CreatePatrolRoute(Element* elem, int index)
     rloc.SetAzimuth(-20*DEGREES + zone);
     rloc.SetAzimuthVar(15*DEGREES);
 
-    instr = new(__FILE__,__LINE__) Instruction(ship->GetRegion(), dummy, Instruction::PATROL);
+    instr = new Instruction(ship->GetRegion(), dummy, Instruction::PATROL);
     instr->SetSpeed(500);
     instr->GetRLoc() = rloc;
 
@@ -104,7 +103,7 @@ FlightPlanner::CreatePatrolRoute(Element* elem, int index)
     rloc.SetAzimuth(60*DEGREES + zone);
     rloc.SetAzimuthVar(20*DEGREES);
 
-    instr = new(__FILE__,__LINE__) Instruction(ship->GetRegion(), dummy, Instruction::PATROL);
+    instr = new Instruction(ship->GetRegion(), dummy, Instruction::PATROL);
     instr->SetSpeed(350);
     instr->GetRLoc() = rloc;
 
@@ -116,7 +115,7 @@ FlightPlanner::CreatePatrolRoute(Element* elem, int index)
     rloc.SetAzimuth(120*DEGREES + zone);
     rloc.SetAzimuthVar(20*DEGREES);
 
-    instr = new(__FILE__,__LINE__) Instruction(ship->GetRegion(), dummy, Instruction::PATROL);
+    instr = new Instruction(ship->GetRegion(), dummy, Instruction::PATROL);
     instr->SetSpeed(350);
     instr->GetRLoc() = rloc;
 
@@ -129,7 +128,7 @@ FlightPlanner::CreatePatrolRoute(Element* elem, int index)
     rloc.SetAzimuth(180*DEGREES + ship->CompassHeading());
     rloc.SetAzimuthVar(0*DEGREES);
 
-    instr = new(__FILE__,__LINE__) Instruction(ship->GetRegion(), dummy, Instruction::RTB);
+    instr = new Instruction(ship->GetRegion(), dummy, Instruction::RTB);
     instr->SetSpeed(500);
     instr->GetRLoc() = rloc;
 
@@ -175,7 +174,7 @@ FlightPlanner::CreateStrikeRoute(Element* elem, Element* target)
     rloc.SetAzimuth(head);
     rloc.SetAzimuthVar(2*DEGREES);
 
-    instr = new(__FILE__,__LINE__) Instruction(ship->GetRegion(), dummy, Instruction::VECTOR);
+    instr = new Instruction(ship->GetRegion(), dummy, Instruction::VECTOR);
     instr->SetSpeed(750);
     instr->GetRLoc() = rloc;
 
@@ -203,7 +202,7 @@ FlightPlanner::CreateStrikeRoute(Element* elem, Element* target)
             rloc.SetAzimuth(beam);
             rloc.SetAzimuthVar(5*DEGREES);
 
-            instr = new(__FILE__,__LINE__) Instruction(tgt_ship->GetRegion(), dummy, Instruction::ASSAULT);
+            instr = new Instruction(tgt_ship->GetRegion(), dummy, Instruction::ASSAULT);
             instr->SetSpeed(750);
             instr->GetRLoc() = rloc;
             instr->SetTarget(target->Name());
@@ -220,7 +219,7 @@ FlightPlanner::CreateStrikeRoute(Element* elem, Element* target)
             rloc.SetAzimuth(beam);
             rloc.SetAzimuthVar(15*DEGREES);
 
-            instr = new(__FILE__,__LINE__) Instruction(tgt_ship->GetRegion(), dummy, Instruction::VECTOR);
+            instr = new Instruction(tgt_ship->GetRegion(), dummy, Instruction::VECTOR);
             instr->SetSpeed(750);
             instr->GetRLoc() = rloc;
 
@@ -238,7 +237,7 @@ FlightPlanner::CreateStrikeRoute(Element* elem, Element* target)
             if (tgt_ship->IsGroundUnit())
             action = Instruction::STRIKE;
 
-            instr = new(__FILE__,__LINE__) Instruction(tgt_ship->GetRegion(), dummy, action);
+            instr = new Instruction(tgt_ship->GetRegion(), dummy, action);
             instr->SetSpeed(750);
             instr->GetRLoc() = rloc;
             instr->SetTarget(target->Name());
@@ -255,7 +254,7 @@ FlightPlanner::CreateStrikeRoute(Element* elem, Element* target)
             rloc.SetAzimuth(tgt_ship->CompassHeading());
             rloc.SetAzimuthVar(20*DEGREES);
 
-            instr = new(__FILE__,__LINE__) Instruction(tgt_ship->GetRegion(), dummy, Instruction::INTERCEPT);
+            instr = new Instruction(tgt_ship->GetRegion(), dummy, Instruction::INTERCEPT);
             instr->SetSpeed(750);
             instr->GetRLoc() = rloc;
             instr->SetTarget(target->Name());
@@ -272,7 +271,7 @@ FlightPlanner::CreateStrikeRoute(Element* elem, Element* target)
     rloc.SetAzimuth(180*DEGREES + ship->CompassHeading());
     rloc.SetAzimuthVar(0*DEGREES);
 
-    instr = new(__FILE__,__LINE__) Instruction(ship->GetRegion(), dummy, Instruction::RTB);
+    instr = new Instruction(ship->GetRegion(), dummy, Instruction::RTB);
     instr->SetSpeed(500);
     instr->GetRLoc() = rloc;
 
@@ -306,7 +305,7 @@ FlightPlanner::CreateEscortRoute(Element* elem, Element* ward)
     rloc.SetAzimuth(head);
     rloc.SetAzimuthVar(0);
 
-    instr = new(__FILE__,__LINE__) Instruction(ship->GetRegion(), dummy, Instruction::VECTOR);
+    instr = new Instruction(ship->GetRegion(), dummy, Instruction::VECTOR);
     instr->SetSpeed(750);
     instr->GetRLoc() = rloc;
 
@@ -327,7 +326,7 @@ FlightPlanner::CreateEscortRoute(Element* elem, Element* ward)
                     rloc.SetAzimuth(0);
                     rloc.SetAzimuthVar(90*DEGREES);
 
-                    instr = new(__FILE__,__LINE__) Instruction(ship->GetRegion(), dummy, Instruction::ESCORT);
+                    instr = new Instruction(ship->GetRegion(), dummy, Instruction::ESCORT);
                     instr->SetSpeed(350);
                     instr->GetRLoc() = rloc;
                     instr->SetTarget(ward->Name());
@@ -346,7 +345,7 @@ FlightPlanner::CreateEscortRoute(Element* elem, Element* ward)
             rloc.SetAzimuth(0);
             rloc.SetAzimuthVar(90*DEGREES);
 
-            instr = new(__FILE__,__LINE__) Instruction(ship->GetRegion(), dummy, Instruction::DEFEND);
+            instr = new Instruction(ship->GetRegion(), dummy, Instruction::DEFEND);
             instr->SetSpeed(500);
             instr->GetRLoc() = rloc;
             instr->SetTarget(ward->Name());
@@ -363,7 +362,7 @@ FlightPlanner::CreateEscortRoute(Element* elem, Element* ward)
     rloc.SetAzimuth(180*DEGREES + ship->CompassHeading());
     rloc.SetAzimuthVar(0*DEGREES);
 
-    instr = new(__FILE__,__LINE__) Instruction(ship->GetRegion(), dummy, Instruction::RTB);
+    instr = new Instruction(ship->GetRegion(), dummy, Instruction::RTB);
     instr->SetSpeed(500);
     instr->GetRLoc() = rloc;