summaryrefslogtreecommitdiff
path: root/Source/Core/InputCommon/ControllerEmu.cpp
diff options
context:
space:
mode:
authorshuffle2 <godisgovernment@gmail.com>2014-09-04 19:34:01 -0700
committershuffle2 <godisgovernment@gmail.com>2014-09-04 19:34:01 -0700
commit9c41b17b416f7687e2b9f3df02627018b5786e80 (patch)
treee593a2eca1dded7d869e88b5487ccd8ccf03921e /Source/Core/InputCommon/ControllerEmu.cpp
parentf09978ddeb608bd15e071aae6b208e79b6333119 (diff)
parent411c0605043d3779d0c3fc5ed2d3b78e4c03b100 (diff)
Merge pull request #945 from MikeRavenelle/inputConfig
Edit Auto iterate through configuration inputs with toggle
Diffstat (limited to 'Source/Core/InputCommon/ControllerEmu.cpp')
-rw-r--r--Source/Core/InputCommon/ControllerEmu.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/Source/Core/InputCommon/ControllerEmu.cpp b/Source/Core/InputCommon/ControllerEmu.cpp
index 420944d713..34a6fade25 100644
--- a/Source/Core/InputCommon/ControllerEmu.cpp
+++ b/Source/Core/InputCommon/ControllerEmu.cpp
@@ -45,6 +45,8 @@ void ControllerEmu::ControlGroup::LoadConfig(IniFile::Section *sec, const std::s
{
if (s->is_virtual)
continue;
+ if (s->is_iterate)
+ continue;
sec->Get(group + s->name, &s->value, s->default_value * 100);
s->value /= 100;
}
@@ -104,6 +106,9 @@ void ControllerEmu::ControlGroup::SaveConfig(IniFile::Section *sec, const std::s
{
if (s->is_virtual)
continue;
+ if (s->is_iterate)
+ continue;
+
sec->Set(group + s->name, s->value * 100.0, s->default_value * 100.0);
}