mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-07-23 18:45:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIxed memory.cpp errors from testing PR #3117 (MacOS fixes)

Browse Source
This commit is contained in:
nickci2002 2025-06-19 17:47:53 -04:00
parent 32e662d013
commit 48076d27e3
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/memory.h
View File

@ -93,7 +93,7 @@ struct VirtualMemoryArea {
VMAType type = VMAType::Free; VMAType type = VMAType::Free;
MemoryProt prot = MemoryProt::NoAccess; MemoryProt prot = MemoryProt::NoAccess;
bool disallow_merge = false; bool disallow_merge = false;
std::string_view name = ""; std::string name = "";
uintptr_t fd = 0; uintptr_t fd = 0;
bool is_exec = false; bool is_exec = false;

6
src/qt_gui/kbm_help_dialog.cpp
View File

@ -205,8 +205,10 @@ Controller:
If you have a controller that has different names for buttons, it will still work, just look up what are the equivalent names for that controller If you have a controller that has different names for buttons, it will still work, just look up what are the equivalent names for that controller
The same left-right rule still applies here. The same left-right rule still applies here.
Buttons: Buttons:
'triangle', 'circle', 'cross', 'square', 'l1', 'l3', 'triangle', 'circle', 'cross', 'square', 'l1', 'l3',
'options', 'touchpad', 'up', 'down', 'left', 'right' 'options', touchpad', 'up', 'down', 'left', 'right'
Input-only:
'lpaddle_low', 'lpaddle_high'
Axes if you bind them to a button input: Axes if you bind them to a button input:
'axis_left_x_plus', 'axis_left_x_minus', 'axis_left_y_plus', 'axis_left_y_minus', 'axis_left_x_plus', 'axis_left_x_minus', 'axis_left_y_plus', 'axis_left_y_minus',
'axis_right_x_plus', ..., 'axis_right_y_minus', 'axis_right_x_plus', ..., 'axis_right_y_minus',