github/duckstation
1
0
Fork 0
mirror of https://github.com/stenzek/duckstation.git synced 2025-06-07 12:05:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Controller: Remove analog-mode-start OSD message

Browse Source 
It's arguably not very useful, and the sticks are mapped to the
dpad in digital mode anyway.
This commit is contained in:
Stenzek 2025-01-11 15:15:00 +10:00
parent 440aaf2644
commit 4af5e96ff6
No known key found for this signature in database
2 changed files with 9 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/core/analog_controller.cpp
View File

@ -63,20 +63,10 @@ void AnalogController::Reset()
if (m_force_analog_on_reset) if (m_force_analog_on_reset)
{ {
if (!CanStartInAnalogMode(ControllerType::AnalogController)) if (CanStartInAnalogMode(ControllerType::AnalogController))
{
Host::AddIconOSDMessage(
fmt::format("Controller{}AnalogMode", m_index), ICON_PF_GAMEPAD_ALT,
TRANSLATE_STR("OSDMessage",
"Analog mode forcing is disabled by game settings. Controller will start in digital mode."),
10.0f);
}
else
{
SetAnalogMode(true, false); SetAnalogMode(true, false);
} }
} }
}
bool AnalogController::DoState(StateWrapper& sw, bool apply_input_state) bool AnalogController::DoState(StateWrapper& sw, bool apply_input_state)
{ {

26
src/core/negcon_rumble.cpp
View File

@ -69,20 +69,10 @@ void NeGconRumble::Reset()
if (m_force_analog_on_reset) if (m_force_analog_on_reset)
{ {
if (!CanStartInAnalogMode(ControllerType::AnalogController)) if (CanStartInAnalogMode(ControllerType::AnalogController))
{
Host::AddIconOSDMessage(
fmt::format("Controller{}AnalogMode", m_index), ICON_FA_GAMEPAD,
TRANSLATE_STR("OSDMessage",
"Analog mode forcing is disabled by game settings. Controller will start in digital mode."),
10.0f);
}
else
{
SetAnalogMode(true, false); SetAnalogMode(true, false);
} }
} }
}
bool NeGconRumble::DoState(StateWrapper& sw, bool apply_input_state) bool NeGconRumble::DoState(StateWrapper& sw, bool apply_input_state)
{ {
@ -720,14 +710,14 @@ std::unique_ptr<NeGconRumble> NeGconRumble::Create(u32 index)
static const Controller::ControllerBindingInfo s_binding_info[] = { static const Controller::ControllerBindingInfo s_binding_info[] = {
#define BUTTON(name, display_name, icon_name, button, genb) \ #define BUTTON(name, display_name, icon_name, button, genb) \
{ \ {name, display_name, icon_name, static_cast<u32>(button), InputBindingInfo::Type::Button, genb}
name, display_name, icon_name, static_cast<u32>(button), InputBindingInfo::Type::Button, genb \
}
#define AXIS(name, display_name, icon_name, halfaxis, genb) \ #define AXIS(name, display_name, icon_name, halfaxis, genb) \
{ \ {name, \
name, display_name, icon_name, static_cast<u32>(NeGconRumble::Button::Count) + static_cast<u32>(halfaxis), \ display_name, \
InputBindingInfo::Type::HalfAxis, genb \ icon_name, \
} static_cast<u32>(NeGconRumble::Button::Count) + static_cast<u32>(halfaxis), \
InputBindingInfo::Type::HalfAxis, \
genb}
// clang-format off // clang-format off
BUTTON("Up", TRANSLATE_NOOP("NeGconRumble", "D-Pad Up"), ICON_PF_DPAD_UP, NeGconRumble::Button::Up, GenericInputBinding::DPadUp), BUTTON("Up", TRANSLATE_NOOP("NeGconRumble", "D-Pad Up"), ICON_PF_DPAD_UP, NeGconRumble::Button::Up, GenericInputBinding::DPadUp),