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