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/EngDlg.cpp | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'Stars45/EngDlg.cpp') diff --git a/Stars45/EngDlg.cpp b/Stars45/EngDlg.cpp index c00ba7d..545b925 100644 --- a/Stars45/EngDlg.cpp +++ b/Stars45/EngDlg.cpp @@ -251,7 +251,7 @@ EngDlg::UpdateRouteTables() PowerSource* reactor = reactor_iter.value(); if (sources[reactor_index] && clients[reactor_index]) { - sources[reactor_index]->SetText(Game::GetText(reactor->Abbreviation())); + sources[reactor_index]->SetText(Game::GetInstance()->GetText(reactor->Abbreviation())); sources[reactor_index]->Show(); source_levels[reactor_index]->Show(); @@ -264,9 +264,9 @@ EngDlg::UpdateRouteTables() while (++client) { char abrv[64], num[20]; FormatNumber(num, client->GetPowerLevel()); - strcpy_s(abrv, Game::GetText(client->Name())); + strcpy_s(abrv, Game::GetInstance()->GetText(client->Name())); - clients[reactor_index]->AddItemWithData(Game::GetText(abrv), index); + clients[reactor_index]->AddItemWithData(Game::GetInstance()->GetText(abrv), index); clients[reactor_index]->SetItemText(index, 1, num); clients[reactor_index]->SetItemData(index, 1, (DWORD) client->GetPowerLevel()); @@ -357,7 +357,7 @@ EngDlg::UpdateSelection() // update the detail info: if (selected_source) { - selected_name->SetText(Game::GetText(selected_source->Name())); + selected_name->SetText(Game::GetInstance()->GetText(selected_source->Name())); power_off->SetEnabled(true); power_on->SetEnabled(true); override->SetEnabled(true); @@ -409,7 +409,7 @@ EngDlg::UpdateSelection() case Component::REPAIR: stat = "MAINT"; c = Color::Cyan; break; } - stat = Game::GetText(Text("EngDlg.") + stat); + stat = Game::GetInstance()->GetText(Text("EngDlg.") + stat); components->SetItemText(i, 1, stat); components->SetItemData(i, 1, (int) comp->Status()); @@ -424,7 +424,7 @@ EngDlg::UpdateSelection() else if (selected_clients.size() == 1) { System* sink = selected_clients[0]; - selected_name->SetText(Game::GetText(sink->Name())); + selected_name->SetText(Game::GetInstance()->GetText(sink->Name())); power_off->SetEnabled(true); power_on->SetEnabled(true); override->SetEnabled(true); @@ -476,7 +476,7 @@ EngDlg::UpdateSelection() case Component::REPAIR: stat = "MAINT"; c = Color::Cyan; break; } - stat = Game::GetText(Text("EngDlg.") + stat); + stat = Game::GetInstance()->GetText(Text("EngDlg.") + stat); components->SetItemText(i, 1, stat); components->SetItemData(i, 1, (int) comp->Status()); @@ -491,7 +491,7 @@ EngDlg::UpdateSelection() else if (selected_clients.size() > 1) { System* sink = selected_clients[0]; - selected_name->SetText(Game::GetText("[Multiple]")); + selected_name->SetText(Game::GetInstance()->GetText("[Multiple]")); power_off->SetEnabled(true); power_on->SetEnabled(true); override->SetEnabled(true); @@ -527,7 +527,7 @@ EngDlg::UpdateSelection() } else { - selected_name->SetText(Game::GetText("No Selection")); + selected_name->SetText(Game::GetInstance()->GetText("No Selection")); power_off->SetEnabled(false); power_off->SetButtonState(0); power_on->SetEnabled(false); @@ -564,7 +564,7 @@ EngDlg::UpdateSelection() } FormatTime(etr, (int) (time_remaining / ship->RepairSpeed())); - repair_queue->AddItem(Game::GetText(sys->Name())); + repair_queue->AddItem(Game::GetInstance()->GetText(sys->Name())); repair_queue->SetItemText(i, 1, etr); i++; } @@ -649,7 +649,7 @@ EngDlg::OnSource(AWEvent* event) int index = 0; ListIter comp = selected_source->GetComponents(); while (++comp) - components->AddItemWithData(Game::GetText(comp->Abbreviation()), index++); + components->AddItemWithData(Game::GetInstance()->GetText(comp->Abbreviation()), index++); } } } @@ -702,7 +702,7 @@ EngDlg::OnClient(AWEvent* event) int index = 0; ListIter comp = sink->GetComponents(); while (++comp) - components->AddItemWithData(Game::GetText(comp->Abbreviation()), index++); + components->AddItemWithData(Game::GetInstance()->GetText(comp->Abbreviation()), index++); } } } @@ -1007,7 +1007,7 @@ EngDlg::OnQueue(AWEvent* event) int index = 0; ListIter comp = selected_repair->GetComponents(); while (++comp) - components->AddItemWithData(Game::GetText(comp->Abbreviation()), index++); + components->AddItemWithData(Game::GetInstance()->GetText(comp->Abbreviation()), index++); } } -- cgit v1.1