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/NetClientDlg.cpp | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'Stars45/NetClientDlg.cpp') diff --git a/Stars45/NetClientDlg.cpp b/Stars45/NetClientDlg.cpp index 8b64ca5..7597a2c 100644 --- a/Stars45/NetClientDlg.cpp +++ b/Stars45/NetClientDlg.cpp @@ -23,6 +23,7 @@ #include "NetAddr.h" #include "DataLoader.h" +#include "ContentBundle.h" #include "Button.h" #include "ListBox.h" #include "Slider.h" @@ -168,9 +169,9 @@ NetClientDlg::ShowServers() lst_servers->AddItemWithData(info->name, (DWORD) i); lst_servers->SetItemText(i, 1, info->type); lst_servers->SetItemText(i, 2, info->password); - lst_servers->SetItemText(i, 3, Game::GetInstance()->GetText("NetClientDlg.offline")); + lst_servers->SetItemText(i, 3, ContentBundle::GetInstance()->GetText("NetClientDlg.offline")); lst_servers->SetItemText(i, 4, "0"); - lst_servers->SetItemText(i, 5, Game::GetInstance()->GetText("NetClientDlg.not-avail")); + lst_servers->SetItemText(i, 5, ContentBundle::GetInstance()->GetText("NetClientDlg.not-avail")); i++; } @@ -199,7 +200,7 @@ NetClientDlg::UpdateServers() NetServerInfo* info = config->GetServerList().at(n); lst_servers->SetItemText(i, 0, info->name); - Text status = Game::GetInstance()->GetText("NetClientDlg.offline"); + Text status = ContentBundle::GetInstance()->GetText("NetClientDlg.offline"); if (info->ping_time > 0 && info->ping_time < 10000) { char buffer[32]; @@ -208,16 +209,16 @@ NetClientDlg::UpdateServers() switch (info->status) { default: - case NetServerInfo::OFFLINE: status = Game::GetInstance()->GetText("NetClientDlg.offline"); break; - case NetServerInfo::LOBBY: status = Game::GetInstance()->GetText("NetClientDlg.lobby"); break; - case NetServerInfo::BRIEFING: status = Game::GetInstance()->GetText("NetClientDlg.briefing"); break; - case NetServerInfo::ACTIVE: status = Game::GetInstance()->GetText("NetClientDlg.active"); break; - case NetServerInfo::DEBRIEFING: status = Game::GetInstance()->GetText("NetClientDlg.debriefing"); break; - case NetServerInfo::PERSISTENT: status = Game::GetInstance()->GetText("NetClientDlg.persistent"); break; + case NetServerInfo::OFFLINE: status = ContentBundle::GetInstance()->GetText("NetClientDlg.offline"); break; + case NetServerInfo::LOBBY: status = ContentBundle::GetInstance()->GetText("NetClientDlg.lobby"); break; + case NetServerInfo::BRIEFING: status = ContentBundle::GetInstance()->GetText("NetClientDlg.briefing"); break; + case NetServerInfo::ACTIVE: status = ContentBundle::GetInstance()->GetText("NetClientDlg.active"); break; + case NetServerInfo::DEBRIEFING: status = ContentBundle::GetInstance()->GetText("NetClientDlg.debriefing"); break; + case NetServerInfo::PERSISTENT: status = ContentBundle::GetInstance()->GetText("NetClientDlg.persistent"); break; } } else { - lst_servers->SetItemText(i, 5, Game::GetInstance()->GetText("NetClientDlg.not-avail")); + lst_servers->SetItemText(i, 5, ContentBundle::GetInstance()->GetText("NetClientDlg.not-avail")); } lst_servers->SetItemText(i, 3, status); -- cgit v1.1