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/TacRefDlg.cpp | 61 ++++++++++++++++++++++++++------------------------- 1 file changed, 31 insertions(+), 30 deletions(-) (limited to 'Stars45/TacRefDlg.cpp') diff --git a/Stars45/TacRefDlg.cpp b/Stars45/TacRefDlg.cpp index 66906ac..3a4e965 100644 --- a/Stars45/TacRefDlg.cpp +++ b/Stars45/TacRefDlg.cpp @@ -22,6 +22,7 @@ #include "WeaponGroup.h" #include "Game.h" +#include "ContentBundle.h" #include "EventDispatch.h" #include "Mouse.h" #include "Button.h" @@ -204,12 +205,12 @@ TacRefDlg::SelectShip(const ShipDesign* design) Text desc; char txt[256]; - sprintf_s(txt, "%s\t\t\t%s\n", Game::GetInstance()->GetText("tacref.type").data(), Ship::ClassName(design->type)); + sprintf_s(txt, "%s\t\t\t%s\n", ContentBundle::GetInstance()->GetText("tacref.type").data(), Ship::ClassName(design->type)); desc += txt; - sprintf_s(txt, "%s\t\t\t%s\n", Game::GetInstance()->GetText("tacref.class").data(), design->DisplayName()); + sprintf_s(txt, "%s\t\t\t%s\n", ContentBundle::GetInstance()->GetText("tacref.class").data(), design->DisplayName()); desc += txt; - desc += Game::GetInstance()->GetText("tacref.length"); + desc += ContentBundle::GetInstance()->GetText("tacref.length"); desc += "\t\t"; if (design->type < Ship::STATION) @@ -219,13 +220,13 @@ TacRefDlg::SelectShip(const ShipDesign* design) strcat_s(txt, " m\n"); desc += txt; - desc += Game::GetInstance()->GetText("tacref.mass"); + desc += ContentBundle::GetInstance()->GetText("tacref.mass"); desc += "\t\t\t"; FormatNumber(txt, design->mass); strcat_s(txt, " T\n"); desc += txt; - desc += Game::GetInstance()->GetText("tacref.hull"); + desc += ContentBundle::GetInstance()->GetText("tacref.hull"); desc += "\t\t\t"; FormatNumber(txt, design->integrity); @@ -233,7 +234,7 @@ TacRefDlg::SelectShip(const ShipDesign* design) desc += txt; if (design->weapons.size()) { - desc += Game::GetInstance()->GetText("tacref.weapons"); + desc += ContentBundle::GetInstance()->GetText("tacref.weapons"); WepGroup groups[8]; for (int w = 0; w < design->weapons.size(); w++) { @@ -273,7 +274,7 @@ TacRefDlg::SelectShip(const ShipDesign* design) txt_description->SetText(design->description); } else { - txt_description->SetText(Game::GetInstance()->GetText("tacref.mass")); + txt_description->SetText(ContentBundle::GetInstance()->GetText("tacref.mass")); } } } @@ -304,84 +305,84 @@ TacRefDlg::SelectWeapon(const WeaponDesign* design) Text desc; char txt[256]; - desc = Game::GetInstance()->GetText("tacref.name"); + desc = ContentBundle::GetInstance()->GetText("tacref.name"); desc += "\t"; desc += design->name; desc += "\n"; - desc += Game::GetInstance()->GetText("tacref.type"); + desc += ContentBundle::GetInstance()->GetText("tacref.type"); desc += "\t\t"; if (design->damage < 1) - desc += Game::GetInstance()->GetText("tacref.wep.other"); + desc += ContentBundle::GetInstance()->GetText("tacref.wep.other"); else if (design->beam) - desc += Game::GetInstance()->GetText("tacref.wep.beam"); + desc += ContentBundle::GetInstance()->GetText("tacref.wep.beam"); else if (design->primary) - desc += Game::GetInstance()->GetText("tacref.wep.bolt"); + desc += ContentBundle::GetInstance()->GetText("tacref.wep.bolt"); else if (design->drone) - desc += Game::GetInstance()->GetText("tacref.wep.drone"); + desc += ContentBundle::GetInstance()->GetText("tacref.wep.drone"); else if (design->guided) - desc += Game::GetInstance()->GetText("tacref.wep.guided"); + desc += ContentBundle::GetInstance()->GetText("tacref.wep.guided"); else - desc += Game::GetInstance()->GetText("tacref.wep.missile"); + desc += ContentBundle::GetInstance()->GetText("tacref.wep.missile"); if (design->turret_model && design->damage >= 1) { desc += " "; - desc += Game::GetInstance()->GetText("tacref.wep.turret"); + desc += ContentBundle::GetInstance()->GetText("tacref.wep.turret"); desc += "\n"; } else { desc += "\n"; } - desc += Game::GetInstance()->GetText("tacref.targets"); + desc += ContentBundle::GetInstance()->GetText("tacref.targets"); desc += "\t"; if ((design->target_type & Ship::DROPSHIPS) != 0) { if ((design->target_type & Ship::STARSHIPS) != 0) { if ((design->target_type & Ship::GROUND_UNITS) != 0) { - desc += Game::GetInstance()->GetText("tacref.targets.fsg"); + desc += ContentBundle::GetInstance()->GetText("tacref.targets.fsg"); } else { - desc += Game::GetInstance()->GetText("tacref.targets.fs"); + desc += ContentBundle::GetInstance()->GetText("tacref.targets.fs"); } } else { if ((design->target_type & Ship::GROUND_UNITS) != 0) { - desc += Game::GetInstance()->GetText("tacref.targets.fg"); + desc += ContentBundle::GetInstance()->GetText("tacref.targets.fg"); } else { - desc += Game::GetInstance()->GetText("tacref.targets.f"); + desc += ContentBundle::GetInstance()->GetText("tacref.targets.f"); } } } else if ((design->target_type & Ship::STARSHIPS) != 0) { if ((design->target_type & Ship::GROUND_UNITS) != 0) { - desc += Game::GetInstance()->GetText("tacref.targets.sg"); + desc += ContentBundle::GetInstance()->GetText("tacref.targets.sg"); } else { - desc += Game::GetInstance()->GetText("tacref.targets.s"); + desc += ContentBundle::GetInstance()->GetText("tacref.targets.s"); } } else if ((design->target_type & Ship::GROUND_UNITS) != 0) { - desc += Game::GetInstance()->GetText("tacref.targets.g"); + desc += ContentBundle::GetInstance()->GetText("tacref.targets.g"); } desc += "\n"; - desc += Game::GetInstance()->GetText("tacref.speed"); + desc += ContentBundle::GetInstance()->GetText("tacref.speed"); desc += "\t"; FormatNumber(txt, design->speed); desc += txt; desc += "m/s\n"; - desc += Game::GetInstance()->GetText("tacref.range"); + desc += ContentBundle::GetInstance()->GetText("tacref.range"); desc += "\t"; FormatNumber(txt, design->max_range); desc += txt; desc += "m\n"; - desc += Game::GetInstance()->GetText("tacref.damage"); + desc += ContentBundle::GetInstance()->GetText("tacref.damage"); desc += "\t"; if (design->damage > 0) { @@ -391,13 +392,13 @@ TacRefDlg::SelectWeapon(const WeaponDesign* design) desc += "/s"; } else { - desc += Game::GetInstance()->GetText("tacref.none"); + desc += ContentBundle::GetInstance()->GetText("tacref.none"); } desc += "\n"; if (!design->primary && design->damage > 0) { - desc += Game::GetInstance()->GetText("tacref.kill-radius"); + desc += ContentBundle::GetInstance()->GetText("tacref.kill-radius"); desc += "\t"; FormatNumber(txt, design->lethal_radius); desc += txt; @@ -413,7 +414,7 @@ TacRefDlg::SelectWeapon(const WeaponDesign* design) txt_description->SetText(design->description); } else { - txt_description->SetText(Game::GetInstance()->GetText("tacref.no-info")); + txt_description->SetText(ContentBundle::GetInstance()->GetText("tacref.no-info")); } } } -- cgit v1.1