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/Ship.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'Stars45/Ship.cpp') diff --git a/Stars45/Ship.cpp b/Stars45/Ship.cpp index 89b5dda..61765fd 100644 --- a/Stars45/Ship.cpp +++ b/Stars45/Ship.cpp @@ -73,6 +73,7 @@ #include "Joystick.h" #include "Bolt.h" #include "Game.h" +#include "ContentBundle.h" #include "Solid.h" #include "Shadow.h" #include "Skin.h" @@ -4049,17 +4050,17 @@ Ship::SetFLCSMode(int mode) if (dir && dir->Type() < SteerAI::SEEKER) { switch (flcs_mode) { - case FLCS_MANUAL: director_info = Game::GetInstance()->GetText("flcs.manual"); break; - case FLCS_AUTO: director_info = Game::GetInstance()->GetText("flcs.auto"); break; - case FLCS_HELM: director_info = Game::GetInstance()->GetText("flcs.helm"); break; - default: director_info = Game::GetInstance()->GetText("flcs.fault"); break; + case FLCS_MANUAL: director_info = ContentBundle::GetInstance()->GetText("flcs.manual"); break; + case FLCS_AUTO: director_info = ContentBundle::GetInstance()->GetText("flcs.auto"); break; + case FLCS_HELM: director_info = ContentBundle::GetInstance()->GetText("flcs.helm"); break; + default: director_info = ContentBundle::GetInstance()->GetText("flcs.fault"); break; } if (!flcs || !flcs->IsPowerOn()) - director_info = Game::GetInstance()->GetText("flcs.offline"); + director_info = ContentBundle::GetInstance()->GetText("flcs.offline"); else if (IsAirborne()) - director_info = Game::GetInstance()->GetText("flcs.atmospheric"); + director_info = ContentBundle::GetInstance()->GetText("flcs.atmospheric"); } if (flcs) @@ -5018,7 +5019,7 @@ Ship::SetControls(MotionController* m) Keyboard::FlushKeys(); m->Acquire(); dir = new(__FILE__,__LINE__) ShipCtrl(this, m); - director_info = Game::GetInstance()->GetText("flcs.auto"); + director_info = ContentBundle::GetInstance()->GetText("flcs.auto"); } else if (GetIFF() < 100) { if (IsStatic()) -- cgit v1.1