diff options
| author | shuffle2 <godisgovernment@gmail.com> | 2014-09-04 08:42:22 -0700 |
|---|---|---|
| committer | shuffle2 <godisgovernment@gmail.com> | 2014-09-04 08:42:22 -0700 |
| commit | b5e18993f91f5b01b87e27388d4ce08c335137ec (patch) | |
| tree | 81b6d731e9df75320ec03705c35d2960b14d9c67 /Source/Core/InputCommon/ControllerEmu.cpp | |
| parent | d6000e475b0620c698f5df53cc5319b39b14a38c (diff) | |
| parent | 1cc153b4ed15927304fab732ed73d584087c1035 (diff) | |
Merge pull request #964 from RachelBryk/typo
Fix a typo introduced by 5adbc83 in ControllerEmu.cpp.
Diffstat (limited to 'Source/Core/InputCommon/ControllerEmu.cpp')
| -rw-r--r-- | Source/Core/InputCommon/ControllerEmu.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/Core/InputCommon/ControllerEmu.cpp b/Source/Core/InputCommon/ControllerEmu.cpp index 6200ec2002..420944d713 100644 --- a/Source/Core/InputCommon/ControllerEmu.cpp +++ b/Source/Core/InputCommon/ControllerEmu.cpp @@ -55,7 +55,7 @@ void ControllerEmu::ControlGroup::LoadConfig(IniFile::Section *sec, const std::s sec->Get(group + c->name, &c->control_ref->expression, ""); // range - sec->Get(group + c->name + "/Range", &c->control_ref->range, 100.0f); + sec->Get(group + c->name + "/Range", &c->control_ref->range, 100.0); c->control_ref->range /= 100; } @@ -104,7 +104,7 @@ void ControllerEmu::ControlGroup::SaveConfig(IniFile::Section *sec, const std::s { if (s->is_virtual) continue; - sec->Set(group + s->name, (float)s->value * 100.0f, (float)s->default_value * 100.0f); + sec->Set(group + s->name, s->value * 100.0, s->default_value * 100.0); } for (auto& c : controls) @@ -113,7 +113,7 @@ void ControllerEmu::ControlGroup::SaveConfig(IniFile::Section *sec, const std::s sec->Set(group + c->name, c->control_ref->expression, ""); // range - sec->Set(group + c->name + "/Range", (float) (c->control_ref->range*100.0, 100.0)); + sec->Set(group + c->name + "/Range", c->control_ref->range*100.0, 100.0); } // extensions |