mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix #5178: Lighting effects cannot be disabled in software mode (#13206) 

Lighting effect are now automatically turned off when software renderer is selected.
This commit is contained in:
Łukasz Pękalski 2020-10-15 17:05:39 +02:00 committed by GitHub
parent 645289f4ec
commit 26720eb345
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
distribution/changelog.txt
View File

@ -9,6 +9,7 @@
- Fix: [#1324] Last track piece map selection still visible when placing ride entrance or exit (original bug).
- Fix: [#3200] Close Construction window upon selecting vehicle page.
- Fix: [#4041] Garbled park option on scenario editor with custom theme.
- Fix: [#5178] Lighting effects cannot be disabled in software mode
- Fix: [#5904] Empty errors on tile inspector base height change.
- Fix: [#6086] Cannot install existing track design with another name.
- Fix: [#7748] Tooltips would not timeout for normal UI elements.

2
src/openrct2-ui/windows/Options.cpp
View File

@ -1041,6 +1041,7 @@ static void window_options_rendering_invalidate(rct_window* w)
else
{
w->disabled_widgets |= (1 << WIDX_ENABLE_LIGHT_FX_CHECKBOX);
gConfigGeneral.enable_light_fx = false;
}
widget_set_checkbox_value(w, WIDX_ENABLE_LIGHT_FX_FOR_VEHICLES_CHECKBOX, gConfigGeneral.enable_light_fx_for_vehicles);
@ -1052,6 +1053,7 @@ static void window_options_rendering_invalidate(rct_window* w)
else
{
w->disabled_widgets |= (1 << WIDX_ENABLE_LIGHT_FX_FOR_VEHICLES_CHECKBOX);
gConfigGeneral.enable_light_fx_for_vehicles = false;
}
widget_set_checkbox_value(

6
src/openrct2/config/Config.cpp
View File

@ -187,9 +187,9 @@ namespace Config
// Default config setting is false until the games canvas can be separated from the effect
model->day_night_cycle = reader->GetBoolean("day_night_cycle", false);
model->enable_light_fx = reader->GetBoolean("enable_light_fx", false);
model->enable_light_fx_for_vehicles = reader->GetBoolean("enable_light_fx_for_vehicles", false);
const bool isHardware = model->drawing_engine != DrawingEngine::Software;
model->enable_light_fx = isHardware && reader->GetBoolean("enable_light_fx", false);
model->enable_light_fx_for_vehicles = isHardware && reader->GetBoolean("enable_light_fx_for_vehicles", false);
model->upper_case_banners = reader->GetBoolean("upper_case_banners", false);
model->disable_lightning_effect = reader->GetBoolean("disable_lightning_effect", false);
model->allow_loading_with_incorrect_checksum = reader->GetBoolean("allow_loading_with_incorrect_checksum", true);