Switched to use ContentBundle's GetText

1 files changed, 33 insertions, 32 deletions

diff --git a/Stars45/Instruction.cpp b/Stars45/Instruction.cpp
index 368cbf5..5b17203 100644
--- a/Stars45/Instruction.cpp
+++ b/Stars45/Instruction.cpp
@@ -19,6 +19,7 @@
 #include "Sim.h"
 
 #include "Game.h"
+#include "ContentBundle.h"
 #include "Text.h"
 
 // +----------------------------------------------------------------------+
@@ -340,67 +341,67 @@ Instruction::GetShortDescription() const
     switch (action) {
     case VECTOR:
         if (farcast)
-        sprintf_s(desc, Game::GetInstance()->GetText("instr.short.farcast").data(), rgn_name.data());
+        sprintf_s(desc, ContentBundle::GetInstance()->GetText("instr.short.farcast").data(), rgn_name.data());
         else
-        sprintf_s(desc, Game::GetInstance()->GetText("instr.short.vector").data(), rgn_name.data());
+        sprintf_s(desc, ContentBundle::GetInstance()->GetText("instr.short.vector").data(), rgn_name.data());
         break;
 
     case LAUNCH:
-        sprintf_s(desc, Game::GetInstance()->GetText("instr.short.launch").data(), tgt_name.data());
+        sprintf_s(desc, ContentBundle::GetInstance()->GetText("instr.short.launch").data(), tgt_name.data());
         break;
 
     case DOCK:
-        sprintf_s(desc, Game::GetInstance()->GetText("instr.short.dock").data(), tgt_name.data());
+        sprintf_s(desc, ContentBundle::GetInstance()->GetText("instr.short.dock").data(), tgt_name.data());
         break;
 
     case RTB:
-        sprintf_s(desc, Game::GetInstance()->GetText("instr.short.return-to-base").data());
+        sprintf_s(desc, ContentBundle::GetInstance()->GetText("instr.short.return-to-base").data());
         break;
 
     case DEFEND:
         if (priority == PRIMARY) {
-            sprintf_s(desc, Game::GetInstance()->GetText("instr.short.defend").data(), ActionName(action), tgt_desc.data());
+            sprintf_s(desc, ContentBundle::GetInstance()->GetText("instr.short.defend").data(), ActionName(action), tgt_desc.data());
         }
         else {
-            sprintf_s(desc, Game::GetInstance()->GetText("instr.short.protect").data(), tgt_desc.data());
+            sprintf_s(desc, ContentBundle::GetInstance()->GetText("instr.short.protect").data(), tgt_desc.data());
         }
         break;
 
     case ESCORT:
         if (priority == PRIMARY) {
-            sprintf_s(desc, Game::GetInstance()->GetText("instr.short.escort").data(), ActionName(action), tgt_desc.data());
+            sprintf_s(desc, ContentBundle::GetInstance()->GetText("instr.short.escort").data(), ActionName(action), tgt_desc.data());
         }
         else {
-            sprintf_s(desc, Game::GetInstance()->GetText("instr.short.protect").data(), tgt_desc.data());
+            sprintf_s(desc, ContentBundle::GetInstance()->GetText("instr.short.protect").data(), tgt_desc.data());
         }
         break;
 
     case PATROL:
-        sprintf_s(desc, Game::GetInstance()->GetText("instr.short.patrol").data(),
+        sprintf_s(desc, ContentBundle::GetInstance()->GetText("instr.short.patrol").data(),
         tgt_desc.data(),
         rgn_name.data());
         break;
 
     case SWEEP:
-        sprintf_s(desc, Game::GetInstance()->GetText("instr.short.sweep").data(),
+        sprintf_s(desc, ContentBundle::GetInstance()->GetText("instr.short.sweep").data(),
         tgt_desc.data(),
         rgn_name.data());
         break;
 
     case INTERCEPT:
-        sprintf_s(desc, Game::GetInstance()->GetText("instr.short.intercept").data(), tgt_desc.data());
+        sprintf_s(desc, ContentBundle::GetInstance()->GetText("instr.short.intercept").data(), tgt_desc.data());
         break;
 
     case STRIKE:
-        sprintf_s(desc, Game::GetInstance()->GetText("instr.short.strike").data(), tgt_desc.data());
+        sprintf_s(desc, ContentBundle::GetInstance()->GetText("instr.short.strike").data(), tgt_desc.data());
         break;
 
     case ASSAULT:
-        sprintf_s(desc, Game::GetInstance()->GetText("instr.short.assault").data(), tgt_desc.data());
+        sprintf_s(desc, ContentBundle::GetInstance()->GetText("instr.short.assault").data(), tgt_desc.data());
         break;
 
     case RECON:
-        sprintf_s(desc, Game::GetInstance()->GetText("instr.short.recon").data(), tgt_desc.data());
+        sprintf_s(desc, ContentBundle::GetInstance()->GetText("instr.short.recon").data(), tgt_desc.data());
         break;
 
     default:
@@ -410,7 +411,7 @@ Instruction::GetShortDescription() const
 
     if (status != PENDING) {
         strcat_s(desc, " - ");
-        strcat_s(desc, Game::GetInstance()->GetText(StatusName(status)));
+        strcat_s(desc, ContentBundle::GetInstance()->GetText(StatusName(status)));
     }
 
     return desc;
@@ -426,67 +427,67 @@ Instruction::GetDescription() const
     switch (action) {
     case VECTOR:
         if (farcast)
-        sprintf_s(desc, Game::GetInstance()->GetText("instr.long.farcast").data(), rgn_name.data());
+        sprintf_s(desc, ContentBundle::GetInstance()->GetText("instr.long.farcast").data(), rgn_name.data());
         else
-        sprintf_s(desc, Game::GetInstance()->GetText("instr.long.vector").data(), rgn_name.data());
+        sprintf_s(desc, ContentBundle::GetInstance()->GetText("instr.long.vector").data(), rgn_name.data());
         break;
 
     case LAUNCH:
-        sprintf_s(desc, Game::GetInstance()->GetText("instr.long.launch").data(), tgt_name.data());
+        sprintf_s(desc, ContentBundle::GetInstance()->GetText("instr.long.launch").data(), tgt_name.data());
         break;
 
     case DOCK:
-        sprintf_s(desc, Game::GetInstance()->GetText("instr.long.dock").data(), tgt_name.data());
+        sprintf_s(desc, ContentBundle::GetInstance()->GetText("instr.long.dock").data(), tgt_name.data());
         break;
 
     case RTB:
-        sprintf_s(desc, Game::GetInstance()->GetText("instr.long.return-to-base").data());
+        sprintf_s(desc, ContentBundle::GetInstance()->GetText("instr.long.return-to-base").data());
         break;
 
     case DEFEND:
         if (priority == PRIMARY) {
-            sprintf_s(desc, Game::GetInstance()->GetText("instr.long.defend").data(), ActionName(action), tgt_desc.data());
+            sprintf_s(desc, ContentBundle::GetInstance()->GetText("instr.long.defend").data(), ActionName(action), tgt_desc.data());
         }
         else {
-            sprintf_s(desc, Game::GetInstance()->GetText("instr.long.protect").data(), tgt_desc.data());
+            sprintf_s(desc, ContentBundle::GetInstance()->GetText("instr.long.protect").data(), tgt_desc.data());
         }
         break;
 
     case ESCORT:
         if (priority == PRIMARY) {
-            sprintf_s(desc, Game::GetInstance()->GetText("instr.long.escort").data(), ActionName(action), tgt_desc.data());
+            sprintf_s(desc, ContentBundle::GetInstance()->GetText("instr.long.escort").data(), ActionName(action), tgt_desc.data());
         }
         else {
-            sprintf_s(desc, Game::GetInstance()->GetText("instr.long.protect").data(), tgt_desc.data());
+            sprintf_s(desc, ContentBundle::GetInstance()->GetText("instr.long.protect").data(), tgt_desc.data());
         }
         break;
 
     case PATROL:
-        sprintf_s(desc, Game::GetInstance()->GetText("instr.long.patrol").data(),
+        sprintf_s(desc, ContentBundle::GetInstance()->GetText("instr.long.patrol").data(),
         tgt_desc.data(),
         rgn_name.data());
         break;
 
     case SWEEP:
-        sprintf_s(desc, Game::GetInstance()->GetText("instr.long.sweep").data(),
+        sprintf_s(desc, ContentBundle::GetInstance()->GetText("instr.long.sweep").data(),
         tgt_desc.data(),
         rgn_name.data());
         break;
 
     case INTERCEPT:
-        sprintf_s(desc, Game::GetInstance()->GetText("instr.long.intercept").data(), tgt_desc.data());
+        sprintf_s(desc, ContentBundle::GetInstance()->GetText("instr.long.intercept").data(), tgt_desc.data());
         break;
 
     case STRIKE:
-        sprintf_s(desc, Game::GetInstance()->GetText("instr.long.strike").data(), tgt_desc.data());
+        sprintf_s(desc, ContentBundle::GetInstance()->GetText("instr.long.strike").data(), tgt_desc.data());
         break;
 
     case ASSAULT:
-        sprintf_s(desc, Game::GetInstance()->GetText("instr.long.assault").data(), tgt_desc.data());
+        sprintf_s(desc, ContentBundle::GetInstance()->GetText("instr.long.assault").data(), tgt_desc.data());
         break;
 
     case RECON:
-        sprintf_s(desc, Game::GetInstance()->GetText("instr.long.recon").data(), tgt_desc.data());
+        sprintf_s(desc, ContentBundle::GetInstance()->GetText("instr.long.recon").data(), tgt_desc.data());
         break;
 
     default:
@@ -496,7 +497,7 @@ Instruction::GetDescription() const
 
     if (status != PENDING) {
         strcat_s(desc, " - ");
-        strcat_s(desc, Game::GetInstance()->GetText(StatusName(status)));
+        strcat_s(desc, ContentBundle::GetInstance()->GetText(StatusName(status)));
     }
 
     return desc;