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/MapView.cpp | 102 ++++++++++++++++++++++++++-------------------------- 1 file changed, 51 insertions(+), 51 deletions(-) (limited to 'Stars45/MapView.cpp') diff --git a/Stars45/MapView.cpp b/Stars45/MapView.cpp index 3d6145a..a0e2a86 100644 --- a/Stars45/MapView.cpp +++ b/Stars45/MapView.cpp @@ -280,7 +280,7 @@ MapView::BuildMenu() { ClearMenu(); - map_system_menu = new(__FILE__,__LINE__) Menu(Game::GetText("MapView.menu.STARSYSTEM")); + map_system_menu = new(__FILE__,__LINE__) Menu(Game::GetInstance()->GetText("MapView.menu.STARSYSTEM")); if (system_list.size() > 0) { int i = 0; @@ -296,64 +296,64 @@ MapView::BuildMenu() map_system_menu->AddItem(system->Name(), MAP_SYSTEM); } - map_sector_menu = new(__FILE__,__LINE__) Menu(Game::GetText("MapView.menu.SECTOR")); + map_sector_menu = new(__FILE__,__LINE__) Menu(Game::GetInstance()->GetText("MapView.menu.SECTOR")); for (int i = 0; i < regions.size(); i++) { Orbital* rgn = regions[i]; map_sector_menu->AddItem(rgn->Name(), MAP_SECTOR + i); } - map_menu = new(__FILE__,__LINE__) Menu(Game::GetText("MapView.menu.MAP")); + map_menu = new(__FILE__,__LINE__) Menu(Game::GetInstance()->GetText("MapView.menu.MAP")); map_menu->AddMenu("System", map_system_menu); map_menu->AddMenu("Sector", map_sector_menu); if (ship || mission) { - ship_menu = new(__FILE__,__LINE__) Menu(Game::GetText("MapView.menu.SHIP")); - ship_menu->AddMenu(Game::GetText("MapView.item.Starsystem"), map_system_menu); - ship_menu->AddMenu(Game::GetText("MapView.item.Sector"), map_sector_menu); + ship_menu = new(__FILE__,__LINE__) Menu(Game::GetInstance()->GetText("MapView.menu.SHIP")); + ship_menu->AddMenu(Game::GetInstance()->GetText("MapView.item.Starsystem"), map_system_menu); + ship_menu->AddMenu(Game::GetInstance()->GetText("MapView.item.Sector"), map_sector_menu); ship_menu->AddItem("", 0); - ship_menu->AddItem(Game::GetText("MapView.item.Add-Nav"), MAP_ADDNAV); - ship_menu->AddItem(Game::GetText("MapView.item.Clear-All"), MAP_CLEAR); + ship_menu->AddItem(Game::GetInstance()->GetText("MapView.item.Add-Nav"), MAP_ADDNAV); + ship_menu->AddItem(Game::GetInstance()->GetText("MapView.item.Clear-All"), MAP_CLEAR); - action_menu = new(__FILE__,__LINE__) Menu(Game::GetText("MapView.menu.ACTION")); + action_menu = new(__FILE__,__LINE__) Menu(Game::GetInstance()->GetText("MapView.menu.ACTION")); for (int i = 0; i < Instruction::NUM_ACTIONS; i++) { - action_menu->AddItem(Game::GetText(Text("MapView.item.") + Instruction::ActionName(i)), MAP_ACTION + i); + action_menu->AddItem(Game::GetInstance()->GetText(Text("MapView.item.") + Instruction::ActionName(i)), MAP_ACTION + i); } - formation_menu = new(__FILE__,__LINE__) Menu(Game::GetText("MapView.menu.FORMATION")); + formation_menu = new(__FILE__,__LINE__) Menu(Game::GetInstance()->GetText("MapView.menu.FORMATION")); for (int i = 0; i < Instruction::NUM_FORMATIONS; i++) { - formation_menu->AddItem(Game::GetText(Text("MapView.item.") + Instruction::FormationName(i)), MAP_FORMATION + i); + formation_menu->AddItem(Game::GetInstance()->GetText(Text("MapView.item.") + Instruction::FormationName(i)), MAP_FORMATION + i); } - speed_menu = new(__FILE__,__LINE__) Menu(Game::GetText("MapView.menu.SPEED")); + speed_menu = new(__FILE__,__LINE__) Menu(Game::GetInstance()->GetText("MapView.menu.SPEED")); speed_menu->AddItem("250", MAP_SPEED + 0); speed_menu->AddItem("500", MAP_SPEED + 1); speed_menu->AddItem("750", MAP_SPEED + 2); speed_menu->AddItem("1000", MAP_SPEED + 3); - hold_menu = new(__FILE__,__LINE__) Menu(Game::GetText("MapView.menu.HOLD")); - hold_menu->AddItem(Game::GetText("MapView.item.None"), MAP_HOLD + 0); - hold_menu->AddItem(Game::GetText("MapView.item.1-Minute"), MAP_HOLD + 1); - hold_menu->AddItem(Game::GetText("MapView.item.5-Minutes"), MAP_HOLD + 2); - hold_menu->AddItem(Game::GetText("MapView.item.10-Minutes"), MAP_HOLD + 3); - hold_menu->AddItem(Game::GetText("MapView.item.15-Minutes"), MAP_HOLD + 4); - - farcast_menu = new(__FILE__,__LINE__) Menu(Game::GetText("MapView.menu.FARCAST")); - farcast_menu->AddItem(Game::GetText("MapView.item.Use-Quantum"), MAP_FARCAST + 0); - farcast_menu->AddItem(Game::GetText("MapView.item.Use-Farcast"), MAP_FARCAST + 1); - - objective_menu = new(__FILE__,__LINE__) Menu(Game::GetText("MapView.menu.OBJECTIVE")); - - nav_menu = new(__FILE__,__LINE__) Menu(Game::GetText("MapView.menu.NAVPT")); - nav_menu->AddMenu(Game::GetText("MapView.item.Action"), action_menu); - nav_menu->AddMenu(Game::GetText("MapView.item.Objective"), objective_menu); - nav_menu->AddMenu(Game::GetText("MapView.item.Formation"), formation_menu); - nav_menu->AddMenu(Game::GetText("MapView.item.Speed"), speed_menu); - nav_menu->AddMenu(Game::GetText("MapView.item.Hold"), hold_menu); - nav_menu->AddMenu(Game::GetText("MapView.item.Farcast"), farcast_menu); + hold_menu = new(__FILE__,__LINE__) Menu(Game::GetInstance()->GetText("MapView.menu.HOLD")); + hold_menu->AddItem(Game::GetInstance()->GetText("MapView.item.None"), MAP_HOLD + 0); + hold_menu->AddItem(Game::GetInstance()->GetText("MapView.item.1-Minute"), MAP_HOLD + 1); + hold_menu->AddItem(Game::GetInstance()->GetText("MapView.item.5-Minutes"), MAP_HOLD + 2); + hold_menu->AddItem(Game::GetInstance()->GetText("MapView.item.10-Minutes"), MAP_HOLD + 3); + hold_menu->AddItem(Game::GetInstance()->GetText("MapView.item.15-Minutes"), MAP_HOLD + 4); + + farcast_menu = new(__FILE__,__LINE__) Menu(Game::GetInstance()->GetText("MapView.menu.FARCAST")); + farcast_menu->AddItem(Game::GetInstance()->GetText("MapView.item.Use-Quantum"), MAP_FARCAST + 0); + farcast_menu->AddItem(Game::GetInstance()->GetText("MapView.item.Use-Farcast"), MAP_FARCAST + 1); + + objective_menu = new(__FILE__,__LINE__) Menu(Game::GetInstance()->GetText("MapView.menu.OBJECTIVE")); + + nav_menu = new(__FILE__,__LINE__) Menu(Game::GetInstance()->GetText("MapView.menu.NAVPT")); + nav_menu->AddMenu(Game::GetInstance()->GetText("MapView.item.Action"), action_menu); + nav_menu->AddMenu(Game::GetInstance()->GetText("MapView.item.Objective"), objective_menu); + nav_menu->AddMenu(Game::GetInstance()->GetText("MapView.item.Formation"), formation_menu); + nav_menu->AddMenu(Game::GetInstance()->GetText("MapView.item.Speed"), speed_menu); + nav_menu->AddMenu(Game::GetInstance()->GetText("MapView.item.Hold"), hold_menu); + nav_menu->AddMenu(Game::GetInstance()->GetText("MapView.item.Farcast"), farcast_menu); nav_menu->AddItem("", 0); - nav_menu->AddItem(Game::GetText("MapView.item.Add-Nav"), MAP_ADDNAV); - nav_menu->AddItem(Game::GetText("MapView.item.Del-Nav"), MAP_DELETE); + nav_menu->AddItem(Game::GetInstance()->GetText("MapView.item.Add-Nav"), MAP_ADDNAV); + nav_menu->AddItem(Game::GetInstance()->GetText("MapView.item.Del-Nav"), MAP_DELETE); } else if (campaign) { @@ -731,7 +731,7 @@ MapView::SelectNavpt(Instruction* navpt) case Instruction::PATROL: case Instruction::SWEEP: case Instruction::RECON: - objective_menu->AddItem(Game::GetText("MapView.item.not-available"), 0); + objective_menu->AddItem(Game::GetInstance()->GetText("MapView.item.not-available"), 0); objective_menu->GetItem(0)->SetEnabled(false); break; @@ -767,7 +767,7 @@ MapView::SelectNavpt(Instruction* navpt) } else { objective_menu->ClearItems(); - objective_menu->AddItem(Game::GetText("MapView.item.not-available"), 0); + objective_menu->AddItem(Game::GetInstance()->GetText("MapView.item.not-available"), 0); objective_menu->GetItem(0)->SetEnabled(false); } } @@ -1619,7 +1619,7 @@ MapView::Refresh() if (!system) { DrawGrid(); - DrawTabbedText(title_font, Game::GetText("MapView.item.no-system")); + DrawTabbedText(title_font, Game::GetInstance()->GetText("MapView.item.no-system")); return; } @@ -1694,7 +1694,7 @@ MapView::DrawTitle() void MapView::DrawGalaxy() { - title = Game::GetText("MapView.title.Galaxy"); + title = Game::GetInstance()->GetText("MapView.title.Galaxy"); DrawGrid(); double cx = rect.w/2; @@ -1827,19 +1827,19 @@ MapView::DrawGalaxy() void MapView::DrawSystem() { - Text caption = Game::GetText("MapView.title.Starsystem"); + Text caption = Game::GetInstance()->GetText("MapView.title.Starsystem"); caption += " "; caption += system->Name(); if (current_ship) { caption += "\n"; - caption += Game::GetText("MapView.title.Ship"); + caption += Game::GetInstance()->GetText("MapView.title.Ship"); caption += " "; caption += current_ship->Name(); } else if (current_elem) { caption += "\n"; - caption += Game::GetText("MapView.title.Ship"); + caption += Game::GetInstance()->GetText("MapView.title.Ship"); caption += " "; caption += current_elem->Name(); } @@ -1883,7 +1883,7 @@ MapView::DrawSystem() char r_txt[32]; FormatNumber(r_txt, system->Radius() * zoom); char resolution[64]; - sprintf_s(resolution, "%s: %s", Game::GetText("MapView.info.Resolution").data(), r_txt); + sprintf_s(resolution, "%s: %s", Game::GetInstance()->GetText("MapView.info.Resolution").data(), r_txt); active_window->SetFont(font); Rect text_rect(4, 4, rect.w - 8, 24); @@ -1897,19 +1897,19 @@ MapView::DrawRegion() { OrbitalRegion* rgn = (OrbitalRegion*) regions[current_region]; - Text caption = Game::GetText("MapView.title.Sector"); + Text caption = Game::GetInstance()->GetText("MapView.title.Sector"); caption += " "; caption += rgn->Name(); if (current_ship) { caption += "\n"; - caption += Game::GetText("MapView.title.Ship"); + caption += Game::GetInstance()->GetText("MapView.title.Ship"); caption += " "; caption += current_ship->Name(); } else if (current_elem) { caption += "\n"; - caption += Game::GetText("MapView.title.Ship"); + caption += Game::GetInstance()->GetText("MapView.title.Ship"); caption += " "; caption += current_elem->Name(); } @@ -2057,7 +2057,7 @@ MapView::DrawRegion() char r_txt[32]; FormatNumber(r_txt, r*2); char resolution[64]; - sprintf_s(resolution, "%s: %s", Game::GetText("MapView.info.Resolution").data(), r_txt); + sprintf_s(resolution, "%s: %s", Game::GetInstance()->GetText("MapView.info.Resolution").data(), r_txt); active_window->SetFont(font); Rect text_rect(4, 4, rect.w - 8, 24); @@ -2652,15 +2652,15 @@ MissionElement* elem) if (navpt == current_navpt) { if (navpt->TargetName() && strlen(navpt->TargetName())) { - sprintf_s(buf, "%s %s", Game::GetText(Text("MapView.item.") + Instruction::ActionName(navpt->Action())).data(), navpt->TargetName()); + sprintf_s(buf, "%s %s", Game::GetInstance()->GetText(Text("MapView.item.") + Instruction::ActionName(navpt->Action())).data(), navpt->TargetName()); window->Print(x2+3, y1+10, buf); } else { - sprintf_s(buf, "%s", Game::GetText(Text("MapView.item.") + Instruction::ActionName(navpt->Action())).data()); + sprintf_s(buf, "%s", Game::GetInstance()->GetText(Text("MapView.item.") + Instruction::ActionName(navpt->Action())).data()); window->Print(x2+3, y1+10, buf); } - sprintf_s(buf, "%s", Game::GetText(Text("MapView.item.") + Instruction::FormationName(navpt->Formation())).data()); + sprintf_s(buf, "%s", Game::GetInstance()->GetText(Text("MapView.item.") + Instruction::FormationName(navpt->Formation())).data()); window->Print(x2+3, y1+20, buf); sprintf_s(buf, "%d", navpt->Speed()); @@ -2670,7 +2670,7 @@ MissionElement* elem) char hold_time[32]; FormatTime(hold_time, navpt->HoldTime()); - sprintf_s(buf, "%s %s", Game::GetText("MapView.item.Hold").data(), hold_time); + sprintf_s(buf, "%s %s", Game::GetInstance()->GetText("MapView.item.Hold").data(), hold_time); window->Print(x2+3, y1+40, buf); } } -- cgit v1.1