From dac5158376875636306610365dc1b9820a18a277 Mon Sep 17 00:00:00 2001 From: Aki Date: Wed, 16 Mar 2022 21:30:41 +0100 Subject: Removed gamma level management from Game and Starshatter classes --- Stars45/VidDlg.cpp | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'Stars45/VidDlg.cpp') diff --git a/Stars45/VidDlg.cpp b/Stars45/VidDlg.cpp index d205541..0d6fe9a 100644 --- a/Stars45/VidDlg.cpp +++ b/Stars45/VidDlg.cpp @@ -50,7 +50,7 @@ DEF_MAP_CLIENT(VidDlg, OnMod); VidDlg::VidDlg(Screen* s, FormDef& def, BaseScreen* mgr) : FormWindow(s, 0, 0, s->Width(), s->Height()), manager(mgr), -selected_mode(0), selected_detail(0), orig_gamma(128), +selected_mode(0), selected_detail(0), new_gamma(128), orig_gamma(128), selected_card(0), selected_tex_size(0), selected_render(0), selected_texture(0), mode(0), tex_size(0), detail(0), texture(0), gamma(0), shadows(0), spec_maps(0), bump_maps(0), lens_flare(0), corona(0), nebula(0), dust(0), @@ -60,7 +60,7 @@ closed(true) stars = Starshatter::GetInstance(); Init(def); - orig_gamma = Game::GetInstance()->GammaLevel(); + orig_gamma = Video::GetInstance()->GammaLevel(); } VidDlg::~VidDlg() @@ -197,9 +197,8 @@ VidDlg::Show() if (texture) texture->SetSelection(selected_texture); - if (gamma) { - orig_gamma = Game::GetInstance()->GammaLevel(); + orig_gamma = Video::GetInstance()->GammaLevel(); gamma->SetValue(orig_gamma); } } @@ -253,9 +252,9 @@ void VidDlg::OnGamma(AWEvent* event) { int g = gamma->GetValue(); - if (g >= 0 && g <= 255) { - Game::GetInstance()->SetGammaLevel(g); + new_gamma = g; + Video::GetInstance()->SetGammaLevel(g); } } @@ -405,7 +404,7 @@ VidDlg::Apply() fopen_s(&f, "video.cfg", "wb"); if (gamma) { - g = gamma->GetValue(); + new_gamma = gamma->GetValue(); } if (f) { @@ -416,7 +415,7 @@ VidDlg::Apply() fprintf(f, "\n"); fprintf(f, "max_tex: %d\n", (int) pow(2.0f, 6 + selected_tex_size)); fprintf(f, "primary3D: %s\n", (a>0)?"true":"false"); - fprintf(f, "gamma: %4d\n", g); + fprintf(f, "gamma: %4d\n", new_gamma); fprintf(f, "\n"); fprintf(f, "terrain_detail_level: %d\n", selected_detail + 2); fprintf(f, "terrain_texture_enable: %s\n", selected_texture ? "true" : "false"); @@ -452,7 +451,7 @@ VidDlg::Apply() void VidDlg::Cancel() { - Game::GetInstance()->SetGammaLevel(orig_gamma); + Video::GetInstance()->SetGammaLevel(orig_gamma); closed = true; } -- cgit v1.1