diff options
author | Andrei Karas <akaras@inbox.ru> | 2012-05-19 18:54:56 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2012-05-19 18:54:56 +0300 |
commit | fe6c2a585a7ba59582723b2fef827dd15bbc8f22 (patch) | |
tree | d2e1c9015084f4d99474babd00df0d8974eea498 /src/client.cpp | |
parent | 804154afbee8843dde358837ec18ab7bfb785088 (diff) | |
download | mv-fe6c2a585a7ba59582723b2fef827dd15bbc8f22.tar.gz mv-fe6c2a585a7ba59582723b2fef827dd15bbc8f22.tar.bz2 mv-fe6c2a585a7ba59582723b2fef827dd15bbc8f22.tar.xz mv-fe6c2a585a7ba59582723b2fef827dd15bbc8f22.zip |
Fix code style.
Diffstat (limited to 'src/client.cpp')
-rw-r--r-- | src/client.cpp | 31 |
1 files changed, 15 insertions, 16 deletions
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); |