diff --git a/pcsx2/Input/InputManager.cpp b/pcsx2/Input/InputManager.cpp index 456aac7157..e0723d0a3e 100644 --- a/pcsx2/Input/InputManager.cpp +++ b/pcsx2/Input/InputManager.cpp @@ -284,11 +284,13 @@ TinyString InputManager::ConvertKeyboardKeyToString(InputBindingKey key, bool di { const std::optional str(ConvertHostKeyboardCodeToString(key.data)); if (str.has_value() && !str->empty()) + { if (display) // Keyboard keys arn't spaced out for display yet ret.format("Keyboard {}", str->c_str()); else ret.format("Keyboard/{}", str->c_str()); + } } return ret; @@ -320,7 +322,7 @@ TinyString InputManager::ConvertPointerKeyToString(InputBindingKey key, bool dis else if (key.source_subtype == InputSubclass::PointerAxis) { if (display) - ret.format("Pointer-{} {}{:c}", u32{key.source_index}, s_pointer_axis_setting_names[key.data], + ret.format("Pointer-{} {}{:c}", u32{key.source_index}, s_pointer_axis_names[key.data], key.modifier == InputModifier::Negate ? '-' : '+'); else ret.format("Pointer-{}/{}{:c}", u32{key.source_index}, s_pointer_axis_setting_names[key.data], @@ -608,7 +610,7 @@ void InputManager::AddBindings(const std::vector& bindings, const I std::vector new_bindings; new_bindings.reserve(bindings.size()); - for (int i = 0; i < bindings.size(); i++) + for (size_t i = 0; i < bindings.size(); i++) { if (ibindings[i]) new_bindings.push_back(ConvertInputBindingKeysToString(binding_type, ibindings[i]->keys, ibindings[i]->num_keys, true)); @@ -627,7 +629,7 @@ void InputManager::AddBindings(const std::vector& bindings, const I { // LayeredSettingsInterface, Need to find which layer our binding came from LayeredSettingsInterface& lsi = static_cast(si); - for (int i = 0; i < LayeredSettingsInterface::NUM_LAYERS; i++) + for (u32 i = 0; i < LayeredSettingsInterface::NUM_LAYERS; i++) { SettingsInterface* layer = lsi.GetLayer(static_cast(i)); if (layer && layer->GetStringList(section, key) == bindings)