diff options
| author | Elias Fleckenstein <54945686+EliasFleckenstein03@users.noreply.github.com> | 2020-11-04 16:44:42 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-04 16:44:42 +0100 |
| commit | 5d9ae5a91c544fc7fbd475decf47cef7e09ef8fc (patch) | |
| tree | c980d614fec4a5495798be3e79e033229062c3cd /src/util/quicktune.cpp | |
| parent | 28f6a79706b088c37268a59d90878220dc4ef9c7 (diff) | |
| parent | 3af10766fd2b58b068e970266724d7eb10e9316b (diff) | |
| download | dragonfireclient-5d9ae5a91c544fc7fbd475decf47cef7e09ef8fc.tar.xz | |
Merge branch 'master' into master
Diffstat (limited to 'src/util/quicktune.cpp')
| -rw-r--r-- | src/util/quicktune.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/util/quicktune.cpp b/src/util/quicktune.cpp index 37d4933de..e7409c894 100644 --- a/src/util/quicktune.cpp +++ b/src/util/quicktune.cpp @@ -23,7 +23,7 @@ with this program; if not, write to the Free Software Foundation, Inc., std::string QuicktuneValue::getString() { - switch(type){ + switch (type) { case QVT_NONE: return "(none)"; case QVT_FLOAT: @@ -33,14 +33,15 @@ std::string QuicktuneValue::getString() } void QuicktuneValue::relativeAdd(float amount) { - switch(type){ + switch (type) { case QVT_NONE: break; case QVT_FLOAT: - value_QVT_FLOAT.current += amount * (value_QVT_FLOAT.max - value_QVT_FLOAT.min); - if(value_QVT_FLOAT.current > value_QVT_FLOAT.max) + value_QVT_FLOAT.current += + amount * (value_QVT_FLOAT.max - value_QVT_FLOAT.min); + if (value_QVT_FLOAT.current > value_QVT_FLOAT.max) value_QVT_FLOAT.current = value_QVT_FLOAT.max; - if(value_QVT_FLOAT.current < value_QVT_FLOAT.min) + if (value_QVT_FLOAT.current < value_QVT_FLOAT.min) value_QVT_FLOAT.current = value_QVT_FLOAT.min; break; } @@ -52,7 +53,7 @@ std::mutex *g_mutex = NULL; static void makeMutex() { - if(!g_mutex){ + if (!g_mutex) { g_mutex = new std::mutex(); } } @@ -67,7 +68,7 @@ QuicktuneValue getQuicktuneValue(const std::string &name) makeMutex(); MutexAutoLock lock(*g_mutex); std::map<std::string, QuicktuneValue>::iterator i = g_values.find(name); - if(i == g_values.end()){ + if (i == g_values.end()) { QuicktuneValue val; val.type = QVT_NONE; return val; @@ -88,17 +89,16 @@ void updateQuicktuneValue(const std::string &name, QuicktuneValue &val) makeMutex(); MutexAutoLock lock(*g_mutex); std::map<std::string, QuicktuneValue>::iterator i = g_values.find(name); - if(i == g_values.end()){ + if (i == g_values.end()) { g_values[name] = val; g_names.push_back(name); return; } QuicktuneValue &ref = i->second; - if(ref.modified) + if (ref.modified) val = ref; - else{ + else { ref = val; ref.modified = false; } } - |