summaryrefslogtreecommitdiffhomepage
path: root/Stars45/Campaign.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'Stars45/Campaign.cpp')
-rw-r--r--Stars45/Campaign.cpp19
1 files changed, 10 insertions, 9 deletions
diff --git a/Stars45/Campaign.cpp b/Stars45/Campaign.cpp
index ab65bbe..7572ea5 100644
--- a/Stars45/Campaign.cpp
+++ b/Stars45/Campaign.cpp
@@ -33,6 +33,7 @@
#include "Starshatter.h"
#include "Player.h"
+#include "ContentBundle.h"
#include "Game.h"
#include "Bitmap.h"
#include "DataLoader.h"
@@ -459,7 +460,7 @@ Campaign::LoadCampaign(DataLoader* loader, bool full)
}
else {
name = def->term()->isText()->value();
- name = Game::GetInstance()->GetText(name);
+ name = ContentBundle::GetInstance()->GetText(name);
}
}
else if (def->name()->value() == "desc") {
@@ -468,7 +469,7 @@ Campaign::LoadCampaign(DataLoader* loader, bool full)
}
else {
description = def->term()->isText()->value();
- description = Game::GetInstance()->GetText(description);
+ description = ContentBundle::GetInstance()->GetText(description);
}
}
else if (def->name()->value() == "situation") {
@@ -477,7 +478,7 @@ Campaign::LoadCampaign(DataLoader* loader, bool full)
}
else {
situation = def->term()->isText()->value();
- situation = Game::GetInstance()->GetText(situation);
+ situation = ContentBundle::GetInstance()->GetText(situation);
}
}
else if (def->name()->value() == "orders") {
@@ -486,7 +487,7 @@ Campaign::LoadCampaign(DataLoader* loader, bool full)
}
else {
orders = def->term()->isText()->value();
- orders = Game::GetInstance()->GetText(orders);
+ orders = ContentBundle::GetInstance()->GetText(orders);
}
}
else if (def->name()->value() == "scripted") {
@@ -777,7 +778,7 @@ Campaign::ParseAction(TermStruct* val, const char* filename)
}
else if (pdef->name()->value() == "text") {
GetDefText(text, pdef, filename);
- text = Game::GetInstance()->GetText(text);
+ text = ContentBundle::GetInstance()->GetText(text);
}
else if (pdef->name()->value() == "asset_id") {
GetDefNumber(asset_id, pdef, filename);
@@ -1022,13 +1023,13 @@ Campaign::LoadMissionList(DataLoader* loader)
else if (pdef->name()->value() == "name") {
GetDefText(name, pdef, filename);
- name = Game::GetInstance()->GetText(name);
+ name = ContentBundle::GetInstance()->GetText(name);
}
else if (pdef->name()->value() == "desc") {
GetDefText(desc, pdef, filename);
if (desc.length() > 0 && desc.length() < 32)
- desc = Game::GetInstance()->GetText(desc);
+ desc = ContentBundle::GetInstance()->GetText(desc);
}
else if (pdef->name()->value() == "start")
@@ -1137,7 +1138,7 @@ Campaign::LoadCustomMissions(DataLoader* loader)
if (def) {
if (def->name()->value() == "name") {
GetDefText(name, def, filename);
- name = Game::GetInstance()->GetText(name);
+ name = ContentBundle::GetInstance()->GetText(name);
}
else if (def->name()->value() == "type") {
@@ -1152,7 +1153,7 @@ Campaign::LoadCustomMissions(DataLoader* loader)
else if (def->name()->value() == "desc") {
GetDefText(desc, def, filename);
if (desc.length() > 0 && desc.length() < 32)
- desc = Game::GetInstance()->GetText(desc);
+ desc = ContentBundle::GetInstance()->GetText(desc);
}
else if (def->name()->value() == "system")