1 files changed, 14 insertions, 13 deletions

diff --git a/Stars45/EngDlg.cpp b/Stars45/EngDlg.cpp
index 545b925..8bd865d 100644
--- a/Stars45/EngDlg.cpp
+++ b/Stars45/EngDlg.cpp
@@ -19,6 +19,7 @@
 #include "Component.h"
 #include "Sim.h"
 
+#include "ContentBundle.h"
 #include "DataLoader.h"
 #include "Button.h"
 #include "ListBox.h"
@@ -251,7 +252,7 @@ EngDlg::UpdateRouteTables()
             PowerSource* reactor = reactor_iter.value();
 
             if (sources[reactor_index] && clients[reactor_index]) {
-                sources[reactor_index]->SetText(Game::GetInstance()->GetText(reactor->Abbreviation()));
+                sources[reactor_index]->SetText(ContentBundle::GetInstance()->GetText(reactor->Abbreviation()));
                 sources[reactor_index]->Show();
 
                 source_levels[reactor_index]->Show();
@@ -264,9 +265,9 @@ EngDlg::UpdateRouteTables()
                 while (++client) {
                     char abrv[64], num[20];
                     FormatNumber(num, client->GetPowerLevel());
-                    strcpy_s(abrv, Game::GetInstance()->GetText(client->Name()));
+                    strcpy_s(abrv, ContentBundle::GetInstance()->GetText(client->Name()));
 
-                    clients[reactor_index]->AddItemWithData(Game::GetInstance()->GetText(abrv), index);
+                    clients[reactor_index]->AddItemWithData(ContentBundle::GetInstance()->GetText(abrv), index);
                     clients[reactor_index]->SetItemText(index, 1, num);
                     clients[reactor_index]->SetItemData(index, 1, (DWORD) client->GetPowerLevel());
 
@@ -357,7 +358,7 @@ EngDlg::UpdateSelection()
 
     // update the detail info:
     if (selected_source) {
-        selected_name->SetText(Game::GetInstance()->GetText(selected_source->Name()));
+        selected_name->SetText(ContentBundle::GetInstance()->GetText(selected_source->Name()));
         power_off->SetEnabled(true);
         power_on->SetEnabled(true);
         override->SetEnabled(true);
@@ -409,7 +410,7 @@ EngDlg::UpdateSelection()
                 case Component::REPAIR:    stat = "MAINT";   c = Color::Cyan;      break;
                 }
 
-                stat = Game::GetInstance()->GetText(Text("EngDlg.") + stat);
+                stat = ContentBundle::GetInstance()->GetText(Text("EngDlg.") + stat);
                 components->SetItemText(i, 1, stat);
                 components->SetItemData(i, 1, (int) comp->Status());
 
@@ -424,7 +425,7 @@ EngDlg::UpdateSelection()
     else if (selected_clients.size() == 1) {
         System* sink = selected_clients[0];
 
-        selected_name->SetText(Game::GetInstance()->GetText(sink->Name()));
+        selected_name->SetText(ContentBundle::GetInstance()->GetText(sink->Name()));
         power_off->SetEnabled(true);
         power_on->SetEnabled(true);
         override->SetEnabled(true);
@@ -476,7 +477,7 @@ EngDlg::UpdateSelection()
                 case Component::REPAIR:    stat = "MAINT";   c = Color::Cyan;      break;
                 }
 
-                stat = Game::GetInstance()->GetText(Text("EngDlg.") + stat);
+                stat = ContentBundle::GetInstance()->GetText(Text("EngDlg.") + stat);
                 components->SetItemText(i, 1, stat);
                 components->SetItemData(i, 1, (int) comp->Status());
 
@@ -491,7 +492,7 @@ EngDlg::UpdateSelection()
     else if (selected_clients.size() > 1) {
         System* sink = selected_clients[0];
 
-        selected_name->SetText(Game::GetInstance()->GetText("[Multiple]"));
+        selected_name->SetText(ContentBundle::GetInstance()->GetText("[Multiple]"));
         power_off->SetEnabled(true);
         power_on->SetEnabled(true);
         override->SetEnabled(true);
@@ -527,7 +528,7 @@ EngDlg::UpdateSelection()
     }
 
     else {
-        selected_name->SetText(Game::GetInstance()->GetText("No Selection"));
+        selected_name->SetText(ContentBundle::GetInstance()->GetText("No Selection"));
         power_off->SetEnabled(false);
         power_off->SetButtonState(0);
         power_on->SetEnabled(false);
@@ -564,7 +565,7 @@ EngDlg::UpdateSelection()
                 }
 
                 FormatTime(etr, (int) (time_remaining / ship->RepairSpeed()));
-                repair_queue->AddItem(Game::GetInstance()->GetText(sys->Name()));
+                repair_queue->AddItem(ContentBundle::GetInstance()->GetText(sys->Name()));
                 repair_queue->SetItemText(i, 1, etr);
                 i++;
             }
@@ -649,7 +650,7 @@ EngDlg::OnSource(AWEvent* event)
             int index = 0;
             ListIter<Component> comp = selected_source->GetComponents();
             while (++comp)
-            components->AddItemWithData(Game::GetInstance()->GetText(comp->Abbreviation()), index++);
+            components->AddItemWithData(ContentBundle::GetInstance()->GetText(comp->Abbreviation()), index++);
         }
     }
 }
@@ -702,7 +703,7 @@ EngDlg::OnClient(AWEvent* event)
                 int index = 0;
                 ListIter<Component> comp = sink->GetComponents();
                 while (++comp)
-                components->AddItemWithData(Game::GetInstance()->GetText(comp->Abbreviation()), index++);
+                components->AddItemWithData(ContentBundle::GetInstance()->GetText(comp->Abbreviation()), index++);
             }
         }
     }
@@ -1007,7 +1008,7 @@ EngDlg::OnQueue(AWEvent* event)
             int index = 0;
             ListIter<Component> comp = selected_repair->GetComponents();
             while (++comp)
-            components->AddItemWithData(Game::GetInstance()->GetText(comp->Abbreviation()), index++);
+            components->AddItemWithData(ContentBundle::GetInstance()->GetText(comp->Abbreviation()), index++);
         }
     }