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/JoyDlg.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'Stars45/JoyDlg.cpp') diff --git a/Stars45/JoyDlg.cpp b/Stars45/JoyDlg.cpp index acb2f93..bf6de68 100644 --- a/Stars45/JoyDlg.cpp +++ b/Stars45/JoyDlg.cpp @@ -18,6 +18,7 @@ #include "FormatUtil.h" #include "Game.h" +#include "ContentBundle.h" #include "ListBox.h" #include "ComboBox.h" #include "Button.h" @@ -112,12 +113,12 @@ JoyDlg::ExecFrame() Button* b = axis_button[selected_axis]; if (sample_axis >= 0) { - b->SetText(Game::GetInstance()->GetText(joy_axis_names[sample_axis])); + b->SetText(ContentBundle::GetInstance()->GetText(joy_axis_names[sample_axis])); map_axis[selected_axis] = sample_axis; } else - b->SetText(Game::GetInstance()->GetText("JoyDlg.select")); + b->SetText(ContentBundle::GetInstance()->GetText("JoyDlg.select")); } } } @@ -136,11 +137,11 @@ JoyDlg::Show() int inv = Joystick::GetAxisInv(i); if (map >= 0 && map < 8) { - b->SetText(Game::GetInstance()->GetText(joy_axis_names[map])); + b->SetText(ContentBundle::GetInstance()->GetText(joy_axis_names[map])); map_axis[i] = map; } else { - b->SetText(Game::GetInstance()->GetText("JoyDlg.unmapped")); + b->SetText(ContentBundle::GetInstance()->GetText("JoyDlg.unmapped")); } b->SetButtonState(0); @@ -159,11 +160,11 @@ JoyDlg::OnAxis(AWEvent* event) { for (int i = 0; i < 4; i++) { int map = map_axis[i]; - Text name = Game::GetInstance()->GetText("JoyDlg.unmapped"); + Text name = ContentBundle::GetInstance()->GetText("JoyDlg.unmapped"); Button* b = axis_button[i]; if (map >= 0 && map < 8) - name = Game::GetInstance()->GetText(joy_axis_names[map]); + name = ContentBundle::GetInstance()->GetText(joy_axis_names[map]); if (b) { if (b == event->window) { @@ -173,7 +174,7 @@ JoyDlg::OnAxis(AWEvent* event) selected_axis = -1; } else { - b->SetText(Game::GetInstance()->GetText("JoyDlg.select")); + b->SetText(ContentBundle::GetInstance()->GetText("JoyDlg.select")); b->SetButtonState(1); selected_axis = i; } -- cgit v1.1