merged the halfpress keys down to just one, and tried to set the base for actually having 4 controllers. still need a way to list keyboard+connected xpads in the wxChoice :)

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@712 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Shawn Hoffman
2008-09-26 14:29:38 +00:00
parent d5116c196c
commit 7a615e9353
3 changed files with 102 additions and 129 deletions

View File

@ -26,23 +26,21 @@ enum
CTL_Y,
CTL_Z,
CTL_START,
CTL_HALFTRIGGER,
CTL_L,
CTL_R,
CTL_MAINUP,
CTL_MAINDOWN,
CTL_MAINLEFT,
CTL_MAINRIGHT,
CTL_HALFMAIN,
CTL_SUBUP,
CTL_SUBDOWN,
CTL_SUBLEFT,
CTL_SUBRIGHT,
CTL_HALFSUB,
CTL_DPADUP,
CTL_DPADDOWN,
CTL_DPADLEFT,
CTL_DPADRIGHT,
CTL_HALFPRESS,
NUMCONTROLS
};
@ -55,23 +53,21 @@ static const char* controlNames[] =
"Y_button",
"Z_trigger",
"Start",
"Soft_trigger_switch",
"L_button",
"R_button",
"Main_stick_up",
"Main_stick_down",
"Main_stick_left",
"Main_stick_right",
"Soft_main_switch",
"Sub_stick_up",
"Sub_stick_down",
"Sub_stick_left",
"Sub_stick_right",
"Soft_sub_switch",
"D-Pad_up",
"D-Pad_down",
"D-Pad_left",
"D-Pad_right",
"half_press_toggle",
};
struct SPads {