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/Drive.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'Stars45/Drive.cpp') diff --git a/Stars45/Drive.cpp b/Stars45/Drive.cpp index 8f33cac..e1aeb0e 100644 --- a/Stars45/Drive.cpp +++ b/Stars45/Drive.cpp @@ -75,16 +75,16 @@ Drive::Drive(SUBTYPE drive_type, float max_thrust, float max_aug, bool show) switch (drive_type) { default: - case PLASMA: name = Game::GetText("sys.drive.plasma"); break; - case FUSION: name = Game::GetText("sys.drive.fusion"); break; - case GREEN: name = Game::GetText("sys.drive.green"); break; - case RED: name = Game::GetText("sys.drive.red"); break; - case BLUE: name = Game::GetText("sys.drive.blue"); break; - case YELLOW: name = Game::GetText("sys.drive.yellow"); break; - case STEALTH: name = Game::GetText("sys.drive.stealth"); break; + case PLASMA: name = Game::GetInstance()->GetText("sys.drive.plasma"); break; + case FUSION: name = Game::GetInstance()->GetText("sys.drive.fusion"); break; + case GREEN: name = Game::GetInstance()->GetText("sys.drive.green"); break; + case RED: name = Game::GetInstance()->GetText("sys.drive.red"); break; + case BLUE: name = Game::GetInstance()->GetText("sys.drive.blue"); break; + case YELLOW: name = Game::GetInstance()->GetText("sys.drive.yellow"); break; + case STEALTH: name = Game::GetInstance()->GetText("sys.drive.stealth"); break; } - abrv = Game::GetText("sys.drive.abrv"); + abrv = Game::GetInstance()->GetText("sys.drive.abrv"); emcon_power[0] = 0; emcon_power[1] = 50; @@ -439,7 +439,7 @@ Drive::Thrust(double seconds) CameraDirector* cam_dir = CameraDirector::GetInstance(); // no sound when paused! - if (!Game::Paused() && subtype != STEALTH && cam_dir && cam_dir->GetCamera()) { + if (!Game::GetInstance()->Paused() && subtype != STEALTH && cam_dir && cam_dir->GetCamera()) { if (ship && ship->GetRegion() == Sim::GetSim()->GetActiveRegion()) { if (!sound) { int sound_index = 0; -- cgit v1.1