Yaya48/dolphin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into android-new-control-input-overlay

Browse Source 
Conflicts:
	Source/Core/DolphinWX/Src/Android/ButtonManager.h
This commit is contained in:
Ryan Houdek
2013-11-13 16:17:42 -06:00
parent 3c7613fc83 63a9dff3bb
commit 2a23bdde6f
1107 changed files with 133362 additions and 62766 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Core/DolphinWX/Src/Android/ButtonManager.h
+4 -4
View File
@@ -76,11 +76,11 @@ namespace ButtonManager
const BindType m_bindtype;
const int m_bind;
const float m_neg;
sBind(ButtonType buttontype, BindType bindtype, int bind, float neg)
: m_buttontype(buttontype), m_bindtype(bindtype), m_bind(bind), m_neg(neg)
sBind(ButtonType buttontype, BindType bindtype, int bind, float neg)
: m_buttontype(buttontype), m_bindtype(bindtype), m_bind(bind), m_neg(neg)
{}
};
class InputDevice
{
@@ -99,7 +99,7 @@ namespace ButtonManager
for (auto it = m_binds.begin(); it != m_binds.end(); ++it)
delete it->second;
}
void AddBind(sBind *bind) { m_binds[bind->m_buttontype] = bind; }
void AddBind(sBind *bind) { m_binds[bind->m_buttontype] = bind; }
void PressEvent(int button, int action);
void AxisEvent(int axis, float value);
bool ButtonValue(ButtonType button);