diff options
| author | Dolphin Bot <dolphin-emu-bot@users.noreply.github.com> | 2014-09-03 09:15:51 +0200 |
|---|---|---|
| committer | Dolphin Bot <dolphin-emu-bot@users.noreply.github.com> | 2014-09-03 09:15:51 +0200 |
| commit | 6e2b873ec1f5c4c404925b9dfbde863fbaec7102 (patch) | |
| tree | 8f20661ee614db586ac23a700a572e52a140f5ed /Source/Core/InputCommon/ControllerEmu.cpp | |
| parent | db84a22109fc41e0915aca7cee46d43c11d6d0d8 (diff) | |
| parent | 5adbc83453d14b23818442f545ceede0e4548196 (diff) | |
Merge pull request #781 from RachelBryk/ControlState
Change ControlState typedef to double, and change all related floats/dou...
Diffstat (limited to 'Source/Core/InputCommon/ControllerEmu.cpp')
| -rw-r--r-- | Source/Core/InputCommon/ControllerEmu.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/Core/InputCommon/ControllerEmu.cpp b/Source/Core/InputCommon/ControllerEmu.cpp index 87378f86e0..6200ec2002 100644 --- a/Source/Core/InputCommon/ControllerEmu.cpp +++ b/Source/Core/InputCommon/ControllerEmu.cpp @@ -104,7 +104,7 @@ void ControllerEmu::ControlGroup::SaveConfig(IniFile::Section *sec, const std::s { if (s->is_virtual) continue; - sec->Set(group + s->name, s->value*100.0f, s->default_value*100.0f); + sec->Set(group + s->name, (float)s->value * 100.0f, (float)s->default_value * 100.0f); } 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", c->control_ref->range*100.0f, 100.0f); + sec->Set(group + c->name + "/Range", (float) (c->control_ref->range*100.0, 100.0)); } // extensions |