summaryrefslogtreecommitdiffhomepage
path: root/Stars45/RadioView.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'Stars45/RadioView.cpp')
-rw-r--r--Stars45/RadioView.cpp29
1 files changed, 14 insertions, 15 deletions
diff --git a/Stars45/RadioView.cpp b/Stars45/RadioView.cpp
index 43d4fff..ca30092 100644
--- a/Stars45/RadioView.cpp
+++ b/Stars45/RadioView.cpp
@@ -11,7 +11,6 @@
View class for Radio Communications HUD Overlay
*/
-#include "MemDebug.h"
#include "RadioView.h"
#include "RadioMessage.h"
#include "RadioTraffic.h"
@@ -68,59 +67,59 @@ RadioView::Initialize()
static int initialized = 0;
if (initialized) return;
- target_menu = new(__FILE__,__LINE__) Menu(ContentBundle::GetInstance()->GetText("RadioView.menu.TARGET"));
+ target_menu = new Menu(ContentBundle::GetInstance()->GetText("RadioView.menu.TARGET"));
target_menu->AddItem(ContentBundle::GetInstance()->GetText("RadioView.item.attack"), RadioMessage::ATTACK);
target_menu->AddItem(ContentBundle::GetInstance()->GetText("RadioView.item.bracket"), RadioMessage::BRACKET);
target_menu->AddItem(ContentBundle::GetInstance()->GetText("RadioView.item.escort"), RadioMessage::ESCORT);
- combat_menu = new(__FILE__,__LINE__) Menu(ContentBundle::GetInstance()->GetText("RadioView.menu.COMBAT"));
+ combat_menu = new Menu(ContentBundle::GetInstance()->GetText("RadioView.menu.COMBAT"));
combat_menu->AddItem(ContentBundle::GetInstance()->GetText("RadioView.item.cover"), RadioMessage::COVER_ME);
combat_menu->AddItem(ContentBundle::GetInstance()->GetText("RadioView.item.break-attack"), RadioMessage::WEP_FREE);
combat_menu->AddItem(ContentBundle::GetInstance()->GetText("RadioView.item.form-up"), RadioMessage::FORM_UP);
- formation_menu = new(__FILE__,__LINE__) Menu(ContentBundle::GetInstance()->GetText("RadioView.menu.FORMATION"));
+ formation_menu = new Menu(ContentBundle::GetInstance()->GetText("RadioView.menu.FORMATION"));
formation_menu->AddItem(ContentBundle::GetInstance()->GetText("RadioView.item.diamond"), RadioMessage::GO_DIAMOND);
formation_menu->AddItem(ContentBundle::GetInstance()->GetText("RadioView.item.spread"), RadioMessage::GO_SPREAD);
formation_menu->AddItem(ContentBundle::GetInstance()->GetText("RadioView.item.box"), RadioMessage::GO_BOX);
formation_menu->AddItem(ContentBundle::GetInstance()->GetText("RadioView.item.trail"), RadioMessage::GO_TRAIL);
- sensors_menu = new(__FILE__,__LINE__) Menu(ContentBundle::GetInstance()->GetText("RadioView.menu.SENSORS"));
+ sensors_menu = new Menu(ContentBundle::GetInstance()->GetText("RadioView.menu.SENSORS"));
sensors_menu->AddItem(ContentBundle::GetInstance()->GetText("RadioView.item.emcon-1"), RadioMessage::GO_EMCON1);
sensors_menu->AddItem(ContentBundle::GetInstance()->GetText("RadioView.item.emcon-2"), RadioMessage::GO_EMCON2);
sensors_menu->AddItem(ContentBundle::GetInstance()->GetText("RadioView.item.emcon-3"), RadioMessage::GO_EMCON3);
sensors_menu->AddItem(ContentBundle::GetInstance()->GetText("RadioView.item.probe"), RadioMessage::LAUNCH_PROBE);
- mission_menu = new(__FILE__,__LINE__) Menu(ContentBundle::GetInstance()->GetText("RadioView.menu.MISSION"));
+ mission_menu = new Menu(ContentBundle::GetInstance()->GetText("RadioView.menu.MISSION"));
mission_menu->AddItem(ContentBundle::GetInstance()->GetText("RadioView.item.skip-navpt"), RadioMessage::SKIP_NAVPOINT);
mission_menu->AddItem(ContentBundle::GetInstance()->GetText("RadioView.item.resume"), RadioMessage::RESUME_MISSION);
mission_menu->AddItem(ContentBundle::GetInstance()->GetText("RadioView.item.rtb"), RadioMessage::RTB);
- wing_menu = new(__FILE__,__LINE__) Menu(ContentBundle::GetInstance()->GetText("RadioView.menu.WINGMAN"));
+ wing_menu = new Menu(ContentBundle::GetInstance()->GetText("RadioView.menu.WINGMAN"));
wing_menu->AddMenu(ContentBundle::GetInstance()->GetText("RadioView.item.target"), target_menu);
wing_menu->AddMenu(ContentBundle::GetInstance()->GetText("RadioView.item.combat"), combat_menu);
wing_menu->AddMenu(ContentBundle::GetInstance()->GetText("RadioView.item.formation"), formation_menu);
wing_menu->AddMenu(ContentBundle::GetInstance()->GetText("RadioView.item.mission"), mission_menu);
wing_menu->AddMenu(ContentBundle::GetInstance()->GetText("RadioView.item.sensors"), sensors_menu);
- elem_menu = new(__FILE__,__LINE__) Menu(ContentBundle::GetInstance()->GetText("RadioView.menu.ELEMENT"));
+ elem_menu = new Menu(ContentBundle::GetInstance()->GetText("RadioView.menu.ELEMENT"));
elem_menu->AddMenu(ContentBundle::GetInstance()->GetText("RadioView.item.target"), target_menu);
elem_menu->AddMenu(ContentBundle::GetInstance()->GetText("RadioView.item.combat"), combat_menu);
elem_menu->AddMenu(ContentBundle::GetInstance()->GetText("RadioView.item.formation"), formation_menu);
elem_menu->AddMenu(ContentBundle::GetInstance()->GetText("RadioView.item.mission"), mission_menu);
elem_menu->AddMenu(ContentBundle::GetInstance()->GetText("RadioView.item.sensors"), sensors_menu);
- control_menu = new(__FILE__,__LINE__) Menu(ContentBundle::GetInstance()->GetText("RadioView.menu.CONTROL"));
+ control_menu = new Menu(ContentBundle::GetInstance()->GetText("RadioView.menu.CONTROL"));
control_menu->AddItem(ContentBundle::GetInstance()->GetText("RadioView.item.picture"), RadioMessage::REQUEST_PICTURE);
control_menu->AddItem(ContentBundle::GetInstance()->GetText("RadioView.item.backup"), RadioMessage::REQUEST_SUPPORT);
control_menu->AddItem(ContentBundle::GetInstance()->GetText("RadioView.item.call-inbound"), RadioMessage::CALL_INBOUND);
control_menu->AddItem(ContentBundle::GetInstance()->GetText("RadioView.item.call-finals"), RadioMessage::CALL_FINALS);
- fighter_menu = new(__FILE__,__LINE__) Menu(ContentBundle::GetInstance()->GetText("RadioView.menu.RADIO"));
+ fighter_menu = new Menu(ContentBundle::GetInstance()->GetText("RadioView.menu.RADIO"));
fighter_menu->AddMenu(ContentBundle::GetInstance()->GetText("RadioView.item.wingman"), wing_menu);
fighter_menu->AddMenu(ContentBundle::GetInstance()->GetText("RadioView.item.element"), elem_menu);
fighter_menu->AddMenu(ContentBundle::GetInstance()->GetText("RadioView.item.control"), control_menu);
- starship_menu = new(__FILE__,__LINE__) Menu(ContentBundle::GetInstance()->GetText("RadioView.menu.RADIO"));
+ starship_menu = new Menu(ContentBundle::GetInstance()->GetText("RadioView.menu.RADIO"));
initialized = 1;
}
@@ -361,7 +360,7 @@ RadioView::SendRadioMessage(Ship* ship, MenuItem* item)
// check destination:
if (dst_elem) {
- RadioMessage* msg = new(__FILE__,__LINE__) RadioMessage(dst_elem, ship, item->GetData());
+ RadioMessage* msg = new RadioMessage(dst_elem, ship, item->GetData());
if (TargetRequired(item))
msg->AddTarget(ship->GetTarget());
@@ -384,7 +383,7 @@ RadioView::SendRadioMessage(Ship* ship, MenuItem* item)
if (wing) {
Ship* dst = elem->GetShip(wing);
if (dst) {
- RadioMessage* msg = new(__FILE__,__LINE__) RadioMessage(dst, ship, item->GetData());
+ RadioMessage* msg = new RadioMessage(dst, ship, item->GetData());
if (TargetRequired(item))
msg->AddTarget(ship->GetTarget());
@@ -395,7 +394,7 @@ RadioView::SendRadioMessage(Ship* ship, MenuItem* item)
}
else if (history.Find(ContentBundle::GetInstance()->GetText("RadioView.menu.ELEMENT"))) { // element menu
- RadioMessage* msg = new(__FILE__,__LINE__) RadioMessage(elem, ship, item->GetData());
+ RadioMessage* msg = new RadioMessage(elem, ship, item->GetData());
if (TargetRequired(item))
msg->AddTarget(ship->GetTarget());
@@ -408,7 +407,7 @@ RadioView::SendRadioMessage(Ship* ship, MenuItem* item)
Ship* controller = ship->GetController();
if (controller) {
- msg = new(__FILE__,__LINE__) RadioMessage(controller, ship, item->GetData());
+ msg = new RadioMessage(controller, ship, item->GetData());
RadioTraffic::Transmit(msg);
}
}
generated by cgit v1.1 at 2024-06-30 12:28:16 +0000