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/QuitView.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'Stars45/QuitView.cpp') diff --git a/Stars45/QuitView.cpp b/Stars45/QuitView.cpp index f8e8e9e..4d02836 100644 --- a/Stars45/QuitView.cpp +++ b/Stars45/QuitView.cpp @@ -162,7 +162,7 @@ QuitView::ExecFrame() // exit and accept: if (action == 1) { CloseMenu(); - Game::SetTimeCompression(1); + Game::GetInstance()->SetTimeCompression(1); Starshatter* stars = Starshatter::GetInstance(); stars->SetGameMode(Starshatter::PLAN_MODE); @@ -171,7 +171,7 @@ QuitView::ExecFrame() // quit and discard results: else if (action == 2) { CloseMenu(); - Game::SetTimeCompression(1); + Game::GetInstance()->SetTimeCompression(1); Starshatter* stars = Starshatter::GetInstance(); Campaign* campaign = Campaign::GetCampaign(); @@ -228,8 +228,8 @@ QuitView::CanAccept() Ship* player_ship = sim->GetPlayerShip(); if (player_ship->MissionClock() < 60000) { - RadioView::Message(Game::GetText("QuitView.too-soon")); - RadioView::Message(Game::GetText("QuitView.abort")); + RadioView::Message(Game::GetInstance()->GetText("QuitView.too-soon")); + RadioView::Message(Game::GetInstance()->GetText("QuitView.abort")); return false; } @@ -240,8 +240,8 @@ QuitView::CanAccept() int ciff = c->GetIFF(player_ship); if (c->Threat(player_ship)) { - RadioView::Message(Game::GetText("QuitView.threats-present")); - RadioView::Message(Game::GetText("QuitView.abort")); + RadioView::Message(Game::GetInstance()->GetText("QuitView.threats-present")); + RadioView::Message(Game::GetInstance()->GetText("QuitView.abort")); return false; } @@ -250,14 +250,14 @@ QuitView::CanAccept() double dist = delta.length(); if (cship->IsDropship() && dist < 50e3) { - RadioView::Message(Game::GetText("QuitView.threats-present")); - RadioView::Message(Game::GetText("QuitView.abort")); + RadioView::Message(Game::GetInstance()->GetText("QuitView.threats-present")); + RadioView::Message(Game::GetInstance()->GetText("QuitView.abort")); return false; } else if (cship->IsStarship() && dist < 100e3) { - RadioView::Message(Game::GetText("QuitView.threats-present")); - RadioView::Message(Game::GetText("QuitView.abort")); + RadioView::Message(Game::GetInstance()->GetText("QuitView.threats-present")); + RadioView::Message(Game::GetInstance()->GetText("QuitView.abort")); return false; } } -- cgit v1.1