From fe6c2a585a7ba59582723b2fef827dd15bbc8f22 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 19 May 2012 18:54:56 +0300 Subject: Fix code style. --- src/client.cpp | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) (limited to 'src/client.cpp') diff --git a/src/client.cpp b/src/client.cpp index 18740cfd5..89e3f6ecf 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -2012,26 +2012,25 @@ void Client::storeSafeParameters() width = config.getIntValue("screenwidth"); height = config.getIntValue("screenheight"); + tmpHwaccel = config.getBoolValue("hwaccel"); - if (!mOptions.safeMode && !tmpOpengl) - { - tmpHwaccel = config.getBoolValue("hwaccel"); - - tmpFpslimit = config.getIntValue("fpslimit"); - tmpAltFpslimit = config.getIntValue("altfpslimit"); - tmpSound = config.getBoolValue("sound"); + tmpFpslimit = config.getIntValue("fpslimit"); + tmpAltFpslimit = config.getIntValue("altfpslimit"); + tmpSound = config.getBoolValue("sound"); - font = config.getStringValue("font"); - bFont = config.getStringValue("boldFont"); - particleFont = config.getStringValue("particleFont"); - helpFont = config.getStringValue("helpFont"); - secureFont = config.getStringValue("secureFont"); - japanFont = config.getStringValue("japanFont"); + font = config.getStringValue("font"); + bFont = config.getStringValue("boldFont"); + particleFont = config.getStringValue("particleFont"); + helpFont = config.getStringValue("helpFont"); + secureFont = config.getStringValue("secureFont"); + japanFont = config.getStringValue("japanFont"); - showBackground = config.getBoolValue("showBackground"); - enableMumble = config.getBoolValue("enableMumble"); - enableMapReduce = config.getBoolValue("enableMapReduce"); + showBackground = config.getBoolValue("showBackground"); + enableMumble = config.getBoolValue("enableMumble"); + enableMapReduce = config.getBoolValue("enableMapReduce"); + if (!mOptions.safeMode && !tmpOpengl) + { // if video mode configured reset most settings to safe config.setValue("hwaccel", false); config.setValue("opengl", 0); -- cgit v1.2.3-60-g2f50