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/TacticalView.cpp | 159 ++++++++++++++++++++++++----------------------- 1 file changed, 80 insertions(+), 79 deletions(-) (limited to 'Stars45/TacticalView.cpp') diff --git a/Stars45/TacticalView.cpp b/Stars45/TacticalView.cpp index 2bbf691..9fe4b87 100644 --- a/Stars45/TacticalView.cpp +++ b/Stars45/TacticalView.cpp @@ -46,6 +46,7 @@ #include "MouseController.h" #include "Menu.h" #include "Game.h" +#include "ContentBundle.h" #include "FormatUtil.h" static Color hud_color = Color::Black; @@ -349,8 +350,8 @@ TacticalView::DrawSelectionInfo(Ship* seln) sprintf_s(name, "%s", seln->Name()); if (show_labels) { - sprintf_s(shield, "%s %03d", Game::GetInstance()->GetText("HUDView.symbol.shield").data(), shield_val); - sprintf_s(hull, "%s %03d", Game::GetInstance()->GetText("HUDView.symbol.hull").data(), hull_val); + sprintf_s(shield, "%s %03d", ContentBundle::GetInstance()->GetText("HUDView.symbol.shield").data(), shield_val); + sprintf_s(hull, "%s %03d", ContentBundle::GetInstance()->GetText("HUDView.symbol.hull").data(), hull_val); } else { sprintf_s(shield, "%03d", shield_val); @@ -359,7 +360,7 @@ TacticalView::DrawSelectionInfo(Ship* seln) FormatNumberExp(range, Point(seln->Location()-ship->Location()).length()/1000); strcat_s(range, " km"); - sprintf_s(heading, "%03d %s", (int) (seln->CompassHeading() / DEGREES), Game::GetInstance()->GetText("HUDView.symbol.degrees").data()); + sprintf_s(heading, "%03d %s", (int) (seln->CompassHeading() / DEGREES), ContentBundle::GetInstance()->GetText("HUDView.symbol.degrees").data()); double ss = seln->Velocity().length(); if (seln->Velocity() * seln->Heading() < 0) @@ -377,7 +378,7 @@ TacticalView::DrawSelectionInfo(Ship* seln) if (c->GetShip() == seln) { contact = c.value(); if (c->GetIFF(ship) > seln->GetIFF()) { - sprintf_s(name, "%s %04d", Game::GetInstance()->GetText("TacView.contact").data(), seln->GetContactID()); + sprintf_s(name, "%s %04d", ContentBundle::GetInstance()->GetText("TacView.contact").data(), seln->GetContactID()); full_info = false; } @@ -390,31 +391,31 @@ TacticalView::DrawSelectionInfo(Ship* seln) font->SetColor(txt_color); font->SetAlpha(1); - font->DrawText(Game::GetInstance()->GetText("TacView.name"), 5, label_rect, DT_LEFT); + font->DrawText(ContentBundle::GetInstance()->GetText("TacView.name"), 5, label_rect, DT_LEFT); label_rect.y += 10; - font->DrawText(Game::GetInstance()->GetText("TacView.type"), 5, label_rect, DT_LEFT); + font->DrawText(ContentBundle::GetInstance()->GetText("TacView.type"), 5, label_rect, DT_LEFT); label_rect.y += 10; if (full_info) { - font->DrawText(Game::GetInstance()->GetText("TacView.shield"), 5, label_rect, DT_LEFT); + font->DrawText(ContentBundle::GetInstance()->GetText("TacView.shield"), 5, label_rect, DT_LEFT); label_rect.y += 10; - font->DrawText(Game::GetInstance()->GetText("TacView.hull"), 5, label_rect, DT_LEFT); + font->DrawText(ContentBundle::GetInstance()->GetText("TacView.hull"), 5, label_rect, DT_LEFT); label_rect.y += 10; } - font->DrawText(Game::GetInstance()->GetText("TacView.range"), 4, label_rect, DT_LEFT); + font->DrawText(ContentBundle::GetInstance()->GetText("TacView.range"), 4, label_rect, DT_LEFT); label_rect.y += 10; if (full_info) { - font->DrawText(Game::GetInstance()->GetText("TacView.speed"), 4, label_rect, DT_LEFT); + font->DrawText(ContentBundle::GetInstance()->GetText("TacView.speed"), 4, label_rect, DT_LEFT); label_rect.y += 10; - font->DrawText(Game::GetInstance()->GetText("TacView.heading"), 4, label_rect, DT_LEFT); + font->DrawText(ContentBundle::GetInstance()->GetText("TacView.heading"), 4, label_rect, DT_LEFT); label_rect.y += 10; } else { - font->DrawText(Game::GetInstance()->GetText("TacView.passive"), 4, label_rect, DT_LEFT); + font->DrawText(ContentBundle::GetInstance()->GetText("TacView.passive"), 4, label_rect, DT_LEFT); label_rect.y += 10; - font->DrawText(Game::GetInstance()->GetText("TacView.active"), 4, label_rect, DT_LEFT); + font->DrawText(ContentBundle::GetInstance()->GetText("TacView.active"), 4, label_rect, DT_LEFT); label_rect.y += 10; } } @@ -429,9 +430,9 @@ TacticalView::DrawSelectionInfo(Ship* seln) } else { if (seln->IsStarship()) - font->DrawText(Game::GetInstance()->GetText("TacView.starship"), 8, info_rect, DT_LEFT); + font->DrawText(ContentBundle::GetInstance()->GetText("TacView.starship"), 8, info_rect, DT_LEFT); else - font->DrawText(Game::GetInstance()->GetText("TacView.fighter"), 7, info_rect, DT_LEFT); + font->DrawText(ContentBundle::GetInstance()->GetText("TacView.fighter"), 7, info_rect, DT_LEFT); info_rect.y += 10; } @@ -470,7 +471,7 @@ TacticalView::DrawSelectionInfo(Ship* seln) if (*orders) { if (show_labels) { - font->DrawText(Game::GetInstance()->GetText("TacView.orders"), 5, label_rect, DT_LEFT); + font->DrawText(ContentBundle::GetInstance()->GetText("TacView.orders"), 5, label_rect, DT_LEFT); label_rect.y += 10; } @@ -516,7 +517,7 @@ TacticalView::DrawSelectionList(ListIter seln) while (++c) { if (c->GetShip() == seln.value()) { if (c->GetIFF(ship) > seln->GetIFF()) { - sprintf_s(name, "%s %04d", Game::GetInstance()->GetText("TacView.contact").data(), seln->GetContactID()); + sprintf_s(name, "%s %04d", ContentBundle::GetInstance()->GetText("TacView.contact").data(), seln->GetContactID()); } break; @@ -917,57 +918,57 @@ TacticalView::Initialize() static int initialized = 0; if (initialized) return; - view_menu = new(__FILE__,__LINE__) Menu(Game::GetInstance()->GetText("TacView.menu.view")); - view_menu->AddItem(Game::GetInstance()->GetText("TacView.item.forward"), VIEW_FORWARD); - view_menu->AddItem(Game::GetInstance()->GetText("TacView.item.chase"), VIEW_CHASE); - view_menu->AddItem(Game::GetInstance()->GetText("TacView.item.orbit"), VIEW_ORBIT); - view_menu->AddItem(Game::GetInstance()->GetText("TacView.item.padlock"), VIEW_PADLOCK); - - emcon_menu = new(__FILE__,__LINE__) Menu(Game::GetInstance()->GetText("TacView.menu.emcon")); - - quantum_menu = new(__FILE__,__LINE__) Menu(Game::GetInstance()->GetText("TacView.menu.quantum")); - farcast_menu = new(__FILE__,__LINE__) Menu(Game::GetInstance()->GetText("TacView.menu.farcast")); - - main_menu = new(__FILE__,__LINE__) Menu(Game::GetInstance()->GetText("TacView.menu.main")); - - action_menu = new(__FILE__,__LINE__) Menu(Game::GetInstance()->GetText("TacView.menu.action")); - action_menu->AddItem(Game::GetInstance()->GetText("TacView.item.engage"), RadioMessage::ATTACK); - action_menu->AddItem(Game::GetInstance()->GetText("TacView.item.bracket"), RadioMessage::BRACKET); - action_menu->AddItem(Game::GetInstance()->GetText("TacView.item.escort"), RadioMessage::ESCORT); - action_menu->AddItem(Game::GetInstance()->GetText("TacView.item.identify"), RadioMessage::IDENTIFY); - action_menu->AddItem(Game::GetInstance()->GetText("TacView.item.hold"), RadioMessage::WEP_HOLD); - - formation_menu = new(__FILE__,__LINE__) Menu(Game::GetInstance()->GetText("TacView.menu.formation")); - formation_menu->AddItem(Game::GetInstance()->GetText("TacView.item.diamond"), RadioMessage::GO_DIAMOND); - formation_menu->AddItem(Game::GetInstance()->GetText("TacView.item.spread"), RadioMessage::GO_SPREAD); - formation_menu->AddItem(Game::GetInstance()->GetText("TacView.item.box"), RadioMessage::GO_BOX); - formation_menu->AddItem(Game::GetInstance()->GetText("TacView.item.trail"), RadioMessage::GO_TRAIL); - - sensors_menu = new(__FILE__,__LINE__) Menu(Game::GetInstance()->GetText("TacView.menu.emcon")); - sensors_menu->AddItem(Game::GetInstance()->GetText("TacView.item.emcon-1"), RadioMessage::GO_EMCON1); - sensors_menu->AddItem(Game::GetInstance()->GetText("TacView.item.emcon-2"), RadioMessage::GO_EMCON2); - sensors_menu->AddItem(Game::GetInstance()->GetText("TacView.item.emcon-3"), RadioMessage::GO_EMCON3); - sensors_menu->AddItem(Game::GetInstance()->GetText("TacView.item.probe"), RadioMessage::LAUNCH_PROBE); - - fighter_menu = new(__FILE__,__LINE__) Menu(Game::GetInstance()->GetText("TacView.menu.context")); - fighter_menu->AddMenu(Game::GetInstance()->GetText("TacView.item.action"), action_menu); - fighter_menu->AddMenu(Game::GetInstance()->GetText("TacView.item.formation"), formation_menu); - fighter_menu->AddMenu(Game::GetInstance()->GetText("TacView.item.sensors"), sensors_menu); - fighter_menu->AddItem(Game::GetInstance()->GetText("TacView.item.patrol"), RadioMessage::MOVE_PATROL); - fighter_menu->AddItem(Game::GetInstance()->GetText("TacView.item.cancel"), RadioMessage::RESUME_MISSION); + view_menu = new(__FILE__,__LINE__) 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")); + + quantum_menu = new(__FILE__,__LINE__) Menu(ContentBundle::GetInstance()->GetText("TacView.menu.quantum")); + farcast_menu = new(__FILE__,__LINE__) Menu(ContentBundle::GetInstance()->GetText("TacView.menu.farcast")); + + main_menu = new(__FILE__,__LINE__) Menu(ContentBundle::GetInstance()->GetText("TacView.menu.main")); + + action_menu = new(__FILE__,__LINE__) 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->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->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->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); + fighter_menu->AddItem(ContentBundle::GetInstance()->GetText("TacView.item.patrol"), RadioMessage::MOVE_PATROL); + fighter_menu->AddItem(ContentBundle::GetInstance()->GetText("TacView.item.cancel"), RadioMessage::RESUME_MISSION); fighter_menu->AddItem("", 0); - fighter_menu->AddItem(Game::GetInstance()->GetText("TacView.item.rtb"), RadioMessage::RTB); - fighter_menu->AddItem(Game::GetInstance()->GetText("TacView.item.dock"), RadioMessage::DOCK_WITH); - fighter_menu->AddMenu(Game::GetInstance()->GetText("TacView.item.farcast"), farcast_menu); - - starship_menu = new(__FILE__,__LINE__) Menu(Game::GetInstance()->GetText("TacView.menu.context")); - starship_menu->AddMenu(Game::GetInstance()->GetText("TacView.item.action"), action_menu); - starship_menu->AddMenu(Game::GetInstance()->GetText("TacView.item.sensors"), sensors_menu); - starship_menu->AddItem(Game::GetInstance()->GetText("TacView.item.patrol"), RadioMessage::MOVE_PATROL); - starship_menu->AddItem(Game::GetInstance()->GetText("TacView.item.cancel"), RadioMessage::RESUME_MISSION); + fighter_menu->AddItem(ContentBundle::GetInstance()->GetText("TacView.item.rtb"), RadioMessage::RTB); + 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->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); + starship_menu->AddItem(ContentBundle::GetInstance()->GetText("TacView.item.cancel"), RadioMessage::RESUME_MISSION); starship_menu->AddItem("", 0); - starship_menu->AddMenu(Game::GetInstance()->GetText("TacView.item.quantum"), quantum_menu); - starship_menu->AddMenu(Game::GetInstance()->GetText("TacView.item.farcast"), farcast_menu); + starship_menu->AddMenu(ContentBundle::GetInstance()->GetText("TacView.item.quantum"), quantum_menu); + starship_menu->AddMenu(ContentBundle::GetInstance()->GetText("TacView.item.farcast"), farcast_menu); initialized = 1; } @@ -1154,38 +1155,38 @@ TacticalView::BuildMenu() } // build the main menu: - main_menu->AddMenu(Game::GetInstance()->GetText("TacView.item.camera"), view_menu); + main_menu->AddMenu(ContentBundle::GetInstance()->GetText("TacView.item.camera"), view_menu); main_menu->AddItem("", 0); - main_menu->AddItem(Game::GetInstance()->GetText("TacView.item.instructions"), VIEW_INS); - main_menu->AddItem(Game::GetInstance()->GetText("TacView.item.navigation"), VIEW_NAV); + main_menu->AddItem(ContentBundle::GetInstance()->GetText("TacView.item.instructions"), VIEW_INS); + main_menu->AddItem(ContentBundle::GetInstance()->GetText("TacView.item.navigation"), VIEW_NAV); if (ship->Design()->repair_screen) - main_menu->AddItem(Game::GetInstance()->GetText("TacView.item.engineering"), VIEW_ENG); + main_menu->AddItem(ContentBundle::GetInstance()->GetText("TacView.item.engineering"), VIEW_ENG); if (ship->Design()->wep_screen) - main_menu->AddItem(Game::GetInstance()->GetText("TacView.item.weapons"), VIEW_WEP); + main_menu->AddItem(ContentBundle::GetInstance()->GetText("TacView.item.weapons"), VIEW_WEP); if (ship->NumFlightDecks() > 0) - main_menu->AddItem(Game::GetInstance()->GetText("TacView.item.flight"), VIEW_FLT); + main_menu->AddItem(ContentBundle::GetInstance()->GetText("TacView.item.flight"), VIEW_FLT); - emcon_menu->AddItem(Game::GetInstance()->GetText("TacView.item.emcon-1"), RadioMessage::GO_EMCON1); - emcon_menu->AddItem(Game::GetInstance()->GetText("TacView.item.emcon-2"), RadioMessage::GO_EMCON2); - emcon_menu->AddItem(Game::GetInstance()->GetText("TacView.item.emcon-3"), RadioMessage::GO_EMCON3); + emcon_menu->AddItem(ContentBundle::GetInstance()->GetText("TacView.item.emcon-1"), RadioMessage::GO_EMCON1); + emcon_menu->AddItem(ContentBundle::GetInstance()->GetText("TacView.item.emcon-2"), RadioMessage::GO_EMCON2); + emcon_menu->AddItem(ContentBundle::GetInstance()->GetText("TacView.item.emcon-3"), RadioMessage::GO_EMCON3); if (ship->GetProbeLauncher()) - emcon_menu->AddItem(Game::GetInstance()->GetText("TacView.item.probe"), RadioMessage::LAUNCH_PROBE); + emcon_menu->AddItem(ContentBundle::GetInstance()->GetText("TacView.item.probe"), RadioMessage::LAUNCH_PROBE); main_menu->AddItem("", 0); - main_menu->AddMenu(Game::GetInstance()->GetText("TacView.item.sensors"), emcon_menu); + main_menu->AddMenu(ContentBundle::GetInstance()->GetText("TacView.item.sensors"), emcon_menu); if (sim && ship->GetQuantumDrive()) { main_menu->AddItem("", 0); - main_menu->AddMenu(Game::GetInstance()->GetText("TacView.item.quantum"), quantum_menu); + main_menu->AddMenu(ContentBundle::GetInstance()->GetText("TacView.item.quantum"), quantum_menu); } if (ship->IsStarship()) { main_menu->AddItem("", 0); - main_menu->AddItem(Game::GetInstance()->GetText("TacView.item.command"), VIEW_CMD); + main_menu->AddItem(ContentBundle::GetInstance()->GetText("TacView.item.command"), VIEW_CMD); } } -- cgit v1.1