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

@ -6,25 +6,13 @@ namespace WiimoteEmu
static const u8 guitar_id[] = { 0x00, 0x00, 0xa4, 0x20, 0x01, 0x03 };
// guitar buttons
#define GUITAR_PLUS 0x04
#define GUITAR_MINUS 0x10
#define GUITAR_BAR_DOWN 0x40
#define GUITAR_BAR_UP 0x0100
#define GUITAR_YELLOW 0x0800
#define GUITAR_GREEN 0x1000
#define GUITAR_BLUE 0x2000
#define GUITAR_RED 0x4000
#define GUITAR_ORANGE 0x8000
const u16 guitar_fret_bitmasks[] =
{
GUITAR_GREEN,
GUITAR_RED,
GUITAR_YELLOW,
GUITAR_BLUE,
GUITAR_ORANGE,
Guitar::FRET_GREEN,
Guitar::FRET_RED,
Guitar::FRET_YELLOW,
Guitar::FRET_BLUE,
Guitar::FRET_ORANGE,
};
const char* guitar_fret_names[] =
@ -34,14 +22,14 @@ const char* guitar_fret_names[] =
const u16 guitar_button_bitmasks[] =
{
GUITAR_MINUS,
GUITAR_PLUS,
Guitar::BUTTON_MINUS,
Guitar::BUTTON_PLUS,
};
const u16 guitar_strum_bitmasks[] =
{
GUITAR_BAR_UP,
GUITAR_BAR_DOWN,
Guitar::BAR_UP,
Guitar::BAR_DOWN,
};
Guitar::Guitar() : Attachment( "Guitar" )