summaryrefslogtreecommitdiffhomepage
path: root/Stars45/RadioTraffic.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'Stars45/RadioTraffic.cpp')
-rw-r--r--Stars45/RadioTraffic.cpp11
1 files changed, 5 insertions, 6 deletions
diff --git a/Stars45/RadioTraffic.cpp b/Stars45/RadioTraffic.cpp
index 782885c..a67cd9f 100644
--- a/Stars45/RadioTraffic.cpp
+++ b/Stars45/RadioTraffic.cpp
@@ -11,7 +11,6 @@
Radio message handler class implementation
*/
-#include "MemDebug.h"
#include "RadioTraffic.h"
#include "RadioMessage.h"
#include "RadioView.h"
@@ -50,7 +49,7 @@ void
RadioTraffic::Initialize()
{
if (!radio_traffic)
- radio_traffic = new(__FILE__,__LINE__) RadioTraffic;
+ radio_traffic = new RadioTraffic;
}
void
@@ -74,16 +73,16 @@ RadioTraffic::SendQuickMessage(Ship* ship, int action)
Ship* controller = ship->GetController();
if (controller && !ship->IsStarship()) {
- RadioMessage* msg = new(__FILE__,__LINE__) RadioMessage(controller, ship, action);
+ RadioMessage* msg = new RadioMessage(controller, ship, action);
Transmit(msg);
}
}
else if (action >= RadioMessage::SPLASH_1 && action <= RadioMessage::DISTRESS) {
- RadioMessage* msg = new(__FILE__,__LINE__) RadioMessage((Element*) 0, ship, action);
+ RadioMessage* msg = new RadioMessage((Element*) 0, ship, action);
Transmit(msg);
}
else {
- RadioMessage* msg = new(__FILE__,__LINE__) RadioMessage(elem, ship, action);
+ RadioMessage* msg = new RadioMessage(elem, ship, action);
if (action == RadioMessage::ATTACK || action == RadioMessage::ESCORT)
msg->AddTarget(ship->GetTarget());
@@ -369,7 +368,7 @@ RadioTraffic::DisplayMessage(RadioMessage* msg)
// vox:
const char* path[8] = { "1", "1", "2", "3", "4", "5", "6", "7" };
- RadioVox* vox = new(__FILE__,__LINE__) RadioVox(vox_channel, path[vox_channel], txt_buf);
+ RadioVox* vox = new RadioVox(vox_channel, path[vox_channel], txt_buf);
if (vox) {
vox->AddPhrase(dst_buf);