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/HUDView.cpp | 130 ++++++++++++++++++++++++++-------------------------- 1 file changed, 65 insertions(+), 65 deletions(-) (limited to 'Stars45/HUDView.cpp') diff --git a/Stars45/HUDView.cpp b/Stars45/HUDView.cpp index 232844d..8862241 100644 --- a/Stars45/HUDView.cpp +++ b/Stars45/HUDView.cpp @@ -786,7 +786,7 @@ HUDView::SetTacticalMode(int mode) for (int i = 0; i < 31; i++) pitch_ladder[i]->Hide(); } - else if (Game::MaxTexSize() > 128) { + else if (Game::GetInstance()->MaxTexSize() > 128) { hud_left_sprite->Show(); hud_right_sprite->Show(); } @@ -862,7 +862,7 @@ HUDView::MarkerColor(Contact* contact) c = Ship::IFFColor(c_iff) * contact->Age(); if (contact->GetShot() && contact->Threat(ship)) { - if ((Game::RealTime()/500) & 1) + if ((Game::GetInstance()->RealTime()/500) & 1) c = c * 2; else c = c * 0.5; @@ -1069,15 +1069,15 @@ HUDView::DrawContact(Contact* contact, int index) bool name_crowded = false; if (x < width-8) { - char code = *(Game::GetText("HUDView.symbol.fighter").data()); + char code = *(Game::GetInstance()->GetText("HUDView.symbol.fighter").data()); if (c_ship) { if (c_ship->Class() > Ship::LCA) - code = *(Game::GetText("HUDView.symbol.starship").data()); + code = *(Game::GetInstance()->GetText("HUDView.symbol.starship").data()); } else if (c_shot) { - code = *(Game::GetText("HUDView.symbol.torpedo").data()); + code = *(Game::GetInstance()->GetText("HUDView.symbol.torpedo").data()); } Sensor* sensor = ship->GetSensor(); @@ -1335,10 +1335,10 @@ HUDView::DrawBars() int b = cy + bar_height/2; int align = DT_LEFT; - if (Game::Paused()) + if (Game::GetInstance()->Paused()) { Rect pause_rect = Rect(cx - 128, cy - 60, 256, 12); - DrawHUDText(TXT_PAUSED, Game::GetText("HUDView.PAUSED"), pause_rect, DT_CENTER); + DrawHUDText(TXT_PAUSED, Game::GetInstance()->GetText("HUDView.PAUSED"), pause_rect, DT_CENTER); } if (ship) { @@ -1376,7 +1376,7 @@ HUDView::DrawBars() if (arcade) { char arcade_txt[32]; - sprintf_s(arcade_txt, "%s %s", Game::GetText("HUDView.altitude").data(), txt); + sprintf_s(arcade_txt, "%s %s", Game::GetInstance()->GetText("HUDView.altitude").data(), txt); align = (tactical) ? DT_LEFT : DT_RIGHT; DrawHUDText(TXT_ALTITUDE, arcade_txt, speed_rect, align); } @@ -1398,7 +1398,7 @@ HUDView::DrawBars() // upper left hud quadrant (starships) else if (ship->IsStarship() && ship->GetFLCSMode() == Ship::FLCS_HELM && !arcade) { - sprintf_s(txt, "%s: %.1f", Game::GetText("HUDView.Pitch").data(), ship->GetHelmPitch()/DEGREES); + sprintf_s(txt, "%s: %.1f", Game::GetInstance()->GetText("HUDView.Pitch").data(), ship->GetHelmPitch()/DEGREES); speed_rect.y -= 50; align = (tactical) ? DT_LEFT : DT_RIGHT; @@ -1407,7 +1407,7 @@ HUDView::DrawBars() speed_rect.y -= 10; int heading_degrees = (int) (ship->GetHelmHeading()/DEGREES); if (heading_degrees < 0) heading_degrees += 360; - sprintf_s(txt, "%s: %03d", Game::GetText("HUDView.Heading").data(), heading_degrees); + sprintf_s(txt, "%s: %03d", Game::GetInstance()->GetText("HUDView.Heading").data(), heading_degrees); DrawHUDText(TXT_HEADING, txt, speed_rect, align); speed_rect.y += 60; @@ -1423,9 +1423,9 @@ HUDView::DrawBars() } switch (mode) { - case HUD_MODE_TAC: strcpy_s(txt, Game::GetText("HUDView.mode.tactical").data()); break; - case HUD_MODE_NAV: strcpy_s(txt, Game::GetText("HUDView.mode.navigation").data()); break; - case HUD_MODE_ILS: strcpy_s(txt, Game::GetText("HUDView.mode.landing").data()); break; + case HUD_MODE_TAC: strcpy_s(txt, Game::GetInstance()->GetText("HUDView.mode.tactical").data()); break; + case HUD_MODE_NAV: strcpy_s(txt, Game::GetInstance()->GetText("HUDView.mode.navigation").data()); break; + case HUD_MODE_ILS: strcpy_s(txt, Game::GetInstance()->GetText("HUDView.mode.landing").data()); break; } if (tactical) { @@ -1441,7 +1441,7 @@ HUDView::DrawBars() // landing gear: if (ship->IsGearDown()) { - const char* gear_down = Game::GetText("HUDView.gear-down"); + const char* gear_down = Game::GetInstance()->GetText("HUDView.gear-down"); Rect gear_rect(l, b+20, box_width, 12); DrawHUDText(TXT_GEAR_DOWN, gear_down, gear_rect, DT_CENTER, HUD_UPPER_CASE, true); @@ -1451,18 +1451,18 @@ HUDView::DrawBars() QuantumDrive* quantum = ship->GetQuantumDrive(); if (threat || (quantum && quantum->JumpTime() > 0)) { - const char* threat_warn = Game::GetText("HUDView.threat-warn"); + const char* threat_warn = Game::GetInstance()->GetText("HUDView.threat-warn"); bool show_msg = true; if (quantum && quantum->JumpTime() > 0) { static char buf[64]; - sprintf_s(buf, "%s: %d", Game::GetText("HUDView.quantum-jump").data(), (int) quantum->JumpTime()); + sprintf_s(buf, "%s: %d", Game::GetInstance()->GetText("HUDView.quantum-jump").data(), (int) quantum->JumpTime()); threat_warn = buf; } else if (threat > 1) { - threat_warn = Game::GetText("HUDView.missile-warn"); - show_msg = ((Game::RealTime()/500) & 1) != 0; + threat_warn = Game::GetInstance()->GetText("HUDView.missile-warn"); + show_msg = ((Game::GetInstance()->RealTime()/500) & 1) != 0; } if (show_msg) { @@ -1473,7 +1473,7 @@ HUDView::DrawBars() if (ship->CanTimeSkip()) { Rect auto_rect(l, t-40, box_width, 12); - DrawHUDText(TXT_AUTO, Game::GetText("HUDView.AUTO"), auto_rect, DT_CENTER, HUD_MIXED_CASE, true); + DrawHUDText(TXT_AUTO, Game::GetInstance()->GetText("HUDView.AUTO"), auto_rect, DT_CENTER, HUD_MIXED_CASE, true); } if (mode == HUD_MODE_NAV) { @@ -1511,19 +1511,19 @@ HUDView::DrawBars() // missile range indicator if (missile->GetSelected()->Locked()) { Rect shoot_rect(l, b+5, box_width, 12); - DrawHUDText(TXT_SHOOT, Game::GetText("HUDView.SHOOT"), shoot_rect, DT_CENTER, HUD_MIXED_CASE, true); + DrawHUDText(TXT_SHOOT, Game::GetInstance()->GetText("HUDView.SHOOT"), shoot_rect, DT_CENTER, HUD_MIXED_CASE, true); } } if (!arcade && !ship->IsNetObserver()) { if (ship->GetShield()) { speed_rect.y = cy-5+40; - sprintf_s(txt, "%s - %03d +", Game::GetText("HUDView.SHIELD").data(), ship->ShieldStrength()); + sprintf_s(txt, "%s - %03d +", Game::GetInstance()->GetText("HUDView.SHIELD").data(), ship->ShieldStrength()); DrawHUDText(TXT_SHIELD, txt, speed_rect, align); } else if (ship->GetDecoy()) { speed_rect.y = cy-5+40; - sprintf_s(txt, "%s %d", Game::GetText("HUDView.DECOY").data(), ship->GetDecoy()->Ammo()); + sprintf_s(txt, "%s %d", Game::GetInstance()->GetText("HUDView.DECOY").data(), ship->GetDecoy()->Ammo()); DrawHUDText(TXT_DECOY, txt, speed_rect, align); } @@ -1555,12 +1555,12 @@ HUDView::DrawBars() NetGame* netgame = NetGame::GetInstance(); if (netgame && !netgame->IsActive()) { Rect shoot_rect(l, b+5, box_width, 12); - DrawHUDText(TXT_SHOOT, Game::GetText("HUDView.NET-GAME-OVER"), shoot_rect, DT_CENTER, HUD_MIXED_CASE, true); + DrawHUDText(TXT_SHOOT, Game::GetInstance()->GetText("HUDView.NET-GAME-OVER"), shoot_rect, DT_CENTER, HUD_MIXED_CASE, true); } else if (ship->IsNetObserver()) { Rect shoot_rect(l, b+5, box_width, 12); - DrawHUDText(TXT_SHOOT, Game::GetText("HUDView.OBSERVER"), shoot_rect, DT_CENTER, HUD_MIXED_CASE, true); + DrawHUDText(TXT_SHOOT, Game::GetInstance()->GetText("HUDView.OBSERVER"), shoot_rect, DT_CENTER, HUD_MIXED_CASE, true); } DrawTarget(); @@ -1616,7 +1616,7 @@ HUDView::DrawPitchLadder() for (int i = 0; i < 31; i++) pitch_ladder[i]->Hide(); - if (ship->IsAirborne() && Game::MaxTexSize() > 128) { + if (ship->IsAirborne() && Game::GetInstance()->MaxTexSize() > 128) { double xtarg = xcenter; double ytarg = ycenter; @@ -2058,7 +2058,7 @@ HUDView::DrawTarget() distance = contact->Range(ship, limit); if (!contact->ActLock() && !contact->PasLock()) { - strcpy_s(txt, Game::GetText("HUDView.No-Range").data()); + strcpy_s(txt, Game::GetInstance()->GetText("HUDView.No-Range").data()); speed = 0; } else { @@ -2103,20 +2103,20 @@ HUDView::DrawTarget() if (mode != HUD_MODE_ILS) { if (tgt_ship->IsStarship()) { range_rect.y += 10; - sprintf_s(txt, "%s %03d", Game::GetText("HUDView.symbol.shield").data(), (int) tgt_ship->ShieldStrength()); + sprintf_s(txt, "%s %03d", Game::GetInstance()->GetText("HUDView.symbol.shield").data(), (int) tgt_ship->ShieldStrength()); DrawHUDText(TXT_TARGET_SHIELD, txt, range_rect, DT_RIGHT); } range_rect.y += 10; - sprintf_s(txt, "%s %03d", Game::GetText("HUDView.symbol.hull").data(), (int) (tgt_ship->Integrity() / tgt_ship->Design()->integrity * 100)); + sprintf_s(txt, "%s %03d", Game::GetInstance()->GetText("HUDView.symbol.hull").data(), (int) (tgt_ship->Integrity() / tgt_ship->Design()->integrity * 100)); DrawHUDText(TXT_TARGET_HULL, txt, range_rect, DT_RIGHT); System* sys = ship->GetSubTarget(); if (sys) { Color stat = hud_color; - static DWORD blink = Game::RealTime(); + static DWORD blink = Game::GetInstance()->RealTime(); - int blink_delta = Game::RealTime() - blink; + int blink_delta = Game::GetInstance()->RealTime() - blink; sprintf_s(txt, "%s %03d", sys->Abbreviation(), (int) sys->Availability()); switch (sys->Status()) { @@ -2130,7 +2130,7 @@ HUDView::DrawTarget() } if (blink_delta > 500) - blink = Game::RealTime(); + blink = Game::GetInstance()->RealTime(); range_rect.y += 10; DrawHUDText(TXT_TARGET_SUB, txt, range_rect, DT_RIGHT); @@ -2177,7 +2177,7 @@ HUDView::DrawNavInfo() if (big_font) hud_text[TXT_NAV_INDEX].font = big_font; - DrawHUDText(TXT_NAV_INDEX, Game::GetText("HUDView.Auto-Nav"), info_rect, DT_CENTER); + DrawHUDText(TXT_NAV_INDEX, Game::GetInstance()->GetText("HUDView.Auto-Nav"), info_rect, DT_CENTER); } return; @@ -2210,9 +2210,9 @@ HUDView::DrawNavInfo() info_rect.x = width - info_rect.w - 8; if (ship->IsAutoNavEngaged()) - sprintf_s(txt, "%s %d", Game::GetText("HUDView.Auto-Nav").data(), index); + sprintf_s(txt, "%s %d", Game::GetInstance()->GetText("HUDView.Auto-Nav").data(), index); else - sprintf_s(txt, "%s %d", Game::GetText("HUDView.Nav").data(), index); + sprintf_s(txt, "%s %d", Game::GetInstance()->GetText("HUDView.Nav").data(), index); DrawHUDText(TXT_NAV_INDEX, txt, info_rect, DT_RIGHT); info_rect.y += 10; @@ -2225,7 +2225,7 @@ HUDView::DrawNavInfo() if (etr > 3600) { info_rect.y += 10; - sprintf_s(txt, "%s XX:XX", Game::GetText("HUDView.time-enroute").data()); + sprintf_s(txt, "%s XX:XX", Game::GetInstance()->GetText("HUDView.time-enroute").data()); DrawHUDText(TXT_NAV_ETR, txt, info_rect, DT_RIGHT); } else if (etr > 0) { @@ -2233,7 +2233,7 @@ HUDView::DrawNavInfo() int minutes = (etr/60) % 60; int seconds = (etr ) % 60; - sprintf_s(txt, "%s %2d:%02d", Game::GetText("HUDView.time-enroute").data(), minutes, seconds); + sprintf_s(txt, "%s %2d:%02d", Game::GetInstance()->GetText("HUDView.time-enroute").data(), minutes, seconds); DrawHUDText(TXT_NAV_ETR, txt, info_rect, DT_RIGHT); } @@ -2243,7 +2243,7 @@ HUDView::DrawNavInfo() int hold = (int) navpt->HoldTime(); int minutes = (hold/60) % 60; int seconds = (hold ) % 60; - sprintf_s(txt, "%s %2d:%02d", Game::GetText("HUDView.HOLD").data(), minutes, seconds); + sprintf_s(txt, "%s %2d:%02d", Game::GetInstance()->GetText("HUDView.HOLD").data(), minutes, seconds); DrawHUDText(TXT_NAV_HOLD, txt, info_rect, DT_RIGHT); } } @@ -2647,7 +2647,7 @@ HUDView::DrawWarningPanel() } if (ship) { - if (Game::MaxTexSize() > 128) { + if (Game::GetInstance()->MaxTexSize() > 128) { warn_left_sprite->Show(); warn_right_sprite->Show(); } @@ -2656,19 +2656,19 @@ HUDView::DrawWarningPanel() int y = cockpit_hud_texture ? 410 : height-97; int c = cockpit_hud_texture ? 3 : 4; - static DWORD blink = Game::RealTime(); + static DWORD blink = Game::GetInstance()->RealTime(); for (int index = 0; index < 12; index++) { int stat = -1; - Text abrv = Game::GetText("HUDView.UNKNOWN"); + Text abrv = Game::GetInstance()->GetText("HUDView.UNKNOWN"); switch (index) { - case 0: stat = GetReactorStatus(ship); abrv = Game::GetText("HUDView.REACTOR"); break; - case 1: stat = GetDriveStatus(ship); abrv = Game::GetText("HUDView.DRIVE"); break; - case 2: stat = GetQuantumStatus(ship); abrv = Game::GetText("HUDView.QUANTUM"); break; - case 3: stat = GetShieldStatus(ship); abrv = Game::GetText("HUDView.SHIELD"); + case 0: stat = GetReactorStatus(ship); abrv = Game::GetInstance()->GetText("HUDView.REACTOR"); break; + case 1: stat = GetDriveStatus(ship); abrv = Game::GetInstance()->GetText("HUDView.DRIVE"); break; + case 2: stat = GetQuantumStatus(ship); abrv = Game::GetInstance()->GetText("HUDView.QUANTUM"); break; + case 3: stat = GetShieldStatus(ship); abrv = Game::GetInstance()->GetText("HUDView.SHIELD"); if (ship->GetShield() == 0 && ship->GetDecoy()) - abrv = Game::GetText("HUDView.DECOY"); + abrv = Game::GetInstance()->GetText("HUDView.DECOY"); break; case 4: @@ -2681,10 +2681,10 @@ HUDView::DrawWarningPanel() } break; - case 8: stat = GetSensorStatus(ship); abrv = Game::GetText("HUDView.SENSOR"); break; - case 9: stat = GetComputerStatus(ship); abrv = Game::GetText("HUDView.COMPUTER"); break; - case 10: stat = GetThrusterStatus(ship); abrv = Game::GetText("HUDView.THRUSTER"); break; - case 11: stat = GetFlightDeckStatus(ship);abrv = Game::GetText("HUDView.FLTDECK"); break; + case 8: stat = GetSensorStatus(ship); abrv = Game::GetInstance()->GetText("HUDView.SENSOR"); break; + case 9: stat = GetComputerStatus(ship); abrv = Game::GetInstance()->GetText("HUDView.COMPUTER"); break; + case 10: stat = GetThrusterStatus(ship); abrv = Game::GetInstance()->GetText("HUDView.THRUSTER"); break; + case 11: stat = GetFlightDeckStatus(ship);abrv = Game::GetInstance()->GetText("HUDView.FLTDECK"); break; } Rect warn_rect(x, y, box_width, box_height); @@ -2697,7 +2697,7 @@ HUDView::DrawWarningPanel() Color tc = status_color; if (stat != System::NOMINAL) { - if (Game::RealTime() - blink < 250) { + if (Game::GetInstance()->RealTime() - blink < 250) { tc = cockpit_hud_texture ? txt_color : Color(8,8,8); } } @@ -2739,8 +2739,8 @@ HUDView::DrawWarningPanel() } } - if (Game::RealTime() - blink > 500) - blink = Game::RealTime(); + if (Game::GetInstance()->RealTime() - blink > 500) + blink = Game::GetInstance()->RealTime(); // reset for next time SetStatusColor(System::NOMINAL); @@ -2754,7 +2754,7 @@ HUDView::DrawInstructions() { if (!ship) return; - if (Game::MaxTexSize() > 128) { + if (Game::GetInstance()->MaxTexSize() > 128) { instr_left_sprite->Show(); instr_right_sprite->Show(); } @@ -2810,7 +2810,7 @@ HUDView::DrawInstructions() else { hud_text[TXT_CAUTION_TXT].color = standard_txt_colors[color]; - DrawHUDText(TXT_CAUTION_TXT, Game::GetText("HUDView.No-Instructions"), r, DT_LEFT, HUD_MIXED_CASE); + DrawHUDText(TXT_CAUTION_TXT, Game::GetInstance()->GetText("HUDView.No-Instructions"), r, DT_LEFT, HUD_MIXED_CASE); } } @@ -2875,7 +2875,7 @@ HUDView::DrawMessages() // age messages: for (int i = 0; i < MAX_MSG; i++) { if (msg_time[i] > 0) { - msg_time[i] -= Game::GUITime(); + msg_time[i] -= Game::GetInstance()->GUITime(); if (msg_time[i] <= 0) { msg_time[i] = 0; @@ -3516,9 +3516,9 @@ HUDView::Refresh() Rect dock_rect(width/2-100, height/6, 200, 20); if (ship->IsAirborne()) - DrawHUDText(TXT_AUTO, Game::GetText("HUDView.SUCCESSFUL-LANDING"), dock_rect, DT_CENTER); + DrawHUDText(TXT_AUTO, Game::GetInstance()->GetText("HUDView.SUCCESSFUL-LANDING"), dock_rect, DT_CENTER); else - DrawHUDText(TXT_AUTO, Game::GetText("HUDView.DOCKING-COMPLETE"), dock_rect, DT_CENTER); + DrawHUDText(TXT_AUTO, Game::GetInstance()->GetText("HUDView.DOCKING-COMPLETE"), dock_rect, DT_CENTER); } return; } @@ -3575,7 +3575,7 @@ HUDView::Refresh() int fov_degrees = 180 - 2 * (int)(projector->XAngle()*180/PI); if (fov_degrees > 90) - DrawHUDText(TXT_CAM_ANGLE, Game::GetText("HUDView.Wide-Angle"), fov_rect, DT_CENTER); + DrawHUDText(TXT_CAM_ANGLE, Game::GetInstance()->GetText("HUDView.Wide-Angle"), fov_rect, DT_CENTER); fov_rect.y = 20; DrawHUDText(TXT_CAM_MODE, CameraDirector::GetModeName(), fov_rect, DT_CENTER); @@ -3727,7 +3727,7 @@ HUDView::ExecFrame() } if (!tactical) { - if (Game::MaxTexSize() > 128) { + if (Game::GetInstance()->MaxTexSize() > 128) { hud_left_sprite->Show(); hud_right_sprite->Show(); } @@ -3938,7 +3938,7 @@ HUDView::RestoreHUD() icon_target_sprite->Hide(); } - if (!tactical && Game::MaxTexSize() > 128) { + if (!tactical && Game::GetInstance()->MaxTexSize() > 128) { hud_left_sprite->Show(); hud_right_sprite->Show(); } @@ -4039,7 +4039,7 @@ HUDView::SetHUDColorSet(int c) ColorizeBitmap(cross3, cross3_shade, hud_color, true); ColorizeBitmap(cross4, cross4_shade, hud_color, true); - if (Game::MaxTexSize() > 128) { + if (Game::GetInstance()->MaxTexSize() > 128) { ColorizeBitmap(hud_left_air, hud_left_shade_air, hud_color); ColorizeBitmap(hud_right_air, hud_right_shade_air, hud_color); ColorizeBitmap(hud_left_fighter, hud_left_shade_fighter, hud_color); @@ -4186,10 +4186,10 @@ HUDView::ColorizeBitmap(Bitmap& img, BYTE* shades, Color color, bool force_alpha { if (!shades) return; - int max_tex_size = Game::MaxTexSize(); + int max_tex_size = Game::GetInstance()->MaxTexSize(); if (max_tex_size < 128) - Game::SetMaxTexSize(128); + Game::GetInstance()->SetMaxTexSize(128); if (hud_view && hud_view->cockpit_hud_texture && !force_alpha) { img.FillColor(Color::Black); @@ -4216,7 +4216,7 @@ HUDView::ColorizeBitmap(Bitmap& img, BYTE* shades, Color color, bool force_alpha } if (max_tex_size < 128) - Game::SetMaxTexSize(max_tex_size); + Game::GetInstance()->SetMaxTexSize(max_tex_size); } // +--------------------------------------------------------------------+ @@ -4247,7 +4247,7 @@ HUDView::MouseFrame() Starshatter* stars = Starshatter::GetInstance(); if (mouse_index == TXT_PAUSED) - stars->Pause(!Game::Paused()); + stars->Pause(!Game::GetInstance()->Paused()); if (mouse_index == TXT_GEAR_DOWN) ship->ToggleGear(); -- cgit v1.1