Correct key bindings for directions

This commit is contained in:
simon.kagstrom 2009-02-21 09:49:20 +00:00
parent f02a2d7055
commit 54c033bc61
3 changed files with 10 additions and 10 deletions

View File

@ -251,9 +251,9 @@ char *C64::bind_one_key(Prefs *np, int which)
{ {
static const char *which_to_button_name[N_WIIMOTE_BINDINGS] = { static const char *which_to_button_name[N_WIIMOTE_BINDINGS] = {
"up", "down", "left", "right", "up", "down", "left", "right",
"2","A", "B", "+", "-", "1", "2", "1", "A", "B", "+", "-",
"classic up", "classic down", "classic left", "classic right", "classic a", "classic up", "classic down", "classic left", "classic right", "classic a",
"classic X", "classic Y", "classic b", "classic L", "classic b", "classic X", "classic Y", "classic L",
"classic R", "classic ZR", "classic ZL" }; "classic R", "classic ZR", "classic ZL" };
static char strs[N_WIIMOTE_BINDINGS][255]; static char strs[N_WIIMOTE_BINDINGS][255];
char *out = strs[which]; char *out = strs[which];

View File

@ -630,10 +630,10 @@ uint8 C64::poll_joystick(int port)
if ( (held & WPAD_BUTTON_HOME) || (held_classic & CLASSIC_CTRL_BUTTON_HOME) ) if ( (held & WPAD_BUTTON_HOME) || (held_classic & CLASSIC_CTRL_BUTTON_HOME) )
TheC64->enter_menu(); TheC64->enter_menu();
extra_keys[WIIMOTE_UP] = held & WPAD_BUTTON_UP; extra_keys[WIIMOTE_UP] = held & WPAD_BUTTON_RIGHT;
extra_keys[WIIMOTE_DOWN] = held & WPAD_BUTTON_DOWN; extra_keys[WIIMOTE_DOWN] = held & WPAD_BUTTON_LEFT;
extra_keys[WIIMOTE_LEFT] = held & WPAD_BUTTON_LEFT; extra_keys[WIIMOTE_LEFT] = held & WPAD_BUTTON_UP;
extra_keys[WIIMOTE_RIGHT] = held & WPAD_BUTTON_RIGHT; extra_keys[WIIMOTE_RIGHT] = held & WPAD_BUTTON_DOWN;
extra_keys[WIIMOTE_A] = held & WPAD_BUTTON_A; extra_keys[WIIMOTE_A] = held & WPAD_BUTTON_A;
extra_keys[WIIMOTE_B] = held & WPAD_BUTTON_B; extra_keys[WIIMOTE_B] = held & WPAD_BUTTON_B;

View File

@ -51,20 +51,20 @@ enum {
WIIMOTE_DOWN, WIIMOTE_DOWN,
WIIMOTE_LEFT, WIIMOTE_LEFT,
WIIMOTE_RIGHT, WIIMOTE_RIGHT,
WIIMOTE_2,
WIIMOTE_1,
WIIMOTE_A, WIIMOTE_A,
WIIMOTE_B, WIIMOTE_B,
WIIMOTE_PLUS, WIIMOTE_PLUS,
WIIMOTE_MINUS, WIIMOTE_MINUS,
WIIMOTE_1,
WIIMOTE_2,
CLASSIC_UP, CLASSIC_UP,
CLASSIC_DOWN, CLASSIC_DOWN,
CLASSIC_LEFT, CLASSIC_LEFT,
CLASSIC_RIGHT, CLASSIC_RIGHT,
CLASSIC_X,
CLASSIC_Y,
CLASSIC_A, CLASSIC_A,
CLASSIC_B, CLASSIC_B,
CLASSIC_X,
CLASSIC_Y,
CLASSIC_L, CLASSIC_L,
CLASSIC_R, CLASSIC_R,
CLASSIC_ZR, CLASSIC_ZR,