From 06683d2e60da5144e5483c3d0cf88aa28dab1c8a Mon Sep 17 00:00:00 2001 From: Aki Date: Sun, 10 Apr 2022 00:30:31 +0200 Subject: Requested texture size is now managed by Video and Video Settings --- StarsEx/HUDView.cpp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'StarsEx/HUDView.cpp') diff --git a/StarsEx/HUDView.cpp b/StarsEx/HUDView.cpp index c280333..595bc38 100644 --- a/StarsEx/HUDView.cpp +++ b/StarsEx/HUDView.cpp @@ -62,9 +62,9 @@ #include "Sound.h" #include "Game.h" #include "Clock.h" -#include "GameWinDX9.h" #include "ContentBundle.h" #include "Window.h" +#include "Video.h" static Bitmap hud_left_air; static Bitmap hud_right_air; @@ -788,7 +788,7 @@ HUDView::SetTacticalMode(int mode) for (int i = 0; i < 31; i++) pitch_ladder[i]->Hide(); } - else if (GameWinDX9::GetInstance()->MaxTexSize() > 128) { + else if (Video::GetInstance()->TexSize() > 128) { hud_left_sprite->Show(); hud_right_sprite->Show(); } @@ -1618,7 +1618,7 @@ HUDView::DrawPitchLadder() for (int i = 0; i < 31; i++) pitch_ladder[i]->Hide(); - if (ship->IsAirborne() && GameWinDX9::GetInstance()->MaxTexSize() > 128) { + if (ship->IsAirborne() && Video::GetInstance()->TexSize() > 128) { double xtarg = xcenter; double ytarg = ycenter; @@ -2649,7 +2649,7 @@ HUDView::DrawWarningPanel() } if (ship) { - if (GameWinDX9::GetInstance()->MaxTexSize() > 128) { + if (Video::GetInstance()->TexSize() > 128) { warn_left_sprite->Show(); warn_right_sprite->Show(); } @@ -2756,7 +2756,7 @@ HUDView::DrawInstructions() { if (!ship) return; - if (GameWinDX9::GetInstance()->MaxTexSize() > 128) { + if (Video::GetInstance()->TexSize() > 128) { instr_left_sprite->Show(); instr_right_sprite->Show(); } @@ -3729,7 +3729,7 @@ HUDView::ExecFrame() } if (!tactical) { - if (GameWinDX9::GetInstance()->MaxTexSize() > 128) { + if (Video::GetInstance()->TexSize() > 128) { hud_left_sprite->Show(); hud_right_sprite->Show(); } @@ -3940,7 +3940,7 @@ HUDView::RestoreHUD() icon_target_sprite->Hide(); } - if (!tactical && GameWinDX9::GetInstance()->MaxTexSize() > 128) { + if (!tactical && Video::GetInstance()->TexSize() > 128) { hud_left_sprite->Show(); hud_right_sprite->Show(); } @@ -4041,7 +4041,7 @@ HUDView::SetHUDColorSet(int c) ColorizeBitmap(cross3, cross3_shade, hud_color, true); ColorizeBitmap(cross4, cross4_shade, hud_color, true); - if (GameWinDX9::GetInstance()->MaxTexSize() > 128) { + if (Video::GetInstance()->TexSize() > 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); @@ -4188,10 +4188,10 @@ HUDView::ColorizeBitmap(Bitmap& img, BYTE* shades, Color color, bool force_alpha { if (!shades) return; - int max_tex_size = GameWinDX9::GetInstance()->MaxTexSize(); + int max_tex_size = Video::GetInstance()->TexSize(); if (max_tex_size < 128) - GameWinDX9::GetInstance()->SetMaxTexSize(128); + Video::GetInstance()->RequestTexSize(128); if (hud_view && hud_view->cockpit_hud_texture && !force_alpha) { img.FillColor(Color::Black); @@ -4218,7 +4218,7 @@ HUDView::ColorizeBitmap(Bitmap& img, BYTE* shades, Color color, bool force_alpha } if (max_tex_size < 128) - GameWinDX9::GetInstance()->SetMaxTexSize(max_tex_size); + Video::GetInstance()->RequestTexSize(max_tex_size); } // +--------------------------------------------------------------------+ -- cgit v1.1