citra/citra-nightly
1
0
Fork 0
mirror of https://github.com/citra-emu/citra-nightly.git synced 2024-12-24 20:05:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed unnecessary debug key abbreviations

Browse source
This commit is contained in:
RicBent 2018-12-28 13:33:54 -06:00
parent 403d2f0058
commit 446b614409
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/citra/default_ini.h
View file

@ -38,7 +38,7 @@ button_l=
button_r=
button_start=
button_select=
button_dbg=
button_debug=
button_zl=
button_zr=
button_home=

2
src/core/hle/service/hid/hid.cpp
View file

@ -87,7 +87,7 @@ void Module::UpdatePadCallback(u64 userdata, s64 cycles_late) {
state.r.Assign(buttons[R - BUTTON_HID_BEGIN]->GetStatus());
state.start.Assign(buttons[Start - BUTTON_HID_BEGIN]->GetStatus());
state.select.Assign(buttons[Select - BUTTON_HID_BEGIN]->GetStatus());
state.dbg.Assign(buttons[Dbg - BUTTON_HID_BEGIN]->GetStatus());
state.debug.Assign(buttons[Debug - BUTTON_HID_BEGIN]->GetStatus());
// Get current circle pad position and update circle pad direction
float circle_pad_x_f, circle_pad_y_f;

2
src/core/hle/service/hid/hid.h
View file

@ -52,7 +52,7 @@ struct PadState {
BitField<9, 1, u32> l;
BitField<10, 1, u32> x;
BitField<11, 1, u32> y;
BitField<12, 1, u32> dbg;
BitField<12, 1, u32> debug;
BitField<28, 1, u32> circle_right;
BitField<29, 1, u32> circle_left;

4
src/core/settings.h
View file

@ -38,7 +38,7 @@ enum Values {
R,
Start,
Select,
Dbg,
Debug,
ZL,
ZR,
@ -73,7 +73,7 @@ static const std::array<const char*, NumButtons> mapping = {{
"button_r",
"button_start",
"button_select",
"button_dbg",
"button_debug",
"button_zl",
"button_zr",
"button_home",