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

Merge remote-tracking branch 'origin/master' into bumpy

Browse Source
This commit is contained in:
hiker 2014-08-05 08:26:05 +10:00
commit 1ba6537e37
2 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/graphics/irr_driver.cpp
View File

@ -342,8 +342,18 @@ void IrrDriver::initDevice()
core::dimension2d<u32> res = core::dimension2du(UserConfigParams::m_width, UserConfigParams::m_height); core::dimension2d<u32> res = core::dimension2du(UserConfigParams::m_width, UserConfigParams::m_height);
res = m_device->getVideoModeList()->getVideoModeResolution(res, res); res = m_device->getVideoModeList()->getVideoModeResolution(res, res);
if (res.Width > 0 && res.Height > 0)
{
UserConfigParams::m_width = res.Width; UserConfigParams::m_width = res.Width;
UserConfigParams::m_height = res.Height; UserConfigParams::m_height = res.Height;
}
else
{
Log::verbose("irr_driver", "Cannot get information about "
"resolutions. Try to use the default one.");
UserConfigParams::m_width = MIN_SUPPORTED_WIDTH;
UserConfigParams::m_height = MIN_SUPPORTED_HEIGHT;
}
m_device->closeDevice(); m_device->closeDevice();
m_video_driver = NULL; m_video_driver = NULL;
@ -414,8 +424,8 @@ void IrrDriver::initDevice()
// size is the problem // size is the problem
if(!m_device) if(!m_device)
{ {
UserConfigParams::m_width = (int)ssize.Width; UserConfigParams::m_width = MIN_SUPPORTED_WIDTH;
UserConfigParams::m_height = (int)ssize.Height; UserConfigParams::m_height = MIN_SUPPORTED_HEIGHT;
m_device = createDevice(video::EDT_OPENGL, m_device = createDevice(video::EDT_OPENGL,
core::dimension2du(UserConfigParams::m_width, core::dimension2du(UserConfigParams::m_width,

2
src/states_screens/dialogs/custom_video_settings.cpp
View File

@ -113,7 +113,7 @@ GUIEngine::EventPropagation CustomVideoSettingsDialog::processEvent(const std::s
UserConfigParams::m_motionblur = UserConfigParams::m_motionblur =
advanced_pipeline && getWidget<CheckBoxWidget>("motionblur")->getState(); advanced_pipeline && getWidget<CheckBoxWidget>("motionblur")->getState();
if (advanced_pipeline && getWidget<CheckBoxWidget>("ubo")->getState()) if (advanced_pipeline)
{ {
UserConfigParams::m_shadows = UserConfigParams::m_shadows =
getWidget<SpinnerWidget>("shadows")->getValue(); getWidget<SpinnerWidget>("shadows")->getValue();