Switched to use GetIntance for Game instead of static methods

1 files changed, 30 insertions, 30 deletions

diff --git a/Stars45/Ship.cpp b/Stars45/Ship.cpp
index 24255a5..89b5dda 100644
--- a/Stars45/Ship.cpp
+++ b/Stars45/Ship.cpp
@@ -1041,7 +1041,7 @@ Ship::ClearTrack()
 
     track[0] = Location();
     ntrack   = 1;
-    track_time = Game::GameTime();
+    track_time = Game::GetInstance()->GameTime();
 }
 
 void
@@ -1050,7 +1050,7 @@ Ship::UpdateTrack()
     const int DEFAULT_TRACK_UPDATE = 500; // milliseconds
     const int DEFAULT_TRACK_LENGTH =  20; // 10 seconds
 
-    DWORD time = Game::GameTime();
+    DWORD time = Game::GetInstance()->GameTime();
 
     if (!track) {
         track = new(__FILE__,__LINE__) Point[DEFAULT_TRACK_LENGTH];
@@ -1321,7 +1321,7 @@ void
 Ship::SetFlightPhase(OP_MODE phase)
 {
     if (phase == ACTIVE && !launch_time) {
-        launch_time  = Game::GameTime() + 1;
+        launch_time  = Game::GetInstance()->GameTime() + 1;
         dock         = 0;
 
         if (element)
@@ -1641,8 +1641,8 @@ Ship::HitBy(Shot* shot, Point& impact)
                         RadioMessage* warn = new(__FILE__,__LINE__) RadioMessage(s, this, RadioMessage::DECLARE_ROGUE);
                         RadioTraffic::Transmit(warn);
                     }
-                    else if (!s->IsRogue() && (Game::GameTime() - ff_warn_time) > 5000) {
-                        ff_warn_time = Game::GameTime();
+                    else if (!s->IsRogue() && (Game::GetInstance()->GameTime() - ff_warn_time) > 5000) {
+                        ff_warn_time = Game::GetInstance()->GameTime();
 
                         RadioMessage* warn = 0;
                         if (s->GetTarget() == this)
@@ -1954,7 +1954,7 @@ Ship::CheckFriendlyFire()
     return;
 
     // only check once each second
-    if (Game::GameTime() - friendly_fire_time < 1000)
+    if (Game::GetInstance()->GameTime() - friendly_fire_time < 1000)
     return;
 
     List<Weapon>   w_list;
@@ -2011,7 +2011,7 @@ Ship::CheckFriendlyFire()
         }
     }
 
-    friendly_fire_time = Game::GameTime() + (DWORD) Random(0, 500);
+    friendly_fire_time = Game::GetInstance()->GameTime() + (DWORD) Random(0, 500);
 }
 
 // +----------------------------------------------------------------------+
@@ -2611,11 +2611,11 @@ Ship::ExecEvalFrame(double seconds)
     static DWORD last_eval_frame = 0;      // one ship per game frame
 
     if (element && element->NumObjectives() > 0            &&
-            Game::GameTime() - last_eval_time > EVAL_FREQUENCY &&
-            last_eval_frame != Game::Frame()) {
+            Game::GetInstance()->GameTime() - last_eval_time > EVAL_FREQUENCY &&
+            last_eval_frame != Game::GetInstance()->Frame()) {
 
-        last_eval_time  = Game::GameTime();
-        last_eval_frame = Game::Frame();
+        last_eval_time  = Game::GetInstance()->GameTime();
+        last_eval_frame = Game::GetInstance()->Frame();
 
         for (int i = 0; i < element->NumObjectives(); i++) {
             Instruction* obj = element->GetObjective(i);
@@ -3025,7 +3025,7 @@ Ship::StatFrame(double seconds)
 {
     if (flight_phase != ACTIVE) {
         flight_phase = ACTIVE;
-        launch_time  = Game::GameTime() + 1;
+        launch_time  = Game::GetInstance()->GameTime() + 1;
 
         if (element)
         element->SetLaunchTime(launch_time);
@@ -3583,7 +3583,7 @@ Ship::TimeSkip()
 {
     if (CanTimeSkip()) {
         // go back to regular time before performing the skip:
-        Game::SetTimeCompression(1);
+        Game::GetInstance()->SetTimeCompression(1);
 
         transition_time = 7.5f;
         transition_type = TRANSITION_TIME_SKIP;
@@ -4049,17 +4049,17 @@ Ship::SetFLCSMode(int mode)
 
     if (dir && dir->Type() < SteerAI::SEEKER) {
         switch (flcs_mode) {
-        case FLCS_MANUAL:    director_info = Game::GetText("flcs.manual"); break;
-        case FLCS_AUTO:      director_info = Game::GetText("flcs.auto");   break;
-        case FLCS_HELM:      director_info = Game::GetText("flcs.helm");   break;
-        default:             director_info = Game::GetText("flcs.fault");  break;
+        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;
         }
 
         if (!flcs || !flcs->IsPowerOn())
-        director_info = Game::GetText("flcs.offline");
+        director_info = Game::GetInstance()->GetText("flcs.offline");
 
         else if (IsAirborne())
-        director_info = Game::GetText("flcs.atmospheric");
+        director_info = Game::GetInstance()->GetText("flcs.atmospheric");
     }
 
     if (flcs)
@@ -4493,7 +4493,7 @@ Ship::InflictDamage(double damage, Shot* shot, int hit_type, Point impact)
 {
     double damage_applied = 0;
 
-    if (Game::Paused() || IsNetObserver() || IsInvulnerable())
+    if (Game::GetInstance()->Paused() || IsNetObserver() || IsInvulnerable())
     return damage_applied;
 
     if (Integrity() == 0) // already dead?
@@ -4514,26 +4514,26 @@ Ship::InflictDamage(double damage, Shot* shot, int hit_type, Point impact)
         if (shot) {
             if (shot->IsBeam()) {
                 if (design->beam_hit_sound_resource) {
-                    if (Game::RealTime() - last_beam_time > 400) {
+                    if (Game::GetInstance()->RealTime() - last_beam_time > 400) {
                         Sound* s = design->beam_hit_sound_resource->Duplicate();
                         s->SetLocation(impact);
                         s->SetVolume(AudioConfig::EfxVolume());
                         s->Play();
 
-                        last_beam_time = Game::RealTime();
+                        last_beam_time = Game::GetInstance()->RealTime();
                     }
                 }
             }
 
             else {
                 if (design->bolt_hit_sound_resource) {
-                    if (Game::RealTime() - last_bolt_time > 400) {
+                    if (Game::GetInstance()->RealTime() - last_bolt_time > 400) {
                         Sound* s = design->bolt_hit_sound_resource->Duplicate();
                         s->SetLocation(impact);
                         s->SetVolume(AudioConfig::EfxVolume());
                         s->Play();
 
-                        last_bolt_time = Game::RealTime();
+                        last_bolt_time = Game::GetInstance()->RealTime();
                     }
                 }
             }
@@ -4812,11 +4812,11 @@ Ship::ExecMaintFrame(double seconds)
     static DWORD last_repair_frame = 0;     // one ship per game frame
 
     if (auto_repair &&
-            Game::GameTime() - last_repair_time > REPAIR_FREQUENCY &&
-            last_repair_frame != Game::Frame()) {
+            Game::GetInstance()->GameTime() - last_repair_time > REPAIR_FREQUENCY &&
+            last_repair_frame != Game::GetInstance()->Frame()) {
 
-        last_repair_time  = Game::GameTime();
-        last_repair_frame = Game::Frame();
+        last_repair_time  = Game::GetInstance()->GameTime();
+        last_repair_frame = Game::GetInstance()->Frame();
 
         ListIter<System> iter = systems;
         while (++iter) {
@@ -5018,7 +5018,7 @@ Ship::SetControls(MotionController* m)
         Keyboard::FlushKeys();
         m->Acquire();
         dir = new(__FILE__,__LINE__) ShipCtrl(this, m);
-        director_info = Game::GetText("flcs.auto");
+        director_info = Game::GetInstance()->GetText("flcs.auto");
     }
     else if (GetIFF() < 100) {
         if (IsStatic())
@@ -5197,7 +5197,7 @@ DWORD
 Ship::MissionClock() const
 {
     if (launch_time > 0)
-    return Game::GameTime() + 1 - launch_time;
+    return Game::GetInstance()->GameTime() + 1 - launch_time;
 
     return 0;
 }