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

Input: Fix warnings

This commit is contained in:
TheLastRar 2025-03-04 00:23:21 +00:00 committed by lightningterror
parent 2b172903b9
commit 1e075d23b2
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pcsx2/Input/InputManager.cpp
View File

@ -284,11 +284,13 @@ TinyString InputManager::ConvertKeyboardKeyToString(InputBindingKey key, bool di
{ {
const std::optional<std::string> str(ConvertHostKeyboardCodeToString(key.data)); const std::optional<std::string> str(ConvertHostKeyboardCodeToString(key.data));
if (str.has_value() && !str->empty()) if (str.has_value() && !str->empty())
{
if (display) if (display)
// Keyboard keys arn't spaced out for display yet // Keyboard keys arn't spaced out for display yet
ret.format("Keyboard {}", str->c_str()); ret.format("Keyboard {}", str->c_str());
else else
ret.format("Keyboard/{}", str->c_str()); ret.format("Keyboard/{}", str->c_str());
}
} }
return ret; return ret;
@ -320,7 +322,7 @@ TinyString InputManager::ConvertPointerKeyToString(InputBindingKey key, bool dis
else if (key.source_subtype == InputSubclass::PointerAxis) else if (key.source_subtype == InputSubclass::PointerAxis)
{ {
if (display) 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 ? '-' : '+'); key.modifier == InputModifier::Negate ? '-' : '+');
else else
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_setting_names[key.data],
@ -608,7 +610,7 @@ void InputManager::AddBindings(const std::vector<std::string>& bindings, const I
std::vector<std::string> new_bindings; std::vector<std::string> new_bindings;
new_bindings.reserve(bindings.size()); 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]) if (ibindings[i])
new_bindings.push_back(ConvertInputBindingKeysToString(binding_type, ibindings[i]->keys, ibindings[i]->num_keys, true)); 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<std::string>& bindings, const I
{ {
// LayeredSettingsInterface, Need to find which layer our binding came from // LayeredSettingsInterface, Need to find which layer our binding came from
LayeredSettingsInterface& lsi = static_cast<LayeredSettingsInterface&>(si); LayeredSettingsInterface& lsi = static_cast<LayeredSettingsInterface&>(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<LayeredSettingsInterface::Layer>(i)); SettingsInterface* layer = lsi.GetLayer(static_cast<LayeredSettingsInterface::Layer>(i));
if (layer && layer->GetStringList(section, key) == bindings) if (layer && layer->GetStringList(section, key) == bindings)