summaryrefslogtreecommitdiffhomepage
path: root/Stars45/TacticalView.cpp
diff options
context:
space:
mode:
authorAki <please@ignore.pl>2022-03-27 17:42:26 +0200
committerAki <please@ignore.pl>2022-03-27 17:42:26 +0200
commita12e588079700d55a0b788fea2df7727c2e41f52 (patch)
tree690072569624c73af5043b3619acaab4d298b1fa /Stars45/TacticalView.cpp
parent72bb517271dad40a440533ad0796a88247011199 (diff)
downloadstarshatter-a12e588079700d55a0b788fea2df7727c2e41f52.zip
starshatter-a12e588079700d55a0b788fea2df7727c2e41f52.tar.gz
starshatter-a12e588079700d55a0b788fea2df7727c2e41f52.tar.bz2
Removed MemDebug from FoundationEx
Diffstat (limited to 'Stars45/TacticalView.cpp')
-rw-r--r--Stars45/TacticalView.cpp33
1 files changed, 16 insertions, 17 deletions
diff --git a/Stars45/TacticalView.cpp b/Stars45/TacticalView.cpp
index 0f59619..a631fad 100644
--- a/Stars45/TacticalView.cpp
+++ b/Stars45/TacticalView.cpp
@@ -11,7 +11,6 @@
View class for Tactical Data Readout HUD Overlay
*/
-#include "MemDebug.h"
#include "TacticalView.h"
#include "QuantumView.h"
#include "RadioView.h"
@@ -80,7 +79,7 @@ msg_ship(0), base_alt(0), move_alt(0)
mouse_action.x = 0;
mouse_action.y = 0;
- menu_view = new(__FILE__,__LINE__) MenuView(window);
+ menu_view = new MenuView(window);
}
TacticalView::~TacticalView()
@@ -918,39 +917,39 @@ TacticalView::Initialize()
static int initialized = 0;
if (initialized) return;
- view_menu = new(__FILE__,__LINE__) Menu(ContentBundle::GetInstance()->GetText("TacView.menu.view"));
+ view_menu = new Menu(ContentBundle::GetInstance()->GetText("TacView.menu.view"));
view_menu->AddItem(ContentBundle::GetInstance()->GetText("TacView.item.forward"), VIEW_FORWARD);
view_menu->AddItem(ContentBundle::GetInstance()->GetText("TacView.item.chase"), VIEW_CHASE);
view_menu->AddItem(ContentBundle::GetInstance()->GetText("TacView.item.orbit"), VIEW_ORBIT);
view_menu->AddItem(ContentBundle::GetInstance()->GetText("TacView.item.padlock"), VIEW_PADLOCK);
- emcon_menu = new(__FILE__,__LINE__) Menu(ContentBundle::GetInstance()->GetText("TacView.menu.emcon"));
+ emcon_menu = new Menu(ContentBundle::GetInstance()->GetText("TacView.menu.emcon"));
- quantum_menu = new(__FILE__,__LINE__) Menu(ContentBundle::GetInstance()->GetText("TacView.menu.quantum"));
- farcast_menu = new(__FILE__,__LINE__) Menu(ContentBundle::GetInstance()->GetText("TacView.menu.farcast"));
+ quantum_menu = new Menu(ContentBundle::GetInstance()->GetText("TacView.menu.quantum"));
+ farcast_menu = new Menu(ContentBundle::GetInstance()->GetText("TacView.menu.farcast"));
- main_menu = new(__FILE__,__LINE__) Menu(ContentBundle::GetInstance()->GetText("TacView.menu.main"));
+ main_menu = new Menu(ContentBundle::GetInstance()->GetText("TacView.menu.main"));
- action_menu = new(__FILE__,__LINE__) Menu(ContentBundle::GetInstance()->GetText("TacView.menu.action"));
+ action_menu = new Menu(ContentBundle::GetInstance()->GetText("TacView.menu.action"));
action_menu->AddItem(ContentBundle::GetInstance()->GetText("TacView.item.engage"), RadioMessage::ATTACK);
action_menu->AddItem(ContentBundle::GetInstance()->GetText("TacView.item.bracket"), RadioMessage::BRACKET);
action_menu->AddItem(ContentBundle::GetInstance()->GetText("TacView.item.escort"), RadioMessage::ESCORT);
action_menu->AddItem(ContentBundle::GetInstance()->GetText("TacView.item.identify"), RadioMessage::IDENTIFY);
action_menu->AddItem(ContentBundle::GetInstance()->GetText("TacView.item.hold"), RadioMessage::WEP_HOLD);
- formation_menu = new(__FILE__,__LINE__) Menu(ContentBundle::GetInstance()->GetText("TacView.menu.formation"));
+ formation_menu = new Menu(ContentBundle::GetInstance()->GetText("TacView.menu.formation"));
formation_menu->AddItem(ContentBundle::GetInstance()->GetText("TacView.item.diamond"), RadioMessage::GO_DIAMOND);
formation_menu->AddItem(ContentBundle::GetInstance()->GetText("TacView.item.spread"), RadioMessage::GO_SPREAD);
formation_menu->AddItem(ContentBundle::GetInstance()->GetText("TacView.item.box"), RadioMessage::GO_BOX);
formation_menu->AddItem(ContentBundle::GetInstance()->GetText("TacView.item.trail"), RadioMessage::GO_TRAIL);
- sensors_menu = new(__FILE__,__LINE__) Menu(ContentBundle::GetInstance()->GetText("TacView.menu.emcon"));
+ sensors_menu = new Menu(ContentBundle::GetInstance()->GetText("TacView.menu.emcon"));
sensors_menu->AddItem(ContentBundle::GetInstance()->GetText("TacView.item.emcon-1"), RadioMessage::GO_EMCON1);
sensors_menu->AddItem(ContentBundle::GetInstance()->GetText("TacView.item.emcon-2"), RadioMessage::GO_EMCON2);
sensors_menu->AddItem(ContentBundle::GetInstance()->GetText("TacView.item.emcon-3"), RadioMessage::GO_EMCON3);
sensors_menu->AddItem(ContentBundle::GetInstance()->GetText("TacView.item.probe"), RadioMessage::LAUNCH_PROBE);
- fighter_menu = new(__FILE__,__LINE__) Menu(ContentBundle::GetInstance()->GetText("TacView.menu.context"));
+ fighter_menu = new Menu(ContentBundle::GetInstance()->GetText("TacView.menu.context"));
fighter_menu->AddMenu(ContentBundle::GetInstance()->GetText("TacView.item.action"), action_menu);
fighter_menu->AddMenu(ContentBundle::GetInstance()->GetText("TacView.item.formation"), formation_menu);
fighter_menu->AddMenu(ContentBundle::GetInstance()->GetText("TacView.item.sensors"), sensors_menu);
@@ -961,7 +960,7 @@ TacticalView::Initialize()
fighter_menu->AddItem(ContentBundle::GetInstance()->GetText("TacView.item.dock"), RadioMessage::DOCK_WITH);
fighter_menu->AddMenu(ContentBundle::GetInstance()->GetText("TacView.item.farcast"), farcast_menu);
- starship_menu = new(__FILE__,__LINE__) Menu(ContentBundle::GetInstance()->GetText("TacView.menu.context"));
+ starship_menu = new Menu(ContentBundle::GetInstance()->GetText("TacView.menu.context"));
starship_menu->AddMenu(ContentBundle::GetInstance()->GetText("TacView.item.action"), action_menu);
starship_menu->AddMenu(ContentBundle::GetInstance()->GetText("TacView.item.sensors"), sensors_menu);
starship_menu->AddItem(ContentBundle::GetInstance()->GetText("TacView.item.patrol"), RadioMessage::MOVE_PATROL);
@@ -1025,7 +1024,7 @@ TacticalView::ProcessMenuItem(int action)
case RadioMessage::LAUNCH_PROBE:
if (msg_ship) {
Element* elem = msg_ship->GetElement();
- RadioMessage* msg = new(__FILE__,__LINE__) RadioMessage(elem, ship, action);
+ RadioMessage* msg = new RadioMessage(elem, ship, action);
if (msg)
RadioTraffic::Transmit(msg);
}
@@ -1078,7 +1077,7 @@ TacticalView::ProcessMenuItem(int action)
else {
Element* elem = msg_ship->GetElement();
- RadioMessage* msg = new(__FILE__,__LINE__) RadioMessage(elem, ship, RadioMessage::QUANTUM_TO);
+ RadioMessage* msg = new RadioMessage(elem, ship, RadioMessage::QUANTUM_TO);
if (msg) {
msg->SetInfo(rgn_name);
RadioTraffic::Transmit(msg);
@@ -1097,7 +1096,7 @@ TacticalView::ProcessMenuItem(int action)
if (rgn) {
Element* elem = msg_ship->GetElement();
- RadioMessage* msg = new(__FILE__,__LINE__) RadioMessage(elem, ship, RadioMessage::FARCAST_TO);
+ RadioMessage* msg = new RadioMessage(elem, ship, RadioMessage::FARCAST_TO);
if (msg) {
msg->SetInfo(rgn_name);
RadioTraffic::Transmit(msg);
@@ -1360,7 +1359,7 @@ TacticalView::SendMove()
if (GetMouseLoc3D()) {
Element* elem = msg_ship->GetElement();
- RadioMessage* msg = new(__FILE__,__LINE__) RadioMessage(elem, ship, RadioMessage::MOVE_PATROL);
+ RadioMessage* msg = new RadioMessage(elem, ship, RadioMessage::MOVE_PATROL);
Point dest = move_loc;
dest.y += move_alt;
msg->SetLocation(dest);
@@ -1468,7 +1467,7 @@ TacticalView::SendAction()
if (tgt) {
Element* elem = msg_ship->GetElement();
- RadioMessage* msg = new(__FILE__,__LINE__) RadioMessage(elem, ship, show_action);
+ RadioMessage* msg = new RadioMessage(elem, ship, show_action);
/***
Element* tgt_elem = tgt->GetElement();