summaryrefslogtreecommitdiffhomepage
path: root/Stars45/Sim.cpp
diff options
context:
space:
mode:
authorAki <please@ignore.pl>2022-02-23 23:36:37 +0100
committerAki <please@ignore.pl>2022-02-23 23:36:37 +0100
commit0da933a0146a0689546b21231e14f2dfc2bc14e8 (patch)
treeb917762280e2094d77fae2a607d6ad3151174fce /Stars45/Sim.cpp
parent8b778dda61c45f5d7a4dc416478c42ff4aa1de7f (diff)
downloadstarshatter-0da933a0146a0689546b21231e14f2dfc2bc14e8.zip
starshatter-0da933a0146a0689546b21231e14f2dfc2bc14e8.tar.gz
starshatter-0da933a0146a0689546b21231e14f2dfc2bc14e8.tar.bz2
Switched to use ContentBundle's GetText
Diffstat (limited to 'Stars45/Sim.cpp')
-rw-r--r--Stars45/Sim.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/Stars45/Sim.cpp b/Stars45/Sim.cpp
index 85183f4..cd2fb87 100644
--- a/Stars45/Sim.cpp
+++ b/Stars45/Sim.cpp
@@ -65,6 +65,7 @@
#include "NetData.h"
#include "Game.h"
+#include "ContentBundle.h"
#include "Sound.h"
#include "Bolt.h"
#include "Solid.h"
@@ -2268,7 +2269,7 @@ SimRegion::SimRegion(Sim* s, OrbitalRegion* r)
}
}
else {
- name = Game::GetInstance()->GetText("Unknown");
+ name = ContentBundle::GetInstance()->GetText("Unknown");
}
}
@@ -3064,7 +3065,7 @@ SimRegion::CollideShips()
if (ship->Integrity() < 1.0f) {
if (!kill_list.contains(ship)) {
ShipStats* r = ShipStats::Find(ship->Name());
- if (r) r->AddEvent(SimEvent::COLLIDE, Game::GetInstance()->GetText("DEBRIS"));
+ if (r) r->AddEvent(SimEvent::COLLIDE, ContentBundle::GetInstance()->GetText("DEBRIS"));
kill_list.insert(ship);
}
@@ -3088,7 +3089,7 @@ SimRegion::CollideShips()
if (ship->Integrity() < 1.0f) {
if (!kill_list.contains(ship)) {
ShipStats* r = ShipStats::Find(ship->Name());
- if (r) r->AddEvent(SimEvent::COLLIDE, Game::GetInstance()->GetText("ASTEROID"));
+ if (r) r->AddEvent(SimEvent::COLLIDE, ContentBundle::GetInstance()->GetText("ASTEROID"));
kill_list.insert(ship);
}