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/FighterTacticalAI.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'Stars45/FighterTacticalAI.cpp') diff --git a/Stars45/FighterTacticalAI.cpp b/Stars45/FighterTacticalAI.cpp index 3054e92..46aef0b 100644 --- a/Stars45/FighterTacticalAI.cpp +++ b/Stars45/FighterTacticalAI.cpp @@ -132,12 +132,12 @@ FighterTacticalAI::CheckFlightPlan() } switch (roe) { - case NONE: ship->SetDirectorInfo(Game::GetText("ai.none")); break; - case SELF_DEFENSIVE: ship->SetDirectorInfo(Game::GetText("ai.self-defensive")); break; - case DEFENSIVE: ship->SetDirectorInfo(Game::GetText("ai.defensive")); break; - case DIRECTED: ship->SetDirectorInfo(Game::GetText("ai.directed")); break; - case FLEXIBLE: ship->SetDirectorInfo(Game::GetText("ai.flexible")); break; - default: ship->SetDirectorInfo(Game::GetText("ai.default")); break; + case NONE: ship->SetDirectorInfo(Game::GetInstance()->GetText("ai.none")); break; + case SELF_DEFENSIVE: ship->SetDirectorInfo(Game::GetInstance()->GetText("ai.self-defensive")); break; + case DEFENSIVE: ship->SetDirectorInfo(Game::GetInstance()->GetText("ai.defensive")); break; + case DIRECTED: ship->SetDirectorInfo(Game::GetInstance()->GetText("ai.directed")); break; + case FLEXIBLE: ship->SetDirectorInfo(Game::GetInstance()->GetText("ai.flexible")); break; + default: ship->SetDirectorInfo(Game::GetInstance()->GetText("ai.default")); break; } return (navpt != 0); @@ -153,9 +153,9 @@ FighterTacticalAI::SelectTarget() SimObject* target = ship_ai->GetTarget(); if (target && (target->Type() == SimObject::SIM_SHIP) && - (Game::GameTime() - secondary_selection_time) > THREAT_REACTION_TIME) { + (Game::GetInstance()->GameTime() - secondary_selection_time) > THREAT_REACTION_TIME) { SelectSecondaryForTarget((Ship*) target); - secondary_selection_time = Game::GameTime(); + secondary_selection_time = Game::GetInstance()->GameTime(); } } @@ -474,7 +474,7 @@ FighterTacticalAI::FindThreat() Contact* contact = c_iter.value(); if (contact->Threat(ship) && - (Game::GameTime() - contact->AcquisitionTime()) > THREAT_REACTION_TIME) { + (Game::GetInstance()->GameTime() - contact->AcquisitionTime()) > THREAT_REACTION_TIME) { double rng = contact->Range(ship); -- cgit v1.1