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/FltDlg.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'Stars45/FltDlg.cpp') diff --git a/Stars45/FltDlg.cpp b/Stars45/FltDlg.cpp index a62853e..44770b2 100644 --- a/Stars45/FltDlg.cpp +++ b/Stars45/FltDlg.cpp @@ -28,6 +28,7 @@ #include "NetUtil.h" #include "Game.h" +#include "ContentBundle.h" #include "Button.h" #include "ListBox.h" #include "ComboBox.h" @@ -140,8 +141,8 @@ FltDlg::SetShip(Ship* s) filter_list->AddItem(filter); } - filter_list->AddItem(Game::GetInstance()->GetText("FltDlg.PENDING")); - filter_list->AddItem(Game::GetInstance()->GetText("FltDlg.ACTIVE")); + filter_list->AddItem(ContentBundle::GetInstance()->GetText("FltDlg.PENDING")); + filter_list->AddItem(ContentBundle::GetInstance()->GetText("FltDlg.ACTIVE")); } flight_planner = new(__FILE__,__LINE__) FlightPlanner(ship); @@ -291,7 +292,7 @@ FltDlg::UpdateSelection() } else { hangar_list->SetItemText(item, 1, "--"); - hangar_list->SetItemText(item, 2, Game::GetInstance()->GetText("FltDlg.Open")); + hangar_list->SetItemText(item, 2, ContentBundle::GetInstance()->GetText("FltDlg.Open")); } FormatTime(txt, time); @@ -479,7 +480,7 @@ FltDlg::UpdateObjective() FormatNumber(txt, r); } else { - strcpy_s(txt, Game::GetInstance()->GetText("FltDlg.Unknown").data()); + strcpy_s(txt, ContentBundle::GetInstance()->GetText("FltDlg.Unknown").data()); r = 2e9; } } @@ -592,7 +593,7 @@ FltDlg::OnFilter(AWEvent* event) } else { hangar_list->SetItemText(item, 1, "--"); - hangar_list->SetItemText(item, 2, Game::GetInstance()->GetText("FltDlg.Open")); + hangar_list->SetItemText(item, 2, ContentBundle::GetInstance()->GetText("FltDlg.Open")); } @@ -993,7 +994,7 @@ FltDlg::OnMissionType(AWEvent* event) FormatNumber(txt, r); } else { - strcpy_s(txt, Game::GetInstance()->GetText("FltDlg.Unknown").data()); + strcpy_s(txt, ContentBundle::GetInstance()->GetText("FltDlg.Unknown").data()); r = 2e9; } } -- cgit v1.1