From 0052edae47d1e6ae613497c524719eff5838f52a Mon Sep 17 00:00:00 2001 From: Aki Date: Fri, 18 Feb 2022 23:54:30 +0100 Subject: Switched to use GetIntance for Game instead of static methods --- Stars45/SimEvent.cpp | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) (limited to 'Stars45/SimEvent.cpp') diff --git a/Stars45/SimEvent.cpp b/Stars45/SimEvent.cpp index 4fc371d..801d75a 100644 --- a/Stars45/SimEvent.cpp +++ b/Stars45/SimEvent.cpp @@ -30,7 +30,7 @@ SimEvent::SimEvent(int e, const char* t, const char* i) time = (int) sim->MissionClock(); } else { - time = (int) (Game::GameTime()/1000); + time = (int) (Game::GetInstance()->GameTime()/1000); } SetTarget(t); @@ -73,26 +73,26 @@ Text SimEvent::GetEventDesc() const { switch (event) { - case LAUNCH: return Game::GetText("sim.event.Launch"); - case DOCK: return Game::GetText("sim.event.Dock"); - case LAND: return Game::GetText("sim.event.Land"); - case EJECT: return Game::GetText("sim.event.Eject"); - case CRASH: return Game::GetText("sim.event.Crash"); - case COLLIDE: return Game::GetText("sim.event.Collision With"); - case DESTROYED: return Game::GetText("sim.event.Destroyed By"); - case MAKE_ORBIT: return Game::GetText("sim.event.Make Orbit"); - case BREAK_ORBIT: return Game::GetText("sim.event.Break Orbit"); - case QUANTUM_JUMP: return Game::GetText("sim.event.Quantum Jump"); - case LAUNCH_SHIP: return Game::GetText("sim.event.Launch Ship"); - case RECOVER_SHIP: return Game::GetText("sim.event.Recover Ship"); - case FIRE_GUNS: return Game::GetText("sim.event.Fire Guns"); - case FIRE_MISSILE: return Game::GetText("sim.event.Fire Missile"); - case DROP_DECOY: return Game::GetText("sim.event.Drop Decoy"); - case GUNS_KILL: return Game::GetText("sim.event.Guns Kill"); - case MISSILE_KILL: return Game::GetText("sim.event.Missile Kill"); - case LAUNCH_PROBE: return Game::GetText("sim.event.Launch Probe"); - case SCAN_TARGET: return Game::GetText("sim.event.Scan Target"); - default: return Game::GetText("sim.event.no event"); + case LAUNCH: return Game::GetInstance()->GetText("sim.event.Launch"); + case DOCK: return Game::GetInstance()->GetText("sim.event.Dock"); + case LAND: return Game::GetInstance()->GetText("sim.event.Land"); + case EJECT: return Game::GetInstance()->GetText("sim.event.Eject"); + case CRASH: return Game::GetInstance()->GetText("sim.event.Crash"); + case COLLIDE: return Game::GetInstance()->GetText("sim.event.Collision With"); + case DESTROYED: return Game::GetInstance()->GetText("sim.event.Destroyed By"); + case MAKE_ORBIT: return Game::GetInstance()->GetText("sim.event.Make Orbit"); + case BREAK_ORBIT: return Game::GetInstance()->GetText("sim.event.Break Orbit"); + case QUANTUM_JUMP: return Game::GetInstance()->GetText("sim.event.Quantum Jump"); + case LAUNCH_SHIP: return Game::GetInstance()->GetText("sim.event.Launch Ship"); + case RECOVER_SHIP: return Game::GetInstance()->GetText("sim.event.Recover Ship"); + case FIRE_GUNS: return Game::GetInstance()->GetText("sim.event.Fire Guns"); + case FIRE_MISSILE: return Game::GetInstance()->GetText("sim.event.Fire Missile"); + case DROP_DECOY: return Game::GetInstance()->GetText("sim.event.Drop Decoy"); + case GUNS_KILL: return Game::GetInstance()->GetText("sim.event.Guns Kill"); + case MISSILE_KILL: return Game::GetInstance()->GetText("sim.event.Missile Kill"); + case LAUNCH_PROBE: return Game::GetInstance()->GetText("sim.event.Launch Probe"); + case SCAN_TARGET: return Game::GetInstance()->GetText("sim.event.Scan Target"); + default: return Game::GetInstance()->GetText("sim.event.no event"); } } @@ -104,7 +104,7 @@ cmd_points(0), gun_shots(0), gun_hits(0), missile_shots(0), missile_hits(0), combat_group(0), combat_unit(0), player(false), ship_class(0), elem_index(-1) { if (!n || !n[0]) - name = Game::GetText("[unknown]"); + name = Game::GetInstance()->GetText("[unknown]"); } ShipStats::~ShipStats() -- cgit v1.1