From 0da933a0146a0689546b21231e14f2dfc2bc14e8 Mon Sep 17 00:00:00 2001 From: Aki Date: Wed, 23 Feb 2022 23:36:37 +0100 Subject: Switched to use ContentBundle's GetText --- Stars45/RadioView.cpp | 117 +++++++++++++++++++++++++------------------------- 1 file changed, 59 insertions(+), 58 deletions(-) (limited to 'Stars45/RadioView.cpp') diff --git a/Stars45/RadioView.cpp b/Stars45/RadioView.cpp index 9452e34..feb696a 100644 --- a/Stars45/RadioView.cpp +++ b/Stars45/RadioView.cpp @@ -34,6 +34,7 @@ #include "Keyboard.h" #include "Mouse.h" #include "Game.h" +#include "ContentBundle.h" #include "Menu.h" static Color hud_color = Color::Black; @@ -67,59 +68,59 @@ RadioView::Initialize() static int initialized = 0; if (initialized) return; - 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")); + target_menu = new(__FILE__,__LINE__) 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->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->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->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->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->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->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->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->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")); initialized = 1; } @@ -369,7 +370,7 @@ RadioView::SendRadioMessage(Ship* ship, MenuItem* item) dst_elem = 0; } - else if (history.Find(Game::GetInstance()->GetText("RadioView.menu.WINGMAN"))) { // wingman menu + else if (history.Find(ContentBundle::GetInstance()->GetText("RadioView.menu.WINGMAN"))) { // wingman menu int index = ship->GetElementIndex(); int wing = 0; @@ -393,7 +394,7 @@ RadioView::SendRadioMessage(Ship* ship, MenuItem* item) } } - else if (history.Find(Game::GetInstance()->GetText("RadioView.menu.ELEMENT"))) { // element menu + else if (history.Find(ContentBundle::GetInstance()->GetText("RadioView.menu.ELEMENT"))) { // element menu RadioMessage* msg = new(__FILE__,__LINE__) RadioMessage(elem, ship, item->GetData()); if (TargetRequired(item)) @@ -402,7 +403,7 @@ RadioView::SendRadioMessage(Ship* ship, MenuItem* item) RadioTraffic::Transmit(msg); } - else if (history.Find(Game::GetInstance()->GetText("RadioView.menu.CONTROL"))) { // control menu + else if (history.Find(ContentBundle::GetInstance()->GetText("RadioView.menu.CONTROL"))) { // control menu RadioMessage* msg = 0; Ship* controller = ship->GetController(); @@ -571,7 +572,7 @@ RadioView::GetRadioMenu(Ship* s) } else { strcat_s(text, " "); - strcat_s(text, Game::GetInstance()->GetText("RadioView.item.not-avail").data()); + strcat_s(text, ContentBundle::GetInstance()->GetText("RadioView.item.not-avail").data()); starship_menu->AddItem(text, 0, false); } } @@ -581,7 +582,7 @@ RadioView::GetRadioMenu(Ship* s) if (num_pages > 1) { char text[64]; - sprintf_s(text, Game::GetInstance()->GetText("RadioView.item.next-page").data(), starship_page + 1, num_pages); + sprintf_s(text, ContentBundle::GetInstance()->GetText("RadioView.item.next-page").data(), starship_page + 1, num_pages); starship_menu->AddItem(text); } -- cgit v1.1