ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prevent crashes due to invalid values in shadow resolution

Browse Source
This commit is contained in:
Marianne Gagnon 2015-01-12 19:05:54 -05:00
parent 08cb4b4297
commit a2c8e1d982
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/graphics/irr_driver.cpp
View File

@ -481,6 +481,15 @@ void IrrDriver::initDevice()
CVS->init();
if (UserConfigParams::m_shadows_resolution != 0 &&
(UserConfigParams::m_shadows_resolution < 512 ||
UserConfigParams::m_shadows_resolution > 2048))
{
Log::warn("IrrDriver", "Invalid value for UserConfigParams::m_shadows_resolution : %i",
(int)UserConfigParams::m_shadows_resolution);
UserConfigParams::m_shadows_resolution = 0;
}
// This remaps the window, so it has to be done before the clear to avoid flicker
m_device->setResizable(false);

10
src/states_screens/options_screen_video.cpp
View File

@ -95,7 +95,7 @@ static GFXPreset GFX_PRESETS[] =
},
{
true /* light */, 2 /* shadow */, true /* bloom */, true /* motionblur */,
true /* light */, 1024 /* shadow */, true /* bloom */, true /* motionblur */,
true /* lightshaft */, true /* glow */, true /* mlaa */, true /* ssao */, true /* weather */,
true /* animatedScenery */, 2 /* animatedCharacters */, 16 /* anisotropy */,
true /* depth of field */, true /* global illumination */
@ -442,9 +442,11 @@ void OptionsScreenVideo::updateTooltip()
tooltip = tooltip + L"\n" + _("Ambient occlusion : %s",
UserConfigParams::m_ssao ? enabled : disabled);
//I18N: in graphical options
tooltip = tooltip + L"\n" + _("Shadows: %s",
UserConfigParams::m_shadows_resolution == 1 ? "low" : UserConfigParams::m_shadows_resolution == 2 ?
"high" : disabled);
if (UserConfigParams::m_shadows_resolution == 0)
tooltip = tooltip + L"\n" + _("Shadows: %s", disabled);
else
tooltip = tooltip + L"\n" + _("Shadows: %i", UserConfigParams::m_shadows_resolution);
//I18N: in graphical options
tooltip = tooltip + L"\n" + _("Bloom : %s",
UserConfigParams::m_bloom ? enabled : disabled);