From 0052edae47d1e6ae613497c524719eff5838f52a Mon Sep 17 00:00:00 2001
From: Aki <please@ignore.pl>
Date: Fri, 18 Feb 2022 23:54:30 +0100
Subject: Switched to use GetIntance for Game instead of static methods

---
 Stars45/Campaign.cpp | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'Stars45/Campaign.cpp')

diff --git a/Stars45/Campaign.cpp b/Stars45/Campaign.cpp
index dd3f1af..ab65bbe 100644
--- a/Stars45/Campaign.cpp
+++ b/Stars45/Campaign.cpp
@@ -408,7 +408,7 @@ Campaign::Unload()
 {
     SetStatus(CAMPAIGN_INIT);
 
-    Game::ResetGameTime();
+    Game::GetInstance()->ResetGameTime();
     StarSystem::SetBaseTime(0);
 
     startTime = Stardate();
@@ -459,7 +459,7 @@ Campaign::LoadCampaign(DataLoader* loader, bool full)
                     }
                     else {
                         name = def->term()->isText()->value();
-                        name = Game::GetText(name);
+                        name = Game::GetInstance()->GetText(name);
                     }
                 }
                 else if (def->name()->value() == "desc") {
@@ -468,7 +468,7 @@ Campaign::LoadCampaign(DataLoader* loader, bool full)
                     }
                     else {
                         description = def->term()->isText()->value();
-                        description = Game::GetText(description);
+                        description = Game::GetInstance()->GetText(description);
                     }
                 }
                 else if (def->name()->value() == "situation") {
@@ -477,7 +477,7 @@ Campaign::LoadCampaign(DataLoader* loader, bool full)
                     }
                     else {
                         situation = def->term()->isText()->value();
-                        situation = Game::GetText(situation);
+                        situation = Game::GetInstance()->GetText(situation);
                     }
                 }
                 else if (def->name()->value() == "orders") {
@@ -486,7 +486,7 @@ Campaign::LoadCampaign(DataLoader* loader, bool full)
                     }
                     else {
                         orders = def->term()->isText()->value();
-                        orders = Game::GetText(orders);
+                        orders = Game::GetInstance()->GetText(orders);
                     }
                 }
                 else if (def->name()->value() == "scripted") {
@@ -777,7 +777,7 @@ Campaign::ParseAction(TermStruct* val, const char* filename)
             }
             else if (pdef->name()->value() == "text") {
                 GetDefText(text, pdef, filename);
-                text = Game::GetText(text);
+                text = Game::GetInstance()->GetText(text);
             }
             else if (pdef->name()->value() == "asset_id") {
                 GetDefNumber(asset_id, pdef, filename);
@@ -1022,13 +1022,13 @@ Campaign::LoadMissionList(DataLoader* loader)
 
                                 else if (pdef->name()->value() == "name") {
                                     GetDefText(name, pdef, filename);
-                                    name = Game::GetText(name);
+                                    name = Game::GetInstance()->GetText(name);
                                 }
 
                                 else if (pdef->name()->value() == "desc") {
                                     GetDefText(desc, pdef, filename);
                                     if (desc.length() > 0 && desc.length() < 32)
-                                    desc = Game::GetText(desc);
+                                    desc = Game::GetInstance()->GetText(desc);
                                 }
 
                                 else if (pdef->name()->value() == "start")
@@ -1137,7 +1137,7 @@ Campaign::LoadCustomMissions(DataLoader* loader)
                         if (def) {
                             if (def->name()->value() == "name") {
                                 GetDefText(name, def, filename);
-                                name = Game::GetText(name);
+                                name = Game::GetInstance()->GetText(name);
                             }
 
                             else if (def->name()->value() == "type") {
@@ -1152,7 +1152,7 @@ Campaign::LoadCustomMissions(DataLoader* loader)
                             else if (def->name()->value() == "desc") {
                                 GetDefText(desc, def, filename);
                                 if (desc.length() > 0 && desc.length() < 32)
-                                desc = Game::GetText(desc);
+                                desc = Game::GetInstance()->GetText(desc);
                             }
 
                             else if (def->name()->value() == "system")
@@ -1941,7 +1941,7 @@ Campaign::ExecFrame()
             else
             time += 20 * 3600;
 
-            StarSystem::SetBaseTime(startTime + time - Game::GameTime()/1000.0);
+            StarSystem::SetBaseTime(startTime + time - Game::GetInstance()->GameTime()/1000.0);
         }
         else {
             m.reset();
@@ -2043,7 +2043,7 @@ Campaign::StartMission()
         ::Print("\n\nCampaign Start Mission - %d. '%s'\n", m->Identity(), m->Name());
 
         if (!scripted) {
-            long double gtime = (long double) Game::GameTime() / 1000.0;
+            long double gtime = (long double) Game::GetInstance()->GameTime() / 1000.0;
             long double base  = startTime + m->Start() - 15 - gtime;
 
             StarSystem::SetBaseTime(base);
@@ -2070,7 +2070,7 @@ Campaign::RollbackMission()
 
     if (m) {
         if (!scripted) {
-            long double gtime = (long double) Game::GameTime() / 1000.0;
+            long double gtime = (long double) Game::GetInstance()->GameTime() / 1000.0;
             long double base  = startTime + m->Start() - 60 - gtime;
 
             StarSystem::SetBaseTime(base);
-- 
cgit v1.1