Switched to use ContentBundle's GetText

1 files changed, 13 insertions, 12 deletions

diff --git a/Stars45/NetGameClient.cpp b/Stars45/NetGameClient.cpp
index 1871057..4d9d5ae 100644
--- a/Stars45/NetGameClient.cpp
+++ b/Stars45/NetGameClient.cpp
@@ -40,6 +40,7 @@
 #include "NetPeer.h"
 
 #include "Game.h"
+#include "ContentBundle.h"
 #include "Light.h"
 
 // +--------------------------------------------------------------------+
@@ -159,10 +160,10 @@ NetGameClient::DoJoinAnnounce(NetMsg* msg)
         Ship* ship      = 0;
         char  ship_name[128];
 
-        strcpy_s(ship_name, Game::GetInstance()->GetText("NetGameClient.no-ship").data());
+        strcpy_s(ship_name, ContentBundle::GetInstance()->GetText("NetGameClient.no-ship").data());
 
         if (local_player && player_name == name) {
-            HUDView::Message(Game::GetInstance()->GetText("NetGameClient.local-accept"), name.data(), local_player->Name());
+            HUDView::Message(ContentBundle::GetInstance()->GetText("NetGameClient.local-accept"), name.data(), local_player->Name());
 
             objid = oid;
             netid = nid;
@@ -239,7 +240,7 @@ NetGameClient::DoJoinAnnounce(NetMsg* msg)
                         Print("Remote Player '%s' has joined as '%s' with ID %d\n", name.data(), ship_name, oid);
                     }
                     else {
-                        HUDView::Message(Game::GetInstance()->GetText("NetGameClient.remote-join").data(), name.data(), ship_name);
+                        HUDView::Message(ContentBundle::GetInstance()->GetText("NetGameClient.remote-join").data(), name.data(), ship_name);
                     }
                 }
             }
@@ -274,7 +275,7 @@ NetGameClient::DoJoinBacklog(NetJoinAnnounce* join_ann)
     Ship* ship      = 0;
     char  ship_name[128];
 
-    strcpy_s(ship_name, Game::GetInstance()->GetText("NetGameClient.no-ship").data());
+    strcpy_s(ship_name, ContentBundle::GetInstance()->GetText("NetGameClient.no-ship").data());
 
     if (nid && oid) {
         NetPlayer* remote_player = FindPlayerByObjID(oid);
@@ -322,7 +323,7 @@ NetGameClient::DoJoinBacklog(NetJoinAnnounce* join_ann)
                     Print("NetGameClient::DoJoinBacklog() Remote Player '%s' has joined as '%s' with ID %d\n", name.data(), ship_name, oid);
                 }
                 else {
-                    HUDView::Message(Game::GetInstance()->GetText("NetGameClient.remote-join").data(), name.data(), ship_name);
+                    HUDView::Message(ContentBundle::GetInstance()->GetText("NetGameClient.remote-join").data(), name.data(), ship_name);
                 }
             }
         }
@@ -361,9 +362,9 @@ NetGameClient::DoQuitAnnounce(NetMsg* msg)
         }
 
         if (quit_ann.GetDisconnected())
-        HUDView::Message(Game::GetInstance()->GetText("NetGameClient.remote-discon").data(), zombie->Name());
+        HUDView::Message(ContentBundle::GetInstance()->GetText("NetGameClient.remote-discon").data(), zombie->Name());
         else
-        HUDView::Message(Game::GetInstance()->GetText("NetGameClient.remote-quit").data(), zombie->Name());
+        HUDView::Message(ContentBundle::GetInstance()->GetText("NetGameClient.remote-quit").data(), zombie->Name());
         delete zombie;
     }
     else {
@@ -376,7 +377,7 @@ NetGameClient::DoGameOver(NetMsg* msg)
 {
     if (!msg) return;
 
-    HUDView::Message(Game::GetInstance()->GetText("NetGameClient.game-over").data());
+    HUDView::Message(ContentBundle::GetInstance()->GetText("NetGameClient.game-over").data());
     players.destroy();
     active = false;
 }
@@ -386,8 +387,8 @@ NetGameClient::DoDisconnect(NetMsg* msg)
 {
     if (!msg) return;
 
-    HUDView::Message(Game::GetInstance()->GetText("NetGameClient.discon-detect").data());
-    HUDView::Message(Game::GetInstance()->GetText("NetGameClient.please-exit").data());
+    HUDView::Message(ContentBundle::GetInstance()->GetText("NetGameClient.discon-detect").data());
+    HUDView::Message(ContentBundle::GetInstance()->GetText("NetGameClient.please-exit").data());
     players.destroy();
     active = false;
 }
@@ -473,7 +474,7 @@ NetGameClient::DoObjKill(NetMsg* msg)
     Ship* ship = FindShipByObjID(obj_kill.GetObjID());
     if (ship) {
         Ship* killer = FindShipByObjID(obj_kill.GetKillerID());
-        Text  killer_name = Game::GetInstance()->GetText("NetGameClient.unknown");
+        Text  killer_name = ContentBundle::GetInstance()->GetText("NetGameClient.unknown");
 
         if (killer)
         killer_name = killer->Name();
@@ -911,7 +912,7 @@ NetGameClient::DoChatMsg(NetMsg* msg)
 
     Text name = chat_msg.GetName();
     if (name.length() < 1)
-    name = Game::GetInstance()->GetText("NetGameClient.chat.unknown");
+    name = ContentBundle::GetInstance()->GetText("NetGameClient.chat.unknown");
 
     HUDView::Message("%s> %s", name.data(), chat_msg.GetText().data());
 }