1 files changed, 9 insertions, 10 deletions

diff --git a/Stars45/NetLobbyServer.cpp b/Stars45/NetLobbyServer.cpp
index 0520f96..b3060c5 100644
--- a/Stars45/NetLobbyServer.cpp
+++ b/Stars45/NetLobbyServer.cpp
@@ -11,7 +11,6 @@
     NetLink Engine for Multiplayer Lobby
 */
 
-#include "MemDebug.h"
 #include "NetLobbyServer.h"
 #include "NetServerConfig.h"
 #include "NetClientConfig.h"
@@ -71,7 +70,7 @@ NetLobbyServer::NetLobbyServer()
         NetAuth::SetAuthLevel(server_config->GetAuthLevel());
 
         server_addr = NetAddr(hostname.data(), server_port);
-        link = new(__FILE__,__LINE__) NetLink(server_addr);
+        link = new NetLink(server_addr);
     }
 
     LoadMOTD();
@@ -81,7 +80,7 @@ NetLobbyServer::NetLobbyServer()
 
     // only one mission:
     if (star_server && server_mission.length() > 0) {
-        NetCampaignInfo* c = new(__FILE__,__LINE__) NetCampaignInfo;
+        NetCampaignInfo* c = new NetCampaignInfo;
         c->id   = Campaign::MULTIPLAYER_MISSIONS;
         c->name = "Persistent Multiplayer";
         campaigns.append(c);
@@ -119,7 +118,7 @@ NetLobbyServer::NetLobbyServer()
             Campaign* campaign = c_iter.value();
 
             if (campaign->GetCampaignId() >= Campaign::MULTIPLAYER_MISSIONS) {
-                NetCampaignInfo* c = new(__FILE__,__LINE__) NetCampaignInfo;
+                NetCampaignInfo* c = new NetCampaignInfo;
                 c->id   = campaign->GetCampaignId();
                 c->name = campaign->Name();
                 campaigns.append(c);
@@ -187,7 +186,7 @@ NetLobbyServer::LoadMOTD()
             while (n >= 0 && isspace(line[n]))
             line[n--] = 0;
 
-            motd.append(new(__FILE__,__LINE__) Text(line));
+            motd.append(new Text(line));
         }
     }
 }
@@ -280,7 +279,7 @@ NetLobbyServer::ExecFrame()
         NetCampaignInfo* c = campaigns.last();
 
         if (!c || c->name != "Persistent Multiplayer") {
-            c = new(__FILE__,__LINE__) NetCampaignInfo;
+            c = new NetCampaignInfo;
             c->id   = Campaign::MULTIPLAYER_MISSIONS;
             c->name = "Persistent Multiplayer";
             campaigns.append(c);
@@ -523,7 +522,7 @@ NetLobbyServer::AddChat(NetUser* user, const char* msg, bool route)
         }
 
         if (msg_ok) {
-            entry = new(__FILE__,__LINE__) NetChatEntry(user, msg);
+            entry = new NetChatEntry(user, msg);
 
             chat_log.append(entry);
 
@@ -629,7 +628,7 @@ NetLobbyServer::GetUnitMap()
         if (elem->IsPlayable()) {
             NetUnitEntry* u = 0;
             if (elem->Count() == 1) {
-                u = new(__FILE__,__LINE__) NetUnitEntry(elem, 0);
+                u = new NetUnitEntry(elem, 0);
                 u->SetLives(elem->RespawnCount() + 1);
                 u->SetMissionRole(elem->MissionRole());
                 u->SetIFF(elem->GetIFF());
@@ -645,7 +644,7 @@ NetLobbyServer::GetUnitMap()
             }
             else {
                 for (int i = 0; i < elem->Count(); i++) {
-                    u = new(__FILE__,__LINE__) NetUnitEntry(elem, i+1);
+                    u = new NetUnitEntry(elem, i+1);
                     u->SetMissionRole(elem->MissionRole());
                     u->SetIFF(elem->GetIFF());
 
@@ -982,7 +981,7 @@ NetLobbyServer::DoLogin(NetPeer* peer, Text msg)
 
     // otherwise, create a new user:
     else {
-        NetUser* user = new(__FILE__,__LINE__) NetUser(name);
+        NetUser* user = new NetUser(name);
         user->SetAddress(peer->Address());
         user->SetNetID(peer->NetID());
         user->SetPass(pass);