summaryrefslogtreecommitdiffhomepage
path: root/Stars45/Mission.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'Stars45/Mission.cpp')
-rw-r--r--Stars45/Mission.cpp51
1 files changed, 26 insertions, 25 deletions
diff --git a/Stars45/Mission.cpp b/Stars45/Mission.cpp
index b9fa542..9c9b181 100644
--- a/Stars45/Mission.cpp
+++ b/Stars45/Mission.cpp
@@ -25,6 +25,7 @@
#include "Sim.h"
#include "Game.h"
+#include "ContentBundle.h"
#include "DataLoader.h"
#include "ParseUtil.h"
#include "FormatUtil.h"
@@ -38,8 +39,8 @@ Mission::Mission(int identity, const char* fname, const char* pname)
star_system(0), start(33 * 3600), stardate(0), target(0), ward(0),
current(0), degrees(false)
{
- objective = Game::GetInstance()->GetText("Mission.unspecified");
- sitrep = Game::GetInstance()->GetText("Mission.unknown");
+ objective = ContentBundle::GetInstance()->GetText("Mission.unspecified");
+ sitrep = ContentBundle::GetInstance()->GetText("Mission.unknown");
if (fname)
strcpy_s(filename, fname);
@@ -306,13 +307,13 @@ Mission::ParseMission(const char* block)
if (defname == "name") {
GetDefText(name, def, filename);
- name = Game::GetInstance()->GetText(name);
+ name = ContentBundle::GetInstance()->GetText(name);
}
else if (defname == "desc") {
GetDefText(desc, def, filename);
if (desc.length() > 0 && desc.length() < 32)
- desc = Game::GetInstance()->GetText(desc);
+ desc = ContentBundle::GetInstance()->GetText(desc);
}
else if (defname == "type") {
@@ -341,13 +342,13 @@ Mission::ParseMission(const char* block)
else if (defname == "objective") {
GetDefText(objective, def, filename);
if (objective.length() > 0 && objective.length() < 32)
- objective = Game::GetInstance()->GetText(objective);
+ objective = ContentBundle::GetInstance()->GetText(objective);
}
else if (defname == "sitrep") {
GetDefText(sitrep, def, filename);
if (sitrep.length() > 0 && sitrep.length() < 32)
- sitrep = Game::GetInstance()->GetText(sitrep);
+ sitrep = ContentBundle::GetInstance()->GetText(sitrep);
}
else if (defname == "subtitles") {
@@ -429,14 +430,14 @@ Mission::Save()
Validate();
if (!filename[0] || !path[0]) {
- AddError(Game::GetInstance()->GetText("Mission.error.no-file"));
+ AddError(ContentBundle::GetInstance()->GetText("Mission.error.no-file"));
return ok;
}
Text content = Serialize();
if (content.length() < 8) {
- AddError(Game::GetInstance()->GetText("Mission.error.no-serial"));
+ AddError(ContentBundle::GetInstance()->GetText("Mission.error.no-serial"));
return ok;
}
@@ -471,7 +472,7 @@ Mission::Validate()
ok = true;
if (elements.isEmpty()) {
- sprintf_s(err, Game::GetInstance()->GetText("Mission.error.no-elem").data(), filename);
+ sprintf_s(err, ContentBundle::GetInstance()->GetText("Mission.error.no-elem").data(), filename);
AddError(err);
}
else {
@@ -481,7 +482,7 @@ Mission::Validate()
MissionElement* elem = elements.at(i);
if (elem->Name().length() < 1) {
- sprintf_s(err, Game::GetInstance()->GetText("Mission.error.unnamed-elem").data(), filename);
+ sprintf_s(err, ContentBundle::GetInstance()->GetText("Mission.error.unnamed-elem").data(), filename);
AddError(err);
}
@@ -490,14 +491,14 @@ Mission::Validate()
found_player = true;
if (elem->Region() != GetRegion()) {
- sprintf_s(err, Game::GetInstance()->GetText("Mission.error.wrong-sector").data(),
+ sprintf_s(err, ContentBundle::GetInstance()->GetText("Mission.error.wrong-sector").data(),
elem->Name().data(),
GetRegion());
AddError(err);
}
}
else {
- sprintf_s(err, Game::GetInstance()->GetText("Mission.error.extra-player").data(),
+ sprintf_s(err, ContentBundle::GetInstance()->GetText("Mission.error.extra-player").data(),
elem->Name().data(),
filename);
AddError(err);
@@ -506,7 +507,7 @@ Mission::Validate()
}
if (!found_player) {
- sprintf_s(err, Game::GetInstance()->GetText("Mission.error.no-player").data(), filename);
+ sprintf_s(err, ContentBundle::GetInstance()->GetText("Mission.error.no-player").data(), filename);
AddError(err);
}
}
@@ -611,14 +612,14 @@ Mission::ParseElement(TermStruct* val)
element->design = ShipDesign::Get(design, element->path);
if (!element->design) {
- sprintf_s(err, Game::GetInstance()->GetText("Mission.error.unknown-ship").data(), design.data(), filename);
+ sprintf_s(err, ContentBundle::GetInstance()->GetText("Mission.error.unknown-ship").data(), design.data(), filename);
AddError(err);
}
}
else if (defname == "skin") {
if (!element->design) {
- sprintf_s(err, Game::GetInstance()->GetText("Mission.error.out-of-order").data(), filename);
+ sprintf_s(err, ContentBundle::GetInstance()->GetText("Mission.error.out-of-order").data(), filename);
AddError(err);
}
@@ -628,7 +629,7 @@ Mission::ParseElement(TermStruct* val)
}
else if (pdef->term()->isStruct()) {
- sprintf_s(err, Game::GetInstance()->GetText("Mission.error.bad-skin").data(), filename);
+ sprintf_s(err, ContentBundle::GetInstance()->GetText("Mission.error.bad-skin").data(), filename);
AddError(err);
}
}
@@ -724,7 +725,7 @@ Mission::ParseElement(TermStruct* val)
else if (defname == "objective") {
if (!pdef->term() || !pdef->term()->isStruct()) {
- sprintf_s(err, Game::GetInstance()->GetText("Mission.error.no-objective").data(), element->name.data(), filename);
+ sprintf_s(err, ContentBundle::GetInstance()->GetText("Mission.error.no-objective").data(), element->name.data(), filename);
AddError(err);
}
else {
@@ -744,7 +745,7 @@ Mission::ParseElement(TermStruct* val)
else if (defname == "ship") {
if (!pdef->term() || !pdef->term()->isStruct()) {
- sprintf_s(err, Game::GetInstance()->GetText("Mission.error.no-ship").data(), element->name.data(), filename);
+ sprintf_s(err, ContentBundle::GetInstance()->GetText("Mission.error.no-ship").data(), element->name.data(), filename);
AddError(err);
}
else {
@@ -759,7 +760,7 @@ Mission::ParseElement(TermStruct* val)
else if (defname == "order" || defname == "navpt") {
if (!pdef->term() || !pdef->term()->isStruct()) {
- sprintf_s(err, Game::GetInstance()->GetText("Mission.error.no-navpt").data(), element->name.data(), filename);
+ sprintf_s(err, ContentBundle::GetInstance()->GetText("Mission.error.no-navpt").data(), element->name.data(), filename);
AddError(err);
}
else {
@@ -771,7 +772,7 @@ Mission::ParseElement(TermStruct* val)
else if (defname == "loadout") {
if (!pdef->term() || !pdef->term()->isStruct()) {
- sprintf_s(err, Game::GetInstance()->GetText("Mission.error.no-loadout").data(), element->name.data(), filename);
+ sprintf_s(err, ContentBundle::GetInstance()->GetText("Mission.error.no-loadout").data(), element->name.data(), filename);
AddError(err);
}
else {
@@ -783,12 +784,12 @@ Mission::ParseElement(TermStruct* val)
}
if (element->name.length() < 1) {
- sprintf_s(err, Game::GetInstance()->GetText("Mission.error.unnamed-elem").data(), filename);
+ sprintf_s(err, ContentBundle::GetInstance()->GetText("Mission.error.unnamed-elem").data(), filename);
AddError(err);
}
else if (element->design == 0) {
- sprintf_s(err, Game::GetInstance()->GetText("Mission.error.unknown-ship").data(), element->name.data(), filename);
+ sprintf_s(err, ContentBundle::GetInstance()->GetText("Mission.error.unknown-ship").data(), element->name.data(), filename);
AddError(err);
}
@@ -883,7 +884,7 @@ Mission::ParseEvent(TermStruct* val)
else if (defname == "event_message" || defname == "message") {
Text raw_msg;
GetDefText(raw_msg, pdef, filename);
- raw_msg = Game::GetInstance()->GetText(raw_msg);
+ raw_msg = ContentBundle::GetInstance()->GetText(raw_msg);
event->event_message = FormatTextEscape(raw_msg);
}
@@ -948,7 +949,7 @@ Mission::ParseShip(TermStruct* val, MissionElement* element)
else if (defname == "skin") {
if (!element || !element->design) {
- sprintf_s(err, Game::GetInstance()->GetText("Mission.error.out-of-order").data(), filename);
+ sprintf_s(err, ContentBundle::GetInstance()->GetText("Mission.error.out-of-order").data(), filename);
AddError(err);
}
@@ -958,7 +959,7 @@ Mission::ParseShip(TermStruct* val, MissionElement* element)
}
else if (pdef->term()->isStruct()) {
- sprintf_s(err, Game::GetInstance()->GetText("Mission.error.bad-skin").data(), filename);
+ sprintf_s(err, ContentBundle::GetInstance()->GetText("Mission.error.bad-skin").data(), filename);
AddError(err);
}
}
generated by cgit v1.1 at 2024-06-28 16:30:06 +0000