Removed MemDebug from FoundationEx

1 files changed, 17 insertions, 18 deletions

diff --git a/Stars45/MapView.cpp b/Stars45/MapView.cpp
index 486785b..dc992d1 100644
--- a/Stars45/MapView.cpp
+++ b/Stars45/MapView.cpp
@@ -11,7 +11,6 @@
     Star Map class
 */
 
-#include "MemDebug.h"
 #include "MapView.h"
 
 #include "Galaxy.h"
@@ -86,7 +85,7 @@ MapView::MapView(Window* win)
         view_offset_y[i]  = offset_y;
     }
 
-    menu_view = new(__FILE__,__LINE__) MenuView(window);
+    menu_view = new MenuView(window);
 
     title_font  = FontMgr::Find("Limerick12");
     font        = FontMgr::Find("Verdana");
@@ -281,7 +280,7 @@ MapView::BuildMenu()
 {
     ClearMenu();
 
-    map_system_menu = new(__FILE__,__LINE__) Menu(ContentBundle::GetInstance()->GetText("MapView.menu.STARSYSTEM"));
+    map_system_menu = new Menu(ContentBundle::GetInstance()->GetText("MapView.menu.STARSYSTEM"));
 
     if (system_list.size() > 0) {
         int i = 0;
@@ -297,18 +296,18 @@ MapView::BuildMenu()
         map_system_menu->AddItem(system->Name(), MAP_SYSTEM);
     }
 
-    map_sector_menu = new(__FILE__,__LINE__) Menu(ContentBundle::GetInstance()->GetText("MapView.menu.SECTOR"));
+    map_sector_menu = new Menu(ContentBundle::GetInstance()->GetText("MapView.menu.SECTOR"));
     for (int i = 0; i < regions.size(); i++) {
         Orbital* rgn = regions[i];
         map_sector_menu->AddItem(rgn->Name(), MAP_SECTOR + i);
     }
 
-    map_menu = new(__FILE__,__LINE__) Menu(ContentBundle::GetInstance()->GetText("MapView.menu.MAP"));
+    map_menu = new Menu(ContentBundle::GetInstance()->GetText("MapView.menu.MAP"));
     map_menu->AddMenu("System", map_system_menu);
     map_menu->AddMenu("Sector", map_sector_menu);
 
     if (ship || mission) {
-        ship_menu = new(__FILE__,__LINE__) Menu(ContentBundle::GetInstance()->GetText("MapView.menu.SHIP"));
+        ship_menu = new Menu(ContentBundle::GetInstance()->GetText("MapView.menu.SHIP"));
         ship_menu->AddMenu(ContentBundle::GetInstance()->GetText("MapView.item.Starsystem"), map_system_menu);
         ship_menu->AddMenu(ContentBundle::GetInstance()->GetText("MapView.item.Sector"), map_sector_menu);
 
@@ -316,36 +315,36 @@ MapView::BuildMenu()
         ship_menu->AddItem(ContentBundle::GetInstance()->GetText("MapView.item.Add-Nav"),   MAP_ADDNAV);
         ship_menu->AddItem(ContentBundle::GetInstance()->GetText("MapView.item.Clear-All"), MAP_CLEAR);
 
-        action_menu = new(__FILE__,__LINE__) Menu(ContentBundle::GetInstance()->GetText("MapView.menu.ACTION"));
+        action_menu = new Menu(ContentBundle::GetInstance()->GetText("MapView.menu.ACTION"));
         for (int i = 0; i < Instruction::NUM_ACTIONS; i++) {
             action_menu->AddItem(ContentBundle::GetInstance()->GetText(Text("MapView.item.") + Instruction::ActionName(i)), MAP_ACTION + i);
         }
 
-        formation_menu = new(__FILE__,__LINE__) Menu(ContentBundle::GetInstance()->GetText("MapView.menu.FORMATION"));
+        formation_menu = new Menu(ContentBundle::GetInstance()->GetText("MapView.menu.FORMATION"));
         for (int i = 0; i < Instruction::NUM_FORMATIONS; i++) {
             formation_menu->AddItem(ContentBundle::GetInstance()->GetText(Text("MapView.item.") + Instruction::FormationName(i)), MAP_FORMATION + i);
         }
 
-        speed_menu = new(__FILE__,__LINE__) Menu(ContentBundle::GetInstance()->GetText("MapView.menu.SPEED"));
+        speed_menu = new Menu(ContentBundle::GetInstance()->GetText("MapView.menu.SPEED"));
         speed_menu->AddItem("250",  MAP_SPEED + 0);
         speed_menu->AddItem("500",  MAP_SPEED + 1);
         speed_menu->AddItem("750",  MAP_SPEED + 2);
         speed_menu->AddItem("1000", MAP_SPEED + 3);
 
-        hold_menu = new(__FILE__,__LINE__) Menu(ContentBundle::GetInstance()->GetText("MapView.menu.HOLD"));
+        hold_menu = new Menu(ContentBundle::GetInstance()->GetText("MapView.menu.HOLD"));
         hold_menu->AddItem(ContentBundle::GetInstance()->GetText("MapView.item.None"),       MAP_HOLD + 0);
         hold_menu->AddItem(ContentBundle::GetInstance()->GetText("MapView.item.1-Minute"),   MAP_HOLD + 1);
         hold_menu->AddItem(ContentBundle::GetInstance()->GetText("MapView.item.5-Minutes"),  MAP_HOLD + 2);
         hold_menu->AddItem(ContentBundle::GetInstance()->GetText("MapView.item.10-Minutes"), MAP_HOLD + 3);
         hold_menu->AddItem(ContentBundle::GetInstance()->GetText("MapView.item.15-Minutes"), MAP_HOLD + 4);
 
-        farcast_menu = new(__FILE__,__LINE__) Menu(ContentBundle::GetInstance()->GetText("MapView.menu.FARCAST"));
+        farcast_menu = new Menu(ContentBundle::GetInstance()->GetText("MapView.menu.FARCAST"));
         farcast_menu->AddItem(ContentBundle::GetInstance()->GetText("MapView.item.Use-Quantum"),  MAP_FARCAST + 0);
         farcast_menu->AddItem(ContentBundle::GetInstance()->GetText("MapView.item.Use-Farcast"),  MAP_FARCAST + 1);
 
-        objective_menu = new(__FILE__,__LINE__) Menu(ContentBundle::GetInstance()->GetText("MapView.menu.OBJECTIVE"));
+        objective_menu = new Menu(ContentBundle::GetInstance()->GetText("MapView.menu.OBJECTIVE"));
 
-        nav_menu = new(__FILE__,__LINE__) Menu(ContentBundle::GetInstance()->GetText("MapView.menu.NAVPT"));
+        nav_menu = new Menu(ContentBundle::GetInstance()->GetText("MapView.menu.NAVPT"));
         nav_menu->AddMenu(ContentBundle::GetInstance()->GetText("MapView.item.Action"),    action_menu);
         nav_menu->AddMenu(ContentBundle::GetInstance()->GetText("MapView.item.Objective"), objective_menu);
         nav_menu->AddMenu(ContentBundle::GetInstance()->GetText("MapView.item.Formation"), formation_menu);
@@ -489,10 +488,10 @@ MapView::ProcessMenuItem(int action)
                 if (rgn->IsAirSpace())
                 init_pt.z = 10e3;
 
-                n = new(__FILE__,__LINE__) Instruction(rgn, init_pt);
+                n = new Instruction(rgn, init_pt);
             }
             else {
-                n = new(__FILE__,__LINE__) Instruction(rgn_name, init_pt);
+                n = new Instruction(rgn_name, init_pt);
             }
 
             n->SetSpeed(500);
@@ -513,7 +512,7 @@ MapView::ProcessMenuItem(int action)
             if (regions[current_region]->Type() == Orbital::TERRAIN)
             init_pt.z = 10e3;
 
-            n = new(__FILE__,__LINE__) Instruction(rgn_name, init_pt);
+            n = new Instruction(rgn_name, init_pt);
             n->SetSpeed(500);
 
             if (prior) {
@@ -794,7 +793,7 @@ List<Text>& result)
             if (!editor && !friendly && (elem->GetIFF() == 0 || elem->GetIFF() == mission->Team()))
             continue;
 
-            result.append(new(__FILE__,__LINE__) Text(elem->Name()));
+            result.append(new Text(elem->Name()));
         }
     }
 
@@ -818,7 +817,7 @@ List<Text>& result)
                     if (!friendly && (s->GetIFF() == 0 || s->GetIFF() == ship->GetIFF()))
                     continue;
 
-                    result.append(new(__FILE__,__LINE__) Text(s->Name()));
+                    result.append(new Text(s->Name()));
                 }
             }
         }