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/CarrierAI.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'Stars45/CarrierAI.cpp') diff --git a/Stars45/CarrierAI.cpp b/Stars45/CarrierAI.cpp index 4f7e1b7..d7194a4 100644 --- a/Stars45/CarrierAI.cpp +++ b/Stars45/CarrierAI.cpp @@ -49,7 +49,7 @@ CarrierAI::CarrierAI(Ship* s, int level) if (ship) flight_planner = new(__FILE__,__LINE__) FlightPlanner(ship); - hold_time = (int) Game::GameTime(); + hold_time = (int) Game::GetInstance()->GameTime(); } } @@ -69,13 +69,13 @@ CarrierAI::ExecFrame(double secs) if (!sim || !ship || !hangar) return; - if (((int) Game::GameTime() - hold_time >= INIT_HOLD) && - ((int) Game::GameTime() - exec_time > EXEC_PERIOD)) { + if (((int) Game::GetInstance()->GameTime() - hold_time >= INIT_HOLD) && + ((int) Game::GetInstance()->GameTime() - exec_time > EXEC_PERIOD)) { CheckHostileElements(); CheckPatrolCoverage(); - exec_time = (int) Game::GameTime(); + exec_time = (int) Game::GetInstance()->GameTime(); } } @@ -132,7 +132,7 @@ CarrierAI::CheckPatrolCoverage() } } - else if (Game::GameTime() - hangar->GetLastPatrolLaunch() > PATROL_PERIOD || + else if (Game::GetInstance()->GameTime() - hangar->GetLastPatrolLaunch() > PATROL_PERIOD || hangar->GetLastPatrolLaunch() == 0) { Element* patrol = CreatePackage(0, 2, Mission::PATROL, 0, "ACM Medium Range"); if (patrol) { @@ -141,7 +141,7 @@ CarrierAI::CheckPatrolCoverage() if (flight_planner) flight_planner->CreatePatrolRoute(patrol, i); - hangar->SetLastPatrolLaunch(Game::GameTime()); + hangar->SetLastPatrolLaunch(Game::GetInstance()->GameTime()); return true; } } @@ -194,7 +194,7 @@ CarrierAI::CheckHostileElements() // nobody is assigned yet, create an attack package if (!found && CreateStrike(elem)) { - hold_time = (int) Game::GameTime() + 30000; + hold_time = (int) Game::GetInstance()->GameTime() + 30000; return true; } } -- cgit v1.1