Make key map screen hint which map conflicts

This commit is contained in:
Daniel Dressler committed 2013-07-03 22:29:18 -07:00
1 parent 460c03a00d
commit 6d290f4530
3 files changed
+14 -2

No files matched your search

+9
View File
@@ -214,6 +214,15 @@ bool KeyMap::IsMappedKey(int key)
}
bool KeyMap::IsUserDefined(int key)
{
int layer = 0;
int ignored;
FindKeyMapping(key, &layer, &ignored);
return layer == 0; // key found in user settings
}
std::string KeyMap::NamePspButtonFromKey(int key)
{
return KeyMap::GetPspButtonName(KeyMap::KeyToPspButton(key));