New Wiimote Plugin: Made UDPWiimote use the regular "Nunchuk" extension setting. Having a separate "UDPNunchuk" was really ugly. -some other minor changes.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5863 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Jordan Woyak
2010-07-09 22:11:12 +00:00
parent d0c9a38681
commit 1e4f3c589d
16 changed files with 126 additions and 148 deletions

View File

@ -13,39 +13,20 @@ static const u8 classic_calibration[] =
0x00, 0x00, 0x51, 0xa6
};
// classic buttons
#define CLASSIC_PAD_RIGHT 0x80
#define CLASSIC_PAD_DOWN 0x40
#define CLASSIC_TRIGGER_L 0x20
#define CLASSIC_MINUS 0x10
#define CLASSIC_HOME 0x08
#define CLASSIC_PLUS 0x04
#define CLASSIC_TRIGGER_R 0x02
#define CLASSIC_NOTHING 0x01
#define CLASSIC_ZL 0x8000
#define CLASSIC_B 0x4000
#define CLASSIC_Y 0x2000
#define CLASSIC_A 0x1000
#define CLASSIC_X 0x0800
#define CLASSIC_ZR 0x0400
#define CLASSIC_PAD_LEFT 0x0200
#define CLASSIC_PAD_UP 0x0100
const u16 classic_button_bitmasks[] =
{
CLASSIC_A,
CLASSIC_B,
CLASSIC_X,
CLASSIC_Y,
Classic::BUTTON_A,
Classic::BUTTON_B,
Classic::BUTTON_X,
Classic::BUTTON_Y,
CLASSIC_ZL,
CLASSIC_ZR,
Classic::BUTTON_ZL,
Classic::BUTTON_ZR,
CLASSIC_MINUS,
CLASSIC_PLUS,
Classic::BUTTON_MINUS,
Classic::BUTTON_PLUS,
CLASSIC_HOME,
Classic::BUTTON_HOME,
};
const char* classic_button_names[] =
@ -55,7 +36,7 @@ const char* classic_button_names[] =
const u16 classic_trigger_bitmasks[] =
{
CLASSIC_TRIGGER_L, CLASSIC_TRIGGER_R,
Classic::TRIGGER_L, Classic::TRIGGER_R,
};
const char* const classic_trigger_names[] =
@ -65,7 +46,7 @@ const char* const classic_trigger_names[] =
const u16 classic_dpad_bitmasks[] =
{
CLASSIC_PAD_UP, CLASSIC_PAD_DOWN, CLASSIC_PAD_LEFT, CLASSIC_PAD_RIGHT
Classic::PAD_UP, Classic::PAD_DOWN, Classic::PAD_LEFT, Classic::PAD_RIGHT
};
Classic::Classic() : Attachment( "Classic" )