diff options
Diffstat (limited to 'Stars45/Sim.cpp')
| -rw-r--r-- | Stars45/Sim.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/Stars45/Sim.cpp b/Stars45/Sim.cpp index 119c0b9..85183f4 100644 --- a/Stars45/Sim.cpp +++ b/Stars45/Sim.cpp @@ -302,7 +302,7 @@ Sim::LoadMission(Mission* m, bool preload_textures) mission->SetActive(true); if (preload_textures) { - Video* video = Game::GetVideo(); + Video* video = Game::GetInstance()->GetVideo(); List<Model> all_models; //List<Bitmap> all_textures; @@ -394,7 +394,7 @@ Sim::ExecMission() } first_frame = true; - start_time = Game::GameTime(); + start_time = Game::GetInstance()->GameTime(); AudioConfig::SetTraining(mission->Type() == Mission::TRAINING); } @@ -1895,7 +1895,7 @@ Sim::ProcessEventTrigger(int type, int event_id, const char* ship, int param) double Sim::MissionClock() const { - return (Game::GameTime() - start_time) / 1000.0; + return (Game::GetInstance()->GameTime() - start_time) / 1000.0; } // +--------------------------------------------------------------------+ @@ -1932,7 +1932,7 @@ Sim::SkipCutscene() double skip_time = end_time - MissionClock(); if (skip_time > 0) { - Game::SkipGameTime(skip_time); + Game::GetInstance()->SkipGameTime(skip_time); } } } @@ -1986,7 +1986,7 @@ Sim::ResolveTimeSkip(double seconds) player_ship->SetControls(0); } - Game::SkipGameTime(skipped); + Game::GetInstance()->SkipGameTime(skipped); CameraDirector::SetCameraMode(CameraDirector::MODE_COCKPIT); } @@ -2268,7 +2268,7 @@ SimRegion::SimRegion(Sim* s, OrbitalRegion* r) } } else { - name = Game::GetText("Unknown"); + name = Game::GetInstance()->GetText("Unknown"); } } @@ -2508,8 +2508,8 @@ SimRegion::ExecFrame(double secs) // DON'T REALLY KNOW WHAT PURPOSE THIS SERVES.... if (!active) { - double max_frame = 3 * Game::GetMaxFrameLength(); - long new_time = Game::GameTime(); + double max_frame = 3 * Game::GetInstance()->GetMaxFrameLength(); + long new_time = Game::GetInstance()->GameTime(); double delta = new_time - sim_time; seconds = delta / 1000.0; @@ -2517,7 +2517,7 @@ SimRegion::ExecFrame(double secs) seconds = max_frame; } - sim_time = Game::GameTime(); + sim_time = Game::GetInstance()->GameTime(); if (orbital_region) location = orbital_region->Location(); @@ -2539,7 +2539,7 @@ SimRegion::ExecFrame(double secs) UpdateShots(seconds); UpdateExplosions(seconds); - if (!Game::Paused()) { + if (!Game::GetInstance()->Paused()) { DamageShips(); DockShips(); @@ -3064,7 +3064,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::GetText("DEBRIS")); + if (r) r->AddEvent(SimEvent::COLLIDE, Game::GetInstance()->GetText("DEBRIS")); kill_list.insert(ship); } @@ -3088,7 +3088,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::GetText("ASTEROID")); + if (r) r->AddEvent(SimEvent::COLLIDE, Game::GetInstance()->GetText("ASTEROID")); kill_list.insert(ship); } @@ -3797,7 +3797,7 @@ const char* FormatGameTime() { static char txt[64]; - int t = Game::GameTime(); + int t = Game::GetInstance()->GameTime(); int h = ( t / 3600000); int m = ((t - h*3600000) / 60000); |