ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8172 from nokturnusmf/relative-input-hold 

Added (held) key for relative input
This commit is contained in:
Connor McLaughlin 2019-08-10 00:37:53 +10:00 committed by GitHub
parent 5c3e9a34c3 c62570c527
commit 428ae5a43d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/InputCommon/ControllerEmu/ControlGroup/Cursor.cpp
View File

@ -31,6 +31,8 @@ Cursor::Cursor(std::string name, std::string ui_name)
controls.emplace_back(std::make_unique<Input>(Translate, _trans("Hide")));
controls.emplace_back(std::make_unique<Input>(Translate, _trans("Recenter")));
controls.emplace_back(std::make_unique<Input>(Translate, _trans("Relative Input Hold")));
// Default values are optimized for "Super Mario Galaxy 2".
// This seems to be acceptable for a good number of games.
@ -101,7 +103,7 @@ Cursor::StateData Cursor::GetState(const bool adjusted)
const double max_step = STEP_PER_SEC / 1000.0 * ms_since_update;
// Relative input:
if (m_relative_setting.GetValue())
if (m_relative_setting.GetValue() ^ (controls[6]->control_ref->State() > BUTTON_THRESHOLD))
{
// Recenter:
if (controls[5]->control_ref->State() > BUTTON_THRESHOLD)