dahjah/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2026-06-02 21:05:13 -06:00
Code Issues Packages Projects Releases Wiki Activity

Add setting to toggle Enter button from cross to circle (#4427)

Browse Source 
* Add setting to toggle Enter button from cross to circle

* clang is not my friend :(
This commit is contained in:
kalaposfos13 2026-05-15 13:05:00 +02:00 committed by GitHub
parent b89e356cfa
commit e36dff45f4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/emulator_settings.h
View File

@ -293,6 +293,7 @@ struct InputSettings {
Setting<bool> background_controller_input{false}; // specific Setting<bool> background_controller_input{false}; // specific
Setting<bool> ime_accessibility_enabled{false}; // specific Setting<bool> ime_accessibility_enabled{false}; // specific
Setting<bool> ime_url_mail_short_panel{false}; // specific Setting<bool> ime_url_mail_short_panel{false}; // specific
Setting<bool> is_circle_enter{false}; // specific
Setting<s32> camera_id{-1}; Setting<s32> camera_id{-1};
std::vector<OverrideItem> GetOverrideableFields() const { std::vector<OverrideItem> GetOverrideableFields() const {
@ -309,6 +310,7 @@ struct InputSettings {
&InputSettings::ime_accessibility_enabled), &InputSettings::ime_accessibility_enabled),
make_override<InputSettings>("ime_url_mail_short_panel", make_override<InputSettings>("ime_url_mail_short_panel",
&InputSettings::ime_url_mail_short_panel), &InputSettings::ime_url_mail_short_panel),
make_override<InputSettings>("is_circle_enter", &InputSettings::is_circle_enter),
make_override<InputSettings>("camera_id", &InputSettings::camera_id)}; make_override<InputSettings>("camera_id", &InputSettings::camera_id)};
} }
}; };
@ -316,7 +318,8 @@ NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(InputSettings, cursor_state, cursor_hide_time
usb_device_backend, use_special_pad, special_pad_class, usb_device_backend, use_special_pad, special_pad_class,
motion_controls_enabled, use_unified_input_config, motion_controls_enabled, use_unified_input_config,
default_controller_id, background_controller_input, default_controller_id, background_controller_input,
ime_accessibility_enabled, ime_url_mail_short_panel, camera_id) ime_accessibility_enabled, ime_url_mail_short_panel, camera_id,
is_circle_enter)
// ------------------------------- // -------------------------------
// Audio settings // Audio settings
// ------------------------------- // -------------------------------
@ -675,6 +678,7 @@ public:
SETTING_FORWARD(m_input, SpecialPadClass, special_pad_class) SETTING_FORWARD(m_input, SpecialPadClass, special_pad_class)
SETTING_FORWARD_BOOL(m_input, UseUnifiedInputConfig, use_unified_input_config) SETTING_FORWARD_BOOL(m_input, UseUnifiedInputConfig, use_unified_input_config)
SETTING_FORWARD(m_input, CameraId, camera_id) SETTING_FORWARD(m_input, CameraId, camera_id)
SETTING_FORWARD_BOOL(m_input, CircleEnter, is_circle_enter)
// Vulkan settings // Vulkan settings
SETTING_FORWARD(m_vulkan, GpuId, gpu_id) SETTING_FORWARD(m_vulkan, GpuId, gpu_id)

3
src/core/libraries/system/systemservice.cpp
View File

@ -1935,7 +1935,8 @@ s32 PS4_SYSV_ABI sceSystemServiceParamGetInt(OrbisSystemServiceParamId param_id,
*value = u32(OrbisSystemParamGameParentalLevel::Off); *value = u32(OrbisSystemParamGameParentalLevel::Off);
break; break;
case OrbisSystemServiceParamId::EnterButtonAssign: case OrbisSystemServiceParamId::EnterButtonAssign:
*value = u32(OrbisSystemParamEnterButtonAssign::Cross); *value = u32(EmulatorSettings.IsCircleEnter() ? OrbisSystemParamEnterButtonAssign::Circle
: OrbisSystemParamEnterButtonAssign::Cross);
break; break;
default: default:
LOG_ERROR(Lib_SystemService, "param_id {} unsupported!", u32(param_id)); LOG_ERROR(Lib_SystemService, "param_id {} unsupported!", u32(param_id));