diff options
Diffstat (limited to 'Stars45/Hangar.cpp')
| -rw-r--r-- | Stars45/Hangar.cpp | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/Stars45/Hangar.cpp b/Stars45/Hangar.cpp index 3aaaddc..7aafada 100644 --- a/Stars45/Hangar.cpp +++ b/Stars45/Hangar.cpp @@ -28,6 +28,7 @@ #include "CombatGroup.h" #include "Game.h" +#include "ContentBundle.h" #include "Random.h" // +======================================================================+ @@ -666,7 +667,7 @@ Hangar::SquadronName(int n) const if (n >= 0 && n < nsquadrons) return names[n]; - return Game::GetInstance()->GetText("Unknown"); + return ContentBundle::GetInstance()->GetText("Unknown"); } int @@ -769,22 +770,22 @@ Hangar::StatusName(const HangarSlot* s) const { switch (s->state) { default: - case UNAVAIL: return Game::GetInstance()->GetText("hangar.UNAVAIL"); - case MAINT: return Game::GetInstance()->GetText("hangar.MAINT"); - case STORAGE: return Game::GetInstance()->GetText("hangar.STORAGE"); - case PREP: return Game::GetInstance()->GetText("hangar.PREP"); - case ALERT: return Game::GetInstance()->GetText("hangar.ALERT"); + case UNAVAIL: return ContentBundle::GetInstance()->GetText("hangar.UNAVAIL"); + case MAINT: return ContentBundle::GetInstance()->GetText("hangar.MAINT"); + case STORAGE: return ContentBundle::GetInstance()->GetText("hangar.STORAGE"); + case PREP: return ContentBundle::GetInstance()->GetText("hangar.PREP"); + case ALERT: return ContentBundle::GetInstance()->GetText("hangar.ALERT"); case QUEUED: { - Text state = Game::GetInstance()->GetText("hangar.QUEUED"); + Text state = ContentBundle::GetInstance()->GetText("hangar.QUEUED"); char seq[8]; sprintf_s(seq, " %d", s->deck->Sequence(s->slot)); return state + seq; } - case LOCKED: return Game::GetInstance()->GetText("hangar.LOCKED"); - case LAUNCH: return Game::GetInstance()->GetText("hangar.LAUNCH"); - case ACTIVE: return Game::GetInstance()->GetText("hangar.ACTIVE"); - case APPROACH: return Game::GetInstance()->GetText("hangar.APPROACH"); - case RECOVERY: return Game::GetInstance()->GetText("hangar.RECOVERY"); + case LOCKED: return ContentBundle::GetInstance()->GetText("hangar.LOCKED"); + case LAUNCH: return ContentBundle::GetInstance()->GetText("hangar.LAUNCH"); + case ACTIVE: return ContentBundle::GetInstance()->GetText("hangar.ACTIVE"); + case APPROACH: return ContentBundle::GetInstance()->GetText("hangar.APPROACH"); + case RECOVERY: return ContentBundle::GetInstance()->GetText("hangar.RECOVERY"); } } |