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_shortcutter.h | |
| parent | 28f6a79706b088c37268a59d90878220dc4ef9c7 (diff) | |
| parent | 3af10766fd2b58b068e970266724d7eb10e9316b (diff) | |
| download | dragonfireclient-5d9ae5a91c544fc7fbd475decf47cef7e09ef8fc.tar.xz | |
Merge branch 'master' into master
Diffstat (limited to 'src/util/quicktune_shortcutter.h')
| -rw-r--r-- | src/util/quicktune_shortcutter.h | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/src/util/quicktune_shortcutter.h b/src/util/quicktune_shortcutter.h index 70a7b70b3..15a9a07ef 100644 --- a/src/util/quicktune_shortcutter.h +++ b/src/util/quicktune_shortcutter.h @@ -27,11 +27,9 @@ private: std::vector<std::string> m_names; u32 m_selected_i; std::string m_message; + public: - bool hasMessage() const - { - return !m_message.empty(); - } + bool hasMessage() const { return !m_message.empty(); } std::string getMessage() { @@ -43,42 +41,42 @@ public: } std::string getSelectedName() { - if(m_selected_i < m_names.size()) + if (m_selected_i < m_names.size()) return m_names[m_selected_i]; return "(nothing)"; } void next() { m_names = getQuicktuneNames(); - if(m_selected_i < m_names.size()-1) + if (m_selected_i < m_names.size() - 1) m_selected_i++; else m_selected_i = 0; - m_message = std::string("Selected \"")+getSelectedName()+"\""; + m_message = std::string("Selected \"") + getSelectedName() + "\""; } void prev() { m_names = getQuicktuneNames(); - if(m_selected_i > 0) + if (m_selected_i > 0) m_selected_i--; else - m_selected_i = m_names.size()-1; - m_message = std::string("Selected \"")+getSelectedName()+"\""; + m_selected_i = m_names.size() - 1; + m_message = std::string("Selected \"") + getSelectedName() + "\""; } void inc() { QuicktuneValue val = getQuicktuneValue(getSelectedName()); val.relativeAdd(0.05); - m_message = std::string("\"")+getSelectedName() - +"\" = "+val.getString(); + m_message = std::string("\"") + getSelectedName() + + "\" = " + val.getString(); setQuicktuneValue(getSelectedName(), val); } void dec() { QuicktuneValue val = getQuicktuneValue(getSelectedName()); val.relativeAdd(-0.05); - m_message = std::string("\"")+getSelectedName() - +"\" = "+val.getString(); + m_message = std::string("\"") + getSelectedName() + + "\" = " + val.getString(); setQuicktuneValue(getSelectedName(), val); } }; |