From 0052edae47d1e6ae613497c524719eff5838f52a Mon Sep 17 00:00:00 2001 From: Aki Date: Fri, 18 Feb 2022 23:54:30 +0100 Subject: Switched to use GetIntance for Game instead of static methods --- Stars45/RadioView.cpp | 118 +++++++++++++++++++++++++------------------------- 1 file changed, 59 insertions(+), 59 deletions(-) (limited to 'Stars45/RadioView.cpp') diff --git a/Stars45/RadioView.cpp b/Stars45/RadioView.cpp index d1c2514..9452e34 100644 --- a/Stars45/RadioView.cpp +++ b/Stars45/RadioView.cpp @@ -67,59 +67,59 @@ RadioView::Initialize() static int initialized = 0; if (initialized) return; - target_menu = new(__FILE__,__LINE__) Menu(Game::GetText("RadioView.menu.TARGET")); - target_menu->AddItem(Game::GetText("RadioView.item.attack"), RadioMessage::ATTACK); - target_menu->AddItem(Game::GetText("RadioView.item.bracket"), RadioMessage::BRACKET); - target_menu->AddItem(Game::GetText("RadioView.item.escort"), RadioMessage::ESCORT); - - combat_menu = new(__FILE__,__LINE__) Menu(Game::GetText("RadioView.menu.COMBAT")); - combat_menu->AddItem(Game::GetText("RadioView.item.cover"), RadioMessage::COVER_ME); - combat_menu->AddItem(Game::GetText("RadioView.item.break-attack"), RadioMessage::WEP_FREE); - combat_menu->AddItem(Game::GetText("RadioView.item.form-up"), RadioMessage::FORM_UP); - - formation_menu = new(__FILE__,__LINE__) Menu(Game::GetText("RadioView.menu.FORMATION")); - formation_menu->AddItem(Game::GetText("RadioView.item.diamond"), RadioMessage::GO_DIAMOND); - formation_menu->AddItem(Game::GetText("RadioView.item.spread"), RadioMessage::GO_SPREAD); - formation_menu->AddItem(Game::GetText("RadioView.item.box"), RadioMessage::GO_BOX); - formation_menu->AddItem(Game::GetText("RadioView.item.trail"), RadioMessage::GO_TRAIL); - - sensors_menu = new(__FILE__,__LINE__) Menu(Game::GetText("RadioView.menu.SENSORS")); - sensors_menu->AddItem(Game::GetText("RadioView.item.emcon-1"), RadioMessage::GO_EMCON1); - sensors_menu->AddItem(Game::GetText("RadioView.item.emcon-2"), RadioMessage::GO_EMCON2); - sensors_menu->AddItem(Game::GetText("RadioView.item.emcon-3"), RadioMessage::GO_EMCON3); - sensors_menu->AddItem(Game::GetText("RadioView.item.probe"), RadioMessage::LAUNCH_PROBE); - - mission_menu = new(__FILE__,__LINE__) Menu(Game::GetText("RadioView.menu.MISSION")); - mission_menu->AddItem(Game::GetText("RadioView.item.skip-navpt"), RadioMessage::SKIP_NAVPOINT); - mission_menu->AddItem(Game::GetText("RadioView.item.resume"), RadioMessage::RESUME_MISSION); - mission_menu->AddItem(Game::GetText("RadioView.item.rtb"), RadioMessage::RTB); - - wing_menu = new(__FILE__,__LINE__) Menu(Game::GetText("RadioView.menu.WINGMAN")); - wing_menu->AddMenu(Game::GetText("RadioView.item.target"), target_menu); - wing_menu->AddMenu(Game::GetText("RadioView.item.combat"), combat_menu); - wing_menu->AddMenu(Game::GetText("RadioView.item.formation"), formation_menu); - wing_menu->AddMenu(Game::GetText("RadioView.item.mission"), mission_menu); - wing_menu->AddMenu(Game::GetText("RadioView.item.sensors"), sensors_menu); - - elem_menu = new(__FILE__,__LINE__) Menu(Game::GetText("RadioView.menu.ELEMENT")); - elem_menu->AddMenu(Game::GetText("RadioView.item.target"), target_menu); - elem_menu->AddMenu(Game::GetText("RadioView.item.combat"), combat_menu); - elem_menu->AddMenu(Game::GetText("RadioView.item.formation"), formation_menu); - elem_menu->AddMenu(Game::GetText("RadioView.item.mission"), mission_menu); - elem_menu->AddMenu(Game::GetText("RadioView.item.sensors"), sensors_menu); - - control_menu = new(__FILE__,__LINE__) Menu(Game::GetText("RadioView.menu.CONTROL")); - control_menu->AddItem(Game::GetText("RadioView.item.picture"), RadioMessage::REQUEST_PICTURE); - control_menu->AddItem(Game::GetText("RadioView.item.backup"), RadioMessage::REQUEST_SUPPORT); - control_menu->AddItem(Game::GetText("RadioView.item.call-inbound"), RadioMessage::CALL_INBOUND); - control_menu->AddItem(Game::GetText("RadioView.item.call-finals"), RadioMessage::CALL_FINALS); - - fighter_menu = new(__FILE__,__LINE__) Menu(Game::GetText("RadioView.menu.RADIO")); - fighter_menu->AddMenu(Game::GetText("RadioView.item.wingman"), wing_menu); - fighter_menu->AddMenu(Game::GetText("RadioView.item.element"), elem_menu); - fighter_menu->AddMenu(Game::GetText("RadioView.item.control"), control_menu); - - starship_menu = new(__FILE__,__LINE__) Menu(Game::GetText("RadioView.menu.RADIO")); + target_menu = new(__FILE__,__LINE__) Menu(Game::GetInstance()->GetText("RadioView.menu.TARGET")); + target_menu->AddItem(Game::GetInstance()->GetText("RadioView.item.attack"), RadioMessage::ATTACK); + target_menu->AddItem(Game::GetInstance()->GetText("RadioView.item.bracket"), RadioMessage::BRACKET); + target_menu->AddItem(Game::GetInstance()->GetText("RadioView.item.escort"), RadioMessage::ESCORT); + + combat_menu = new(__FILE__,__LINE__) Menu(Game::GetInstance()->GetText("RadioView.menu.COMBAT")); + combat_menu->AddItem(Game::GetInstance()->GetText("RadioView.item.cover"), RadioMessage::COVER_ME); + combat_menu->AddItem(Game::GetInstance()->GetText("RadioView.item.break-attack"), RadioMessage::WEP_FREE); + combat_menu->AddItem(Game::GetInstance()->GetText("RadioView.item.form-up"), RadioMessage::FORM_UP); + + formation_menu = new(__FILE__,__LINE__) Menu(Game::GetInstance()->GetText("RadioView.menu.FORMATION")); + formation_menu->AddItem(Game::GetInstance()->GetText("RadioView.item.diamond"), RadioMessage::GO_DIAMOND); + formation_menu->AddItem(Game::GetInstance()->GetText("RadioView.item.spread"), RadioMessage::GO_SPREAD); + formation_menu->AddItem(Game::GetInstance()->GetText("RadioView.item.box"), RadioMessage::GO_BOX); + formation_menu->AddItem(Game::GetInstance()->GetText("RadioView.item.trail"), RadioMessage::GO_TRAIL); + + sensors_menu = new(__FILE__,__LINE__) Menu(Game::GetInstance()->GetText("RadioView.menu.SENSORS")); + sensors_menu->AddItem(Game::GetInstance()->GetText("RadioView.item.emcon-1"), RadioMessage::GO_EMCON1); + sensors_menu->AddItem(Game::GetInstance()->GetText("RadioView.item.emcon-2"), RadioMessage::GO_EMCON2); + sensors_menu->AddItem(Game::GetInstance()->GetText("RadioView.item.emcon-3"), RadioMessage::GO_EMCON3); + sensors_menu->AddItem(Game::GetInstance()->GetText("RadioView.item.probe"), RadioMessage::LAUNCH_PROBE); + + mission_menu = new(__FILE__,__LINE__) Menu(Game::GetInstance()->GetText("RadioView.menu.MISSION")); + mission_menu->AddItem(Game::GetInstance()->GetText("RadioView.item.skip-navpt"), RadioMessage::SKIP_NAVPOINT); + mission_menu->AddItem(Game::GetInstance()->GetText("RadioView.item.resume"), RadioMessage::RESUME_MISSION); + mission_menu->AddItem(Game::GetInstance()->GetText("RadioView.item.rtb"), RadioMessage::RTB); + + wing_menu = new(__FILE__,__LINE__) Menu(Game::GetInstance()->GetText("RadioView.menu.WINGMAN")); + wing_menu->AddMenu(Game::GetInstance()->GetText("RadioView.item.target"), target_menu); + wing_menu->AddMenu(Game::GetInstance()->GetText("RadioView.item.combat"), combat_menu); + wing_menu->AddMenu(Game::GetInstance()->GetText("RadioView.item.formation"), formation_menu); + wing_menu->AddMenu(Game::GetInstance()->GetText("RadioView.item.mission"), mission_menu); + wing_menu->AddMenu(Game::GetInstance()->GetText("RadioView.item.sensors"), sensors_menu); + + elem_menu = new(__FILE__,__LINE__) Menu(Game::GetInstance()->GetText("RadioView.menu.ELEMENT")); + elem_menu->AddMenu(Game::GetInstance()->GetText("RadioView.item.target"), target_menu); + elem_menu->AddMenu(Game::GetInstance()->GetText("RadioView.item.combat"), combat_menu); + elem_menu->AddMenu(Game::GetInstance()->GetText("RadioView.item.formation"), formation_menu); + elem_menu->AddMenu(Game::GetInstance()->GetText("RadioView.item.mission"), mission_menu); + elem_menu->AddMenu(Game::GetInstance()->GetText("RadioView.item.sensors"), sensors_menu); + + control_menu = new(__FILE__,__LINE__) Menu(Game::GetInstance()->GetText("RadioView.menu.CONTROL")); + control_menu->AddItem(Game::GetInstance()->GetText("RadioView.item.picture"), RadioMessage::REQUEST_PICTURE); + control_menu->AddItem(Game::GetInstance()->GetText("RadioView.item.backup"), RadioMessage::REQUEST_SUPPORT); + control_menu->AddItem(Game::GetInstance()->GetText("RadioView.item.call-inbound"), RadioMessage::CALL_INBOUND); + control_menu->AddItem(Game::GetInstance()->GetText("RadioView.item.call-finals"), RadioMessage::CALL_FINALS); + + fighter_menu = new(__FILE__,__LINE__) Menu(Game::GetInstance()->GetText("RadioView.menu.RADIO")); + fighter_menu->AddMenu(Game::GetInstance()->GetText("RadioView.item.wingman"), wing_menu); + fighter_menu->AddMenu(Game::GetInstance()->GetText("RadioView.item.element"), elem_menu); + fighter_menu->AddMenu(Game::GetInstance()->GetText("RadioView.item.control"), control_menu); + + starship_menu = new(__FILE__,__LINE__) Menu(Game::GetInstance()->GetText("RadioView.menu.RADIO")); initialized = 1; } @@ -279,7 +279,7 @@ RadioView::Refresh() // age messages: for (int i = 0; i < MAX_MSG; i++) { if (msg_time[i] > 0) { - msg_time[i] -= Game::GUITime(); + msg_time[i] -= Game::GetInstance()->GUITime(); if (msg_time[i] <= 0) { msg_time[i] = 0; @@ -369,7 +369,7 @@ RadioView::SendRadioMessage(Ship* ship, MenuItem* item) dst_elem = 0; } - else if (history.Find(Game::GetText("RadioView.menu.WINGMAN"))) { // wingman menu + else if (history.Find(Game::GetInstance()->GetText("RadioView.menu.WINGMAN"))) { // wingman menu int index = ship->GetElementIndex(); int wing = 0; @@ -393,7 +393,7 @@ RadioView::SendRadioMessage(Ship* ship, MenuItem* item) } } - else if (history.Find(Game::GetText("RadioView.menu.ELEMENT"))) { // element menu + else if (history.Find(Game::GetInstance()->GetText("RadioView.menu.ELEMENT"))) { // element menu RadioMessage* msg = new(__FILE__,__LINE__) RadioMessage(elem, ship, item->GetData()); if (TargetRequired(item)) @@ -402,7 +402,7 @@ RadioView::SendRadioMessage(Ship* ship, MenuItem* item) RadioTraffic::Transmit(msg); } - else if (history.Find(Game::GetText("RadioView.menu.CONTROL"))) { // control menu + else if (history.Find(Game::GetInstance()->GetText("RadioView.menu.CONTROL"))) { // control menu RadioMessage* msg = 0; Ship* controller = ship->GetController(); @@ -571,7 +571,7 @@ RadioView::GetRadioMenu(Ship* s) } else { strcat_s(text, " "); - strcat_s(text, Game::GetText("RadioView.item.not-avail").data()); + strcat_s(text, Game::GetInstance()->GetText("RadioView.item.not-avail").data()); starship_menu->AddItem(text, 0, false); } } @@ -581,7 +581,7 @@ RadioView::GetRadioMenu(Ship* s) if (num_pages > 1) { char text[64]; - sprintf_s(text, Game::GetText("RadioView.item.next-page").data(), starship_page + 1, num_pages); + sprintf_s(text, Game::GetInstance()->GetText("RadioView.item.next-page").data(), starship_page + 1, num_pages); starship_menu->AddItem(text); } -- cgit v1.1