From a12e588079700d55a0b788fea2df7727c2e41f52 Mon Sep 17 00:00:00 2001
From: Aki <please@ignore.pl>
Date: Sun, 27 Mar 2022 17:42:26 +0200
Subject: Removed MemDebug from FoundationEx

---
 Stars45/RadioHandler.cpp | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

(limited to 'Stars45/RadioHandler.cpp')

diff --git a/Stars45/RadioHandler.cpp b/Stars45/RadioHandler.cpp
index 00dadce..b395c6e 100644
--- a/Stars45/RadioHandler.cpp
+++ b/Stars45/RadioHandler.cpp
@@ -11,7 +11,6 @@
     Radio message handler class implementation
 */
 
-#include "MemDebug.h"
 #include "RadioHandler.h"
 #include "RadioMessage.h"
 #include "RadioTraffic.h"
@@ -57,7 +56,7 @@ RadioHandler::ProcessMessage(RadioMessage* msg, Ship* s)
 
     if (msg->Sender()->IsRogue()) {
         Ship* sender = (Ship*) msg->Sender();  // cast-away const
-        RadioMessage* nak = new(__FILE__,__LINE__) RadioMessage(sender, s, RadioMessage::NACK);
+        RadioMessage* nak = new RadioMessage(sender, s, RadioMessage::NACK);
         RadioTraffic::Transmit(nak);
         return false;
     }
@@ -392,7 +391,7 @@ RadioHandler::Inbound(RadioMessage* msg, Ship* ship)
 
     // if no space (or not a carrier!) wave sender off:
     if (!deck || !same_rgn || squadron < 0 || slot < 0) {
-        RadioMessage* wave_off = new(__FILE__,__LINE__) RadioMessage(inbound, ship, RadioMessage::NACK);
+        RadioMessage* wave_off = new RadioMessage(inbound, ship, RadioMessage::NACK);
         if (!hangar)
         wave_off->SetInfo(ContentBundle::GetInstance()->GetText("RadioHandler.no-hangar"));
 
@@ -414,7 +413,7 @@ RadioHandler::Inbound(RadioMessage* msg, Ship* ship)
     int          sequence     = 0;
 
     if (!inbound_slot) {
-        inbound_slot = new(__FILE__,__LINE__) InboundSlot(inbound, deck, squadron, slot);
+        inbound_slot = new InboundSlot(inbound, deck, squadron, slot);
         sequence = deck->Inbound(inbound_slot);
     }
     else {
@@ -422,7 +421,7 @@ RadioHandler::Inbound(RadioMessage* msg, Ship* ship)
     }
 
     // inform sender of status:
-    RadioMessage* approach = new(__FILE__,__LINE__) RadioMessage(inbound, ship, RadioMessage::CALL_APPROACH);
+    RadioMessage* approach = new RadioMessage(inbound, ship, RadioMessage::CALL_APPROACH);
 
     if (inbound_slot->Cleared()) {
         char info[256];
@@ -468,7 +467,7 @@ RadioHandler::Picture(RadioMessage* msg, Ship* ship)
     if (tgt) {
         Element*       sender   = msg->Sender()->GetElement();
         Element*       tgt_elem = tgt->GetElement();
-        RadioMessage*  response = new(__FILE__,__LINE__) RadioMessage(sender, ship, RadioMessage::ATTACK);
+        RadioMessage*  response = new RadioMessage(sender, ship, RadioMessage::ATTACK);
 
         if (tgt_elem) {
             for (int i = 1; i <= tgt_elem->NumShips(); i++)
@@ -484,7 +483,7 @@ RadioHandler::Picture(RadioMessage* msg, Ship* ship)
     // nobody worth killin':
     else {
         Ship* sender = (Ship*) msg->Sender();  // cast-away const
-        RadioMessage* response = new(__FILE__,__LINE__) RadioMessage(sender, ship, RadioMessage::PICTURE);
+        RadioMessage* response = new RadioMessage(sender, ship, RadioMessage::PICTURE);
         RadioTraffic::Transmit(response);
     }
 
@@ -518,13 +517,13 @@ RadioHandler::Support(RadioMessage* msg, Ship* ship)
 
     // found some:
     if (help) {
-        RadioMessage* escort = new(__FILE__,__LINE__) RadioMessage(help, ship, RadioMessage::ESCORT);
+        RadioMessage* escort = new RadioMessage(help, ship, RadioMessage::ESCORT);
         escort->TargetList().append(msg->Sender());
         RadioTraffic::Transmit(escort);
 
         Text           ok       = ContentBundle::GetInstance()->GetText("RadioHandler.help-enroute");
         Ship*          sender   = (Ship*) msg->Sender();  // cast-away const
-        RadioMessage*  response = new(__FILE__,__LINE__) RadioMessage(sender, ship, RadioMessage::ACK);
+        RadioMessage*  response = new RadioMessage(sender, ship, RadioMessage::ACK);
         response->SetInfo(ok);
         RadioTraffic::Transmit(response);
     }
@@ -533,7 +532,7 @@ RadioHandler::Support(RadioMessage* msg, Ship* ship)
     else {
         Text           nope     = ContentBundle::GetInstance()->GetText("RadioHandler.no-help-for-you");
         Ship*          sender   = (Ship*) msg->Sender();  // cast-away const
-        RadioMessage*  response = new(__FILE__,__LINE__) RadioMessage(sender, ship, RadioMessage::NACK);
+        RadioMessage*  response = new RadioMessage(sender, ship, RadioMessage::NACK);
         response->SetInfo(nope);
         RadioTraffic::Transmit(response);
     }
@@ -551,7 +550,7 @@ RadioHandler::AcknowledgeMessage(RadioMessage* msg, Ship* s)
         return;  // nothing to say here
 
         Ship* sender = (Ship*) msg->Sender();  // cast-away const
-        RadioMessage* ack = new(__FILE__,__LINE__) RadioMessage(sender, s, RadioMessage::ACK);
+        RadioMessage* ack = new RadioMessage(sender, s, RadioMessage::ACK);
         RadioTraffic::Transmit(ack);
     }
 }
-- 
cgit v1.1