summaryrefslogtreecommitdiffhomepage
path: root/Stars45/NavDlg.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'Stars45/NavDlg.cpp')
-rw-r--r--Stars45/NavDlg.cpp83
1 files changed, 42 insertions, 41 deletions
diff --git a/Stars45/NavDlg.cpp b/Stars45/NavDlg.cpp
index 6bfbf3c..662f185 100644
--- a/Stars45/NavDlg.cpp
+++ b/Stars45/NavDlg.cpp
@@ -29,6 +29,7 @@
#include "Mission.h"
#include "Game.h"
+#include "ContentBundle.h"
#include "Keyboard.h"
#include "Mouse.h"
#include "ListBox.h"
@@ -358,7 +359,7 @@ NavDlg::ExecFrame()
FormatNumber(y, ship->Location().z);
FormatNumber(z, ship->Location().y);
- strcpy_s(loc_buf, Game::GetInstance()->GetText("NavDlg.loc-labels").data());
+ strcpy_s(loc_buf, ContentBundle::GetInstance()->GetText("NavDlg.loc-labels").data());
loc_labels->SetText(loc_buf);
if (sim->GetActiveRegion()) {
@@ -379,7 +380,7 @@ NavDlg::ExecFrame()
NavSystem* navsys = ship->GetNavSystem();
if (ship->GetNextNavPoint() == 0 || !navsys) {
- commit_btn->SetText(Game::GetInstance()->GetText("NavDlg.commit"));
+ commit_btn->SetText(ContentBundle::GetInstance()->GetText("NavDlg.commit"));
commit_btn->SetBackColor(commit_color);
commit_btn->SetEnabled(false);
}
@@ -387,11 +388,11 @@ NavDlg::ExecFrame()
commit_btn->SetEnabled(true);
if (navsys->AutoNavEngaged()) {
- commit_btn->SetText(Game::GetInstance()->GetText("NavDlg.cancel"));
+ commit_btn->SetText(ContentBundle::GetInstance()->GetText("NavDlg.cancel"));
commit_btn->SetBackColor(cancel_color);
}
else {
- commit_btn->SetText(Game::GetInstance()->GetText("NavDlg.commit"));
+ commit_btn->SetText(ContentBundle::GetInstance()->GetText("NavDlg.commit"));
commit_btn->SetBackColor(commit_color);
}
}
@@ -416,7 +417,7 @@ NavDlg::ExecFrame()
distance = Point(npt - ship->Location()).length();
FormatNumber(d, distance);
- strcpy_s(loc_buf, Game::GetInstance()->GetText("NavDlg.dst-labels").data());
+ strcpy_s(loc_buf, ContentBundle::GetInstance()->GetText("NavDlg.dst-labels").data());
dst_labels->SetText(loc_buf);
sprintf_s(loc_buf, "\n%s\n%s\n%s, %s, %s\n%s",
@@ -426,8 +427,8 @@ NavDlg::ExecFrame()
dst_data->SetText(loc_buf);
}
else {
- dst_labels->SetText(Game::GetInstance()->GetText("NavDlg.destination"));
- dst_data->SetText(Game::GetInstance()->GetText("NavDlg.not-avail"));
+ dst_labels->SetText(ContentBundle::GetInstance()->GetText("NavDlg.destination"));
+ dst_data->SetText(ContentBundle::GetInstance()->GetText("NavDlg.not-avail"));
}
}
}
@@ -685,8 +686,8 @@ NavDlg::UpdateSelection()
info_list->ClearItems();
- Text units_km = Text(" ") + Game::GetInstance()->GetText("NavDlg.units.kilometers");
- Text units_tonnes = Text(" ") + Game::GetInstance()->GetText("NavDlg.units.tonnes");
+ Text units_km = Text(" ") + ContentBundle::GetInstance()->GetText("NavDlg.units.kilometers");
+ Text units_tonnes = Text(" ") + ContentBundle::GetInstance()->GetText("NavDlg.units.tonnes");
if (seln_mode <= SELECT_REGION) {
Orbital* s = star_map->GetSelection();
@@ -701,23 +702,23 @@ NavDlg::UpdateSelection()
double p = s->Period();
if (p < 60) {
- sprintf_s(units, " %s", Game::GetInstance()->GetText("NavDlg.units.seconds").data());
+ sprintf_s(units, " %s", ContentBundle::GetInstance()->GetText("NavDlg.units.seconds").data());
}
else if (p < 3600) {
p /= 60;
- sprintf_s(units, " %s", Game::GetInstance()->GetText("NavDlg.units.minutes").data());
+ sprintf_s(units, " %s", ContentBundle::GetInstance()->GetText("NavDlg.units.minutes").data());
}
else if (p < 24 * 3600) {
p /= 3600;
- sprintf_s(units, " %s", Game::GetInstance()->GetText("NavDlg.units.hours").data());
+ sprintf_s(units, " %s", ContentBundle::GetInstance()->GetText("NavDlg.units.hours").data());
}
else if (p < 365.25 * 24 * 3600) {
p /= 24*3600;
- sprintf_s(units, " %s", Game::GetInstance()->GetText("NavDlg.units.days").data());
+ sprintf_s(units, " %s", ContentBundle::GetInstance()->GetText("NavDlg.units.days").data());
}
else {
p /= 365.25*24*3600;
- sprintf_s(units, " %s", Game::GetInstance()->GetText("NavDlg.units.years").data());
+ sprintf_s(units, " %s", ContentBundle::GetInstance()->GetText("NavDlg.units.years").data());
}
FormatNumberExp(radius, s->Radius()/1000);
@@ -731,12 +732,12 @@ NavDlg::UpdateSelection()
strcat_s(period, units);
if (seln_mode >= SELECT_SYSTEM) {
- info_list->AddItem(Game::GetInstance()->GetText(Text("NavDlg.filter.") + filter_name[seln_mode]));
- info_list->AddItem(Game::GetInstance()->GetText("NavDlg.radius"));
+ info_list->AddItem(ContentBundle::GetInstance()->GetText(Text("NavDlg.filter.") + filter_name[seln_mode]));
+ info_list->AddItem(ContentBundle::GetInstance()->GetText("NavDlg.radius"));
if (s->Mass() > 0)
- info_list->AddItem(Game::GetInstance()->GetText("NavDlg.mass"));
- info_list->AddItem(Game::GetInstance()->GetText("NavDlg.orbit"));
- info_list->AddItem(Game::GetInstance()->GetText("NavDlg.period"));
+ info_list->AddItem(ContentBundle::GetInstance()->GetText("NavDlg.mass"));
+ info_list->AddItem(ContentBundle::GetInstance()->GetText("NavDlg.orbit"));
+ info_list->AddItem(ContentBundle::GetInstance()->GetText("NavDlg.period"));
int row = 0;
info_list->SetItemText(row++, 1, s->Name());
@@ -757,27 +758,27 @@ NavDlg::UpdateSelection()
MissionElement* sel_elem = star_map->GetSelectedElem();
if (sel_ship) {
- Text order_desc = Game::GetInstance()->GetText("NavDlg.none");
+ Text order_desc = ContentBundle::GetInstance()->GetText("NavDlg.none");
char shield[16];
char hull[16];
char range[32];
sprintf_s(shield, "%03d", sel_ship->ShieldStrength());
sprintf_s(hull, "%03d", sel_ship->HullStrength());
- sprintf_s(range, "%s", Game::GetInstance()->GetText("NavDlg.not-avail").data());
+ sprintf_s(range, "%s", ContentBundle::GetInstance()->GetText("NavDlg.not-avail").data());
if (ship) {
FormatNumberExp(range, Point(sel_ship->Location()-ship->Location()).length()/1000);
strcat_s(range, units_km.data());
}
- info_list->AddItem(Game::GetInstance()->GetText("NavDlg.name"));
- info_list->AddItem(Game::GetInstance()->GetText("NavDlg.class"));
- info_list->AddItem(Game::GetInstance()->GetText("NavDlg.sector"));
- info_list->AddItem(Game::GetInstance()->GetText("NavDlg.shield"));
- info_list->AddItem(Game::GetInstance()->GetText("NavDlg.hull"));
- info_list->AddItem(Game::GetInstance()->GetText("NavDlg.range"));
- info_list->AddItem(Game::GetInstance()->GetText("NavDlg.orders"));
+ info_list->AddItem(ContentBundle::GetInstance()->GetText("NavDlg.name"));
+ info_list->AddItem(ContentBundle::GetInstance()->GetText("NavDlg.class"));
+ info_list->AddItem(ContentBundle::GetInstance()->GetText("NavDlg.sector"));
+ info_list->AddItem(ContentBundle::GetInstance()->GetText("NavDlg.shield"));
+ info_list->AddItem(ContentBundle::GetInstance()->GetText("NavDlg.hull"));
+ info_list->AddItem(ContentBundle::GetInstance()->GetText("NavDlg.range"));
+ info_list->AddItem(ContentBundle::GetInstance()->GetText("NavDlg.orders"));
int row = 0;
info_list->SetItemText(row++, 1, sel_ship->Name());
@@ -790,7 +791,7 @@ NavDlg::UpdateSelection()
}
else if (sel_elem) {
- Text order_desc = Game::GetInstance()->GetText("NavDlg.none");
+ Text order_desc = ContentBundle::GetInstance()->GetText("NavDlg.none");
char range[32];
MissionElement* self = mission->GetElements()[0];
@@ -801,11 +802,11 @@ NavDlg::UpdateSelection()
strcat_s(range, units_km.data());
- info_list->AddItem(Game::GetInstance()->GetText("NavDlg.name"));
- info_list->AddItem(Game::GetInstance()->GetText("NavDlg.class"));
- info_list->AddItem(Game::GetInstance()->GetText("NavDlg.sector"));
- info_list->AddItem(Game::GetInstance()->GetText("NavDlg.range"));
- info_list->AddItem(Game::GetInstance()->GetText("NavDlg.orders"));
+ info_list->AddItem(ContentBundle::GetInstance()->GetText("NavDlg.name"));
+ info_list->AddItem(ContentBundle::GetInstance()->GetText("NavDlg.class"));
+ info_list->AddItem(ContentBundle::GetInstance()->GetText("NavDlg.sector"));
+ info_list->AddItem(ContentBundle::GetInstance()->GetText("NavDlg.range"));
+ info_list->AddItem(ContentBundle::GetInstance()->GetText("NavDlg.orders"));
int row = 0;
info_list->SetItemText(row++, 1, sel_elem->Name());
@@ -813,7 +814,7 @@ NavDlg::UpdateSelection()
if (sel_elem->GetDesign())
info_list->SetItemText(row++, 1, sel_elem->Abbreviation() + Text(" ") + sel_elem->GetDesign()->name);
else
- info_list->SetItemText(row++, 1, Game::GetInstance()->GetText("NavDlg.unknown"));
+ info_list->SetItemText(row++, 1, ContentBundle::GetInstance()->GetText("NavDlg.unknown"));
info_list->SetItemText(row++, 1, sel_elem->Region());
info_list->SetItemText(row++, 1, range);
@@ -843,7 +844,7 @@ NavDlg::UpdateLists()
switch (seln_mode) {
case SELECT_SYSTEM:
{
- seln_list->SetColumnTitle(0, Game::GetInstance()->GetText(Text("NavDlg.filter.") + filter_name[seln_mode]));
+ seln_list->SetColumnTitle(0, ContentBundle::GetInstance()->GetText(Text("NavDlg.filter.") + filter_name[seln_mode]));
int i = 0;
ListIter<StarSystem> iter = star_map->GetGalaxy();
while (++iter)
@@ -853,7 +854,7 @@ NavDlg::UpdateLists()
case SELECT_PLANET:
{
- seln_list->SetColumnTitle(0, Game::GetInstance()->GetText(Text("NavDlg.filter.") + filter_name[seln_mode]));
+ seln_list->SetColumnTitle(0, ContentBundle::GetInstance()->GetText(Text("NavDlg.filter.") + filter_name[seln_mode]));
int i = 0;
ListIter<Orbital> iter = planets;
while (++iter) {
@@ -867,7 +868,7 @@ NavDlg::UpdateLists()
case SELECT_REGION:
{
- seln_list->SetColumnTitle(0, Game::GetInstance()->GetText(Text("NavDlg.filter.") + filter_name[seln_mode]));
+ seln_list->SetColumnTitle(0, ContentBundle::GetInstance()->GetText(Text("NavDlg.filter.") + filter_name[seln_mode]));
int i = 0;
ListIter<OrbitalRegion> iter = regions;
while (++iter) {
@@ -880,7 +881,7 @@ NavDlg::UpdateLists()
case SELECT_STARSHIP:
case SELECT_FIGHTER:
{
- seln_list->SetColumnTitle(0, Game::GetInstance()->GetText(Text("NavDlg.filter.") + filter_name[seln_mode]));
+ seln_list->SetColumnTitle(0, ContentBundle::GetInstance()->GetText(Text("NavDlg.filter.") + filter_name[seln_mode]));
int i = 0;
if (mission) {
@@ -960,12 +961,12 @@ NavDlg::OnEngage(AWEvent* event)
if (navsys) {
if (navsys->AutoNavEngaged()) {
navsys->DisengageAutoNav();
- commit_btn->SetText(Game::GetInstance()->GetText("NavDlg.commit"));
+ commit_btn->SetText(ContentBundle::GetInstance()->GetText("NavDlg.commit"));
commit_btn->SetBackColor(commit_color);
}
else {
navsys->EngageAutoNav();
- commit_btn->SetText(Game::GetInstance()->GetText("NavDlg.cancel"));
+ commit_btn->SetText(ContentBundle::GetInstance()->GetText("NavDlg.cancel"));
commit_btn->SetBackColor(cancel_color);
hide = true;
}
generated by cgit v1.1 at 2024-06-28 16:14:41 +0000